miaofuhao 1 yıl önce
ebeveyn
işleme
d45d996dc7

+ 1 - 1
.env.production

5
 # 生产环境配置
5
 # 生产环境配置
6
 VITE_APP_ENV = 'production'
6
 VITE_APP_ENV = 'production'
7
 
7
 
8
-# 若依管理系统/生产环境
8
+# 若依管理系统/生产环境  http://zhfwpt.kfsrmyy.com:81/
9
 VITE_APP_BASE_API = 'http://172.16.20.170:8060/'
9
 VITE_APP_BASE_API = 'http://172.16.20.170:8060/'
10
 
10
 
11
 VITE_APP_BASE_WS = 'ws://172.16.20.168:9000/ws'
11
 VITE_APP_BASE_WS = 'ws://172.16.20.168:9000/ws'

BIN
1028-1dist.zip


BIN
1028-2dist.zip


BIN
1028-3dist.zip


BIN
1029-1dist.zip


BIN
1029-2dist.zip


BIN
1029-3dist.zip


+ 15 - 1
src/components/main/drawer-phone/cpns/page-phone.vue

634
     return
634
     return
635
   }
635
   }
636
   phoneViewNumber.value = telNumber.value
636
   phoneViewNumber.value = telNumber.value
637
+  
638
+  getCallMobile(phoneViewNumber.value)
639
+  getAffiliation(phoneViewNumber.value)
640
+  
637
   // getCallData.value.Number = telNumber.value
641
   // getCallData.value.Number = telNumber.value
638
   scoketDatas.value = {
642
   scoketDatas.value = {
639
     AgentId: useSocketStore().accountNumber,
643
     AgentId: useSocketStore().accountNumber,
647
     scoketDatas.value.Type = 'MakeCall'
651
     scoketDatas.value.Type = 'MakeCall'
648
     callDirection.value = 2
652
     callDirection.value = 2
649
   }
653
   }
654
+  
650
   getPhoneFix(telNumber.value).then((data) => {
655
   getPhoneFix(telNumber.value).then((data) => {
651
     if (data.state === 'success') {
656
     if (data.state === 'success') {
652
       scoketDatas.value.DestinationNumber = data.data[0]
657
       scoketDatas.value.DestinationNumber = data.data[0]
658
+      console.log(phoneViewNumber.value,telNumber.value,scoketDatas.value.Type,scoketDatas.value.DestinationNumber,'呼叫打印')
653
       if (phoneType !== 'SIP') {
659
       if (phoneType !== 'SIP') {
654
         Send(scoketDatas.value, (data) => {
660
         Send(scoketDatas.value, (data) => {
655
           if (data.Type === 'MakeCall') {
661
           if (data.Type === 'MakeCall') {
657
               scoketState.value === '外呼成功'
663
               scoketState.value === '外呼成功'
658
               proxy.$modal.msgSuccess('外呼成功')
664
               proxy.$modal.msgSuccess('外呼成功')
659
               getCallState.value = '1'
665
               getCallState.value = '1'
666
+              
660
               delete scoketDatas.value.DestinationNumber
667
               delete scoketDatas.value.DestinationNumber
661
             } else {
668
             } else {
662
               proxy.$modal.msgError('外呼失败')
669
               proxy.$modal.msgError('外呼失败')
713
     ({ data, total }) => {
720
     ({ data, total }) => {
714
       if (data ) {
721
       if (data ) {
715
         telName.value = data.name
722
         telName.value = data.name
723
+      } else{
724
+        telName.value = ''
716
       }
725
       }
717
     }
726
     }
718
   )
727
   )
726
   getPageListData('/call/mobile', params).then(
735
   getPageListData('/call/mobile', params).then(
727
     ({ data, total }) => {
736
     ({ data, total }) => {
728
       console.log(data)
737
       console.log(data)
729
-      locationName.value = data[0].locationName
738
+      if (data ) {
739
+        locationName.value = data[0].locationName
740
+      } else{
741
+        locationName.value = ''
742
+      }
743
+      
730
     }
744
     }
731
   )
745
   )
732
 }
746
 }

+ 3 - 1
src/components/main/page-incoming/index.vue

92
   const phoneType = ref(0);
92
   const phoneType = ref(0);
93
   const pageOrderRef = ref(null)
93
   const pageOrderRef = ref(null)
94
   function inComingBack(telWSData) {
94
   function inComingBack(telWSData) {
95
-    console.log(useSocketStore().stageState,'来电暂存数')
96
     if(useSocketStore().stageState === 0){
95
     if(useSocketStore().stageState === 0){
97
       useSocketStore().setStageState(1)
96
       useSocketStore().setStageState(1)
98
       handleInComming(telWSData)
97
       handleInComming(telWSData)
128
         } else{
127
         } else{
129
           phoneType.value = 0
128
           phoneType.value = 0
130
         }
129
         }
130
+      } else {
131
+        phoneType.value = 0
132
+        patientCallNumber.value = ''
131
       }
133
       }
132
     })
134
     })
133
   }
135
   }

+ 4 - 1
src/components/page-order/src/form/complain.vue

196
     const params = form.value
196
     const params = form.value
197
     params.firsttype =props.orderInfo.type*1
197
     params.firsttype =props.orderInfo.type*1
198
     params.callnum && ( params.customerno = params.callnum )
198
     params.callnum && ( params.customerno = params.callnum )
199
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
199
+    if ( params.workordercate) {
200
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
201
+    }
202
+    
200
     // params.complaintdept.length && ( params.complaintdept = params.complaintdept[params.complaintdept.length-1] )
203
     // params.complaintdept.length && ( params.complaintdept = params.complaintdept[params.complaintdept.length-1] )
201
     params.isend && (params.isend = params.isend ?1:0)
204
     params.isend && (params.isend = params.isend ?1:0)
202
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
205
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')

+ 3 - 2
src/components/page-order/src/form/consult.vue

153
     const params = form.value
153
     const params = form.value
154
     params.firsttype =props.orderInfo.type*1
154
     params.firsttype =props.orderInfo.type*1
155
     params.callnum && ( params.customerno = params.callnum )
155
     params.callnum && ( params.customerno = params.callnum )
156
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
157
-   
156
+    if ( params.workordercate) {
157
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
158
+    }
158
     params.isend && (params.isend = params.isend ?1:0)
159
     params.isend && (params.isend = params.isend ?1:0)
159
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
160
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
160
     setDb(params,type)
161
     setDb(params,type)

+ 3 - 1
src/components/page-order/src/form/consultation.vue

269
     params.firsttype = props.orderInfo.type*1 
269
     params.firsttype = props.orderInfo.type*1 
270
     params.customerno = params.callnum
270
     params.customerno = params.callnum
271
     params.caller = params.caller
271
     params.caller = params.caller
272
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
272
+    if (params.workordercate) {
273
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
274
+    }
273
     if (params.consultationTime) {
275
     if (params.consultationTime) {
274
         params.consultationTime = moment(params.consultationTime).format('YYYY-MM-DD HH:mm:ss')
276
         params.consultationTime = moment(params.consultationTime).format('YYYY-MM-DD HH:mm:ss')
275
       }
277
       }

+ 3 - 1
src/components/page-order/src/form/repair.vue

164
 function onStage(type) {
164
 function onStage(type) {
165
     const params = form.value
165
     const params = form.value
166
     params.firsttype =props.orderInfo.type*1
166
     params.firsttype =props.orderInfo.type*1
167
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
167
+    if (params.workordercate) {
168
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
169
+    }
168
     params.isend && (params.isend = params.isend ?1:0)
170
     params.isend && (params.isend = params.isend ?1:0)
169
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
171
     params.createtime =  moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
170
     setDb(params,type)
172
     setDb(params,type)

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

292
     const params = form.value
292
     const params = form.value
293
     params.firsttype =props.orderInfo.type*1
293
     params.firsttype =props.orderInfo.type*1
294
     params.needtime && ( params.needtime = moment(params.needtime).format('YYYY-MM-DD HH:mm:ss') )
294
     params.needtime && ( params.needtime = moment(params.needtime).format('YYYY-MM-DD HH:mm:ss') )
295
-
296
-    params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
297
-
295
+    if (params.workordercate) {
296
+        params.workordercate.length && (params.workordercate = params.workordercate[params.workordercate.length-1] )
297
+    }
298
     params.isend && (params.isend = params.isend ?1:0)
298
     params.isend && (params.isend = params.isend ?1:0)
299
     params.huxiji && (params.huxiji = params.huxiji ?1:0)
299
     params.huxiji && (params.huxiji = params.huxiji ?1:0)
300
     params.teshuyaopin && (params.teshuyaopin = params.teshuyaopin ?1:0)
300
     params.teshuyaopin && (params.teshuyaopin = params.teshuyaopin ?1:0)

+ 17 - 1
src/utils/index.js

90
   let resultValue = ''
90
   let resultValue = ''
91
   if (teleNuber) {
91
   if (teleNuber) {
92
     const dataValue =  teleNuber.toString()
92
     const dataValue =  teleNuber.toString()
93
-    if (dataValue.length=== 12) {
93
+    // if (dataValue.length=== 12) {
94
+    //   if(dataValue.substr(0, 2) == '01'){
95
+    //     resultValue  = dataValue.substring(1,12)
96
+    //   }
97
+    // }else{
98
+    //   resultValue = dataValue
99
+    // }
100
+    if (dataValue.length === 12) {
94
       if(dataValue.substr(0, 2) == '01'){
101
       if(dataValue.substr(0, 2) == '01'){
95
         resultValue  = dataValue.substring(1,12)
102
         resultValue  = dataValue.substring(1,12)
96
       }
103
       }
104
+      
105
+      if (dataValue.startsWith(9)) {
106
+        resultValue = dataValue.substring(1,12)
107
+      }
108
+      
109
+    }else if (dataValue.length === 13) {
110
+      if(dataValue.substr(0, 2) == '90'){
111
+        resultValue  = dataValue.substring(2,13)
112
+      }
97
     }else{
113
     }else{
98
       resultValue = dataValue
114
       resultValue = dataValue
99
     }
115
     }

+ 3 - 0
src/views/main/patientFile/patientFileList/cpns/patientDetail/patientDetail.vue

177
       customerDetail({
177
       customerDetail({
178
         phoneNumber: nweProps.patientCallNumber
178
         phoneNumber: nweProps.patientCallNumber
179
       })
179
       })
180
+    } else{
181
+      detail.value = {}
182
+      patientPhoneNumber.value = ''
180
     }
183
     }
181
 
184
 
182
     if (nweProps.id) {
185
     if (nweProps.id) {

+ 0 - 1
src/views/main/telephone/callRecord/config/content.config.js

3
   contentTableHeader: true,
3
   contentTableHeader: true,
4
   propList: [
4
   propList: [
5
     { prop: 'phone', label: '电话号码', slotName: 'recordCallHandler', customSlot: true},
5
     { prop: 'phone', label: '电话号码', slotName: 'recordCallHandler', customSlot: true},
6
-    { prop: 'patientName', label: '用户姓名'},
7
     
6
     
8
     { prop: 'agent', label: '坐席工号' },
7
     { prop: 'agent', label: '坐席工号' },
9
     { prop: 'patientName', label: '用户姓名' },
8
     { prop: 'patientName', label: '用户姓名' },