fix

.env.production

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 开封市人民医院
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
-# 若依管理系统/生产环境
+# 若依管理系统/生产环境  http://zhfwpt.kfsrmyy.com:81/
 VITE_APP_BASE_API = 'http://172.16.20.170:8060/'
 
 VITE_APP_BASE_WS = 'ws://172.16.20.168:9000/ws'

src/components/main/drawer-phone/cpns/page-phone.vue

@@ -634,6 +634,10 @@ function btnCallType() {
     return
   }
   phoneViewNumber.value = telNumber.value
+  
+  getCallMobile(phoneViewNumber.value)
+  getAffiliation(phoneViewNumber.value)
+  
   // getCallData.value.Number = telNumber.value
   scoketDatas.value = {
     AgentId: useSocketStore().accountNumber,
@@ -647,9 +651,11 @@ function btnCallType() {
     scoketDatas.value.Type = 'MakeCall'
     callDirection.value = 2
   }
+  
   getPhoneFix(telNumber.value).then((data) => {
     if (data.state === 'success') {
       scoketDatas.value.DestinationNumber = data.data[0]
+      console.log(phoneViewNumber.value,telNumber.value,scoketDatas.value.Type,scoketDatas.value.DestinationNumber,'呼叫打印')
       if (phoneType !== 'SIP') {
         Send(scoketDatas.value, (data) => {
           if (data.Type === 'MakeCall') {
@@ -657,6 +663,7 @@ function btnCallType() {
               scoketState.value === '外呼成功'
               proxy.$modal.msgSuccess('外呼成功')
               getCallState.value = '1'
+              
               delete scoketDatas.value.DestinationNumber
             } else {
               proxy.$modal.msgError('外呼失败')
@@ -713,6 +720,8 @@ function getAffiliation(tel) {
     ({ data, total }) => {
       if (data ) {
         telName.value = data.name
+      } else{
+        telName.value = ''
       }
     }
   )
@@ -726,7 +735,12 @@ function getCallMobile(tel) {
   getPageListData('/call/mobile', params).then(
     ({ data, total }) => {
       console.log(data)
-      locationName.value = data[0].locationName
+      if (data ) {
+        locationName.value = data[0].locationName
+      } else{
+        locationName.value = ''
+      }
+      
     }
   )
 }

src/components/main/page-incoming/index.vue

@@ -92,7 +92,6 @@
   const phoneType = ref(0);
   const pageOrderRef = ref(null)
   function inComingBack(telWSData) {
-    console.log(useSocketStore().stageState,'来电暂存数')
     if(useSocketStore().stageState === 0){
       useSocketStore().setStageState(1)
       handleInComming(telWSData)
@@ -128,6 +127,9 @@
         } else{
           phoneType.value = 0
         }
+      } else {
+        phoneType.value = 0
+        patientCallNumber.value = ''
       }
     })
   }

src/components/page-order/src/form/complain.vue

@@ -196,7 +196,10 @@ function onStage(type) {
     const params = form.value
     params.firsttype =props.orderInfo.type*1
     params.callnum && ( params.customerno = params.callnum )
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
+    if ( params.workordercate) {
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
+    }
+    
     // params.complaintdept.length && ( params.complaintdept = params.complaintdept[params.complaintdept.length-1] )
     params.isend && (params.isend = params.isend ?1:0)
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')

src/components/page-order/src/form/consult.vue

@@ -153,8 +153,9 @@ function onStage(type) {
     const params = form.value
     params.firsttype =props.orderInfo.type*1
     params.callnum && ( params.customerno = params.callnum )
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
-   
+    if ( params.workordercate) {
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
+    }
     params.isend && (params.isend = params.isend ?1:0)
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
     setDb(params,type)

src/components/page-order/src/form/consultation.vue

@@ -269,7 +269,9 @@ function onStage(type) {
     params.firsttype = props.orderInfo.type*1 
     params.customerno = params.callnum
     params.caller = params.caller
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
+    if (params.workordercate) {
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
+    }
     if (params.consultationTime) {
         params.consultationTime = moment(params.consultationTime).format('YYYY-MM-DD HH:mm:ss')
       }

src/components/page-order/src/form/repair.vue

@@ -164,7 +164,9 @@ defineExpose({
 function onStage(type) {
     const params = form.value
     params.firsttype =props.orderInfo.type*1
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
+    if (params.workordercate) {
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
+    }
     params.isend && (params.isend = params.isend ?1:0)
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
     setDb(params,type)

src/components/page-order/src/form/transport.vue

@@ -292,9 +292,9 @@ function onStage(type) {
     const params = form.value
     params.firsttype =props.orderInfo.type*1
     params.needtime && ( params.needtime = moment(params.needtime).format('YYYY-MM-DD HH:mm:ss') )
-
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
-
+    if (params.workordercate) {
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
+    }
     params.isend && (params.isend = params.isend ?1:0)
     params.huxiji && (params.huxiji = params.huxiji ?1:0)
     params.teshuyaopin && (params.teshuyaopin = params.teshuyaopin ?1:0)

src/utils/index.js

@@ -90,10 +90,26 @@ export function getUnprefixNuber(teleNuber) {
   let resultValue = ''
   if (teleNuber) {
     const dataValue =  teleNuber.toString()
-    if (dataValue.length=== 12) {
+    // if (dataValue.length=== 12) {
+    //   if(dataValue.substr(0, 2) == '01'){
+    //     resultValue  = dataValue.substring(1,12)
+    //   }
+    // }else{
+    //   resultValue = dataValue
+    // }
+    if (dataValue.length === 12) {
       if(dataValue.substr(0, 2) == '01'){
         resultValue  = dataValue.substring(1,12)
       }
+      
+      if (dataValue.startsWith(9)) {
+        resultValue = dataValue.substring(1,12)
+      }
+      
+    }else if (dataValue.length === 13) {
+      if(dataValue.substr(0, 2) == '90'){
+        resultValue  = dataValue.substring(2,13)
+      }
     }else{
       resultValue = dataValue
     }

src/views/main/patientFile/patientFileList/cpns/patientDetail/patientDetail.vue

@@ -177,6 +177,9 @@ watch(props, (nweProps) => {
       customerDetail({
         phoneNumber: nweProps.patientCallNumber
       })
+    } else{
+      detail.value = {}
+      patientPhoneNumber.value = ''
     }
 
     if (nweProps.id) {

src/views/main/telephone/callRecord/config/content.config.js

@@ -3,7 +3,6 @@ export const contentTableConfig = {
   contentTableHeader: true,
   propList: [
     { prop: 'phone', label: '电话号码', slotName: 'recordCallHandler', customSlot: true},
-    { prop: 'patientName', label: '用户姓名'},
     
     { prop: 'agent', label: '坐席工号' },
     { prop: 'patientName', label: '用户姓名' },