Procházet zdrojové kódy

Merge branch 'master' of http://192.168.1.222:3000/miaofuhao/vueCMS3.0

闪电 před 1 rokem
rodič
revize
b6cd20447e

binární
0929-3dist.zip


binární
0929-4dist.zip


+ 0 - 2
src/components/main/Navbar/cpns/TelephoneLogin/index.vue

@@ -230,10 +230,8 @@ function setFree() {
230 230
     AgentId: useSocketStore().accountNumber,
231 231
     AgentExten: useSocketStore().extensionNumber
232 232
   }
233
-
234 233
   Send(scoketDatas.value, (data) => {
235 234
     if (data.Type === 'WorkOn' && data.Result === true) {
236
-      debugger
237 235
       useSocketStore().setLineState('空闲')
238 236
     }
239 237
   })

File diff suppressed because it is too large
+ 281 - 266
src/components/main/Navbar/index.vue


+ 6 - 5
src/components/main/drawer-phone/cpns/page-phone.vue

@@ -391,11 +391,11 @@ watch(
391 391
     if (newValue.IncomintType !== 2) {
392 392
       getCallData.value = newValue
393 393
       // telNumber.value = getCallData.value.Number
394
-      phoneViewNumber.value = getCallData.value.Number
394
+      // getCallData.value.Number = '013623812616'
395
+      phoneViewNumber.value = getOfffixNuber(getCallData.value.Number) 
395 396
       callDirection.value = 1
396
-      // telNumber.value = '13623812616'
397
-      if (getOfffixNuber(telNumber.value).toString().length>4) {
398
-        getCallMobile(telNumber.value)
397
+      if (getOfffixNuber(phoneViewNumber.value).toString().length>4) {
398
+        getCallMobile(getOfffixNuber(phoneViewNumber.value))
399 399
       }
400 400
     }
401 401
   }
@@ -604,6 +604,7 @@ function phoneIconHandle(item) {
604 604
 }
605 605
 function btnCallType() {
606 606
   if (!telNumber.value) {
607
+    proxy.$modal.msgError('拨打号码不能为空')
607 608
     return
608 609
   }
609 610
   phoneViewNumber.value = telNumber.value
@@ -623,7 +624,6 @@ function btnCallType() {
623 624
   getPhoneFix(telNumber.value).then((data) => {
624 625
     if (data.state === 'success') {
625 626
       scoketDatas.value.DestinationNumber = data.data[0]
626
-      
627 627
       if (phoneType !== 'SIP') {
628 628
         Send(scoketDatas.value, (data) => {
629 629
           if (data.Type === 'MakeCall') {
@@ -680,6 +680,7 @@ const handleScrollCall = () => {
680 680
 }
681 681
 const locationName = ref('')
682 682
 function getCallMobile(tel) {
683
+
683 684
   const params = {
684 685
     mobilePrefix:tel.substring(0,7)
685 686
   }

+ 8 - 0
src/components/page-order/index.vue

@@ -36,6 +36,10 @@
36 36
     import repair from './src/form/repair';
37 37
     import consultation from './src/form/consultation';
38 38
     const props = defineProps({
39
+        propRecordData: {
40
+            type: Object,
41
+            default: () => ({}),
42
+        },
39 43
         inCommingData: {
40 44
             type: Object,
41 45
             default: () => ({}),
@@ -83,6 +87,10 @@
83 87
             orderInfo.value.callId = data.inCommingData.CallID
84 88
             orderInfo.value.callnum = data.inCommingData.Number
85 89
         }
90
+        if (data.propRecordData.id) {
91
+            orderInfo.value.callId = data.propRecordData.id
92
+            orderInfo.value.callnum = data.propRecordData.phone
93
+        }
86 94
     }
87 95
     const compsObj = shallowRef({
88 96
         consult,

+ 1 - 1
src/utils/socket.js

@@ -10,7 +10,7 @@ export function callOut(phoneNumer) {
10 10
     }
11 11
     ElMessageBox.confirm(
12 12
       '您确定要对'+phoneNumer+'进行拨号吗?',
13
-      'Warning',
13
+      '提示',
14 14
       {
15 15
         confirmButtonText: '确认',
16 16
         cancelButtonText: '取消',

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

@@ -252,7 +252,7 @@ const getLogs = (logs) => {
252 252
   }
253 253
 
254 254
 }
255
-const blackDuration = ref()
255
+const blackDuration = ref(24)
256 256
 
257 257
 // 1.处理逻辑
258 258
 const newCallback = () => { }

+ 1 - 1
src/views/main/patientFile/patientFileList/patientFileList.vue

@@ -100,7 +100,7 @@ export default defineComponent({
100 100
     const router = useRouter();
101 101
     const [pageContentRef, handleResetClick, handleQueryClick] = usePageSearch()
102 102
     const activeNames = ref(['1'])
103
-    const blackDuration = ref()
103
+    const blackDuration = ref(24)
104 104
     const input2 = ref('')
105 105
     const iconFlag = ref(true)
106 106
     const form = ref({

+ 1 - 1
src/views/main/patientFile/patientblack/patientblack.vue

@@ -70,7 +70,7 @@ export default defineComponent({
70 70
   setup() {
71 71
 
72 72
     const router = useRouter();
73
-    const blackDuration = ref()
73
+    const blackDuration = ref(24)
74 74
     const [pageContentRef, handleResetClick, handleQueryClick] = usePageSearch()
75 75
 
76 76
     // 1.处理逻辑

+ 11 - 5
src/views/main/telephone/callRecord/callRecord.vue

@@ -66,11 +66,12 @@
66 66
       :modal="false"
67 67
       :show-close="true"
68 68
     >
69
-      <add-order
69
+      <page-order :propRecordData="recordData" @refreshOrder="submitRefresh()"></page-order>
70
+      <!-- <add-order
70 71
         :OrderSource="'话务'"
71 72
         :porpRecordData="recordData"
72 73
         @handleClose="getDialogHandle"
73
-      ></add-order>
74
+      ></add-order> -->
74 75
     </el-dialog>
75 76
     <handle v-if="openViewOrder" v-model:dialogVisible="openViewOrder" :rowData="clRowData">
76 77
     </handle>
@@ -83,7 +84,7 @@
83 84
   import PageSearch from '@/components/page-search';
84 85
   import PageContent from '@/components/page-content';
85 86
   import audioPlayer from './cpns/audioPlayer';
86
-  import addOrder from '@/components/workOrder/add-order/add-order';
87
+  import PageOrder from '@/components/page-order';
87 88
   import handle from '@/components/workOrder/handle';
88 89
 
89 90
   import { searchFormConfig } from './config/search.config';
@@ -107,7 +108,7 @@
107 108
       PageSearch,
108 109
       PageContent,
109 110
       audioPlayer,
110
-      addOrder,
111
+      PageOrder,
111 112
       handle,
112 113
     },
113 114
     setup() {
@@ -134,6 +135,10 @@
134 135
           callPhoneFlag.value = false;
135 136
         }
136 137
       });
138
+      function submitRefresh() {
139
+				openCreatOrder.value = false
140
+				pageContentRef.value.getPageData()
141
+			}
137 142
       //查看详情
138 143
       const handleViewData = (data) => {
139 144
         console.log(data.recordPath);
@@ -178,6 +183,7 @@
178 183
       }
179 184
 
180 185
       return {
186
+        submitRefresh,
181 187
         callOut,
182 188
         getCallSate,
183 189
         getOfffixNuber,
@@ -194,7 +200,7 @@
194 200
         open,
195 201
         openCreatOrder,
196 202
         openViewOrder,
197
-        addOrder,
203
+        // addOrder,
198 204
         filePath,
199 205
         getDialogHandle,
200 206
         handleViewData,