miaofuhao преди 1 година
родител
ревизия
0741e6f5a1

BIN
0927-3dist.zip


BIN
0928-1dist.zip


+ 3 - 2
src/components/main/drawer-phone/cpns/page-phone.vue

@@ -399,6 +399,7 @@ watch(
399 399
     if (newValue.IncomintType !== 2) {
400 400
       getCallData.value = newValue
401 401
       telNumber.value = getCallData.value.Number
402
+      callDirection.value = 1
402 403
       // telNumber.value = '13623812616'
403 404
       if (getOfffixNuber(telNumber.value).toString().length>4) {
404 405
         getCallMobile(telNumber.value)
@@ -464,6 +465,7 @@ function inComingHandle (){
464 465
   if (phoneType === 'SIP') {
465 466
     sipInCall.value = true
466 467
   }
468
+  
467 469
   if (telNumber.value) {
468 470
     if (callDirection.value === 1) {
469 471
       btnState.value = false
@@ -755,8 +757,7 @@ function dropCall() {
755 757
     AgentExten: useSocketStore().extensionNumber
756 758
   }
757 759
   Send(scoketDatas.value, (data) => {
758
-    
759
-    console.log('挂断成功')
760
+    // console.log('挂断成功')
760 761
   })
761 762
 }
762 763
 

+ 1 - 1
src/components/page-content/src/page-content.vue

@@ -18,8 +18,8 @@
18 18
         </el-button>
19 19
         <slot name="otherHandler"></slot>
20 20
       </template>
21
+      
21 22
       <!-- 2.列中的插槽 -->
22
-
23 23
       <template #handler="scope">
24 24
         <div class="handle-btns">
25 25
           <el-button

+ 2 - 0
src/components/page-order/src/form/complain.vue

@@ -112,6 +112,7 @@ function initMethod(props) {
112 112
         customerDetail(form.value.callnum)
113 113
     }
114 114
 }
115
+
115 116
 async function getOrderType(id) {
116 117
     const resultData = await getPageListData('/worker/type/getTreeselectById',{id});
117 118
     childrenTypes.value =  resultData.data ?? []
@@ -199,6 +200,7 @@ const onSubmit = (formEl) => {
199 200
     }
200 201
   })
201 202
 }
203
+
202 204
 function resetForm() {
203 205
     if (!orderRef.value) return
204 206
     orderRef.value.resetFields()

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

@@ -132,9 +132,9 @@ const rules = reactive({
132 132
     callcode: [
133 133
         { required: true, message: '请选择申请人', trigger: 'blur' },
134 134
     ],
135
-    callnum: [
136
-        { required: true, message: '请输入申请人电话', trigger: 'blur' },
137
-    ],
135
+    // callnum: [
136
+    //     { required: true, message: '请输入申请人电话', trigger: 'blur' },
137
+    // ],
138 138
     patientName: [
139 139
         { required: true, message: '请输入患者姓名', trigger: 'blur' },
140 140
     ],
@@ -159,9 +159,9 @@ const rules = reactive({
159 159
     consultationTime: [
160 160
         { required: true, message: '请选择会诊时间', trigger: 'blur' },
161 161
     ],
162
-    content: [
163
-        { required: true, message: '请输入内容', trigger: 'blur' },
164
-    ]
162
+    // content: [
163
+    //     { required: true, message: '请输入内容', trigger: 'blur' },
164
+    // ]
165 165
 });
166 166
 
167 167
 const childrenTypes = ref([]);

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

@@ -134,9 +134,9 @@ const rules = reactive({
134 134
     content: [
135 135
         { required: true, message: '请输入内容', trigger: 'blur' },
136 136
     ],
137
-    callcode: [
138
-        { required: true, message: '请选择联系人', trigger: 'blur' },
139
-    ],
137
+    // callcode: [
138
+    //     { required: true, message: '请选择联系人', trigger: 'blur' },
139
+    // ],
140 140
     callnum: [
141 141
         { required: true, message: '请输入联系人电话', trigger: 'blur' },
142 142
     ]

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

@@ -124,9 +124,9 @@ const rules = reactive({
124 124
     applicantCode: [
125 125
         { required: true, message: '请输入联系人姓名', trigger: 'blur' },
126 126
     ],
127
-    applicantPhone: [
128
-        { required: true, message: '请输入联系人电话', trigger: 'blur' },
129
-    ],
127
+    // applicantPhone: [
128
+    //     { required: true, message: '请输入联系人电话', trigger: 'blur' },
129
+    // ],
130 130
     patientnum: [
131 131
         { required: true, message: '请输入患者数量', trigger: 'blur' },
132 132
     ],
@@ -145,9 +145,9 @@ const rules = reactive({
145 145
     // cartype: [
146 146
     //     { required: true, message: '请选择车辆类型', trigger: 'blur' },
147 147
     // ],
148
-    remark: [
149
-        { required: true, message: '请输入备注', trigger: 'blur' },
150
-    ]
148
+    // remark: [
149
+    //     { required: true, message: '请输入备注', trigger: 'blur' },
150
+    // ]
151 151
 
152 152
 
153 153
 });

+ 0 - 2
src/utils/aes.js

@@ -76,9 +76,7 @@ const maskIdOrPhone = (input) => {
76 76
  */
77 77
 export const userDecryptToAsterisk = (jsonStr) => {
78 78
   if (jsonStr.length <= 11) return jsonStr;
79
-
80 79
   const plaintext = userDecrypt(jsonStr);
81
-  console.log(plaintext)
82 80
   return maskIdOrPhone(plaintext);
83 81
 };
84 82
 export const userToAsterisk = (jsonStr) => {

+ 6 - 3
src/views/main/followUp/followUpTask/followUpTask.vue

@@ -46,7 +46,6 @@
46 46
                 <el-option v-for="item in planOptions" :key="item.value" :label="item.label" :value="item.value" />
47 47
               </el-select>
48 48
             </el-form-item>
49
-
50 49
           </el-col>
51 50
           <!-- <el-col :span="6">
52 51
             <el-form-item label="任务时间">
@@ -89,8 +88,8 @@
89 88
           </td>
90 89
           <td class="list-item">
91 90
             <div>
91
+              <el-icon color="#409efc" style="margin-right: 8px;" @click="viewPhoneHandle(item.mobile,index)"><View /></el-icon>
92 92
               <span style="color: #000; margin-right: 10px;">{{ userDecryptToAsterisk(item.mobile) }}</span>
93
-              
94 93
               <!-- <el-icon v-if="item.way === 2">
95 94
                 <Message />
96 95
               </el-icon> -->
@@ -162,7 +161,7 @@ import { getTasks, getSelfTaskReport } from  '@/api/patient/task'
162 161
 import { getPlans } from  '@/api/patient/plan'
163 162
 import { taskResults } from "@/utils/commonDic.js"
164 163
 import { ArrayToMap } from '@/utils/tools'
165
-import { userDecryptToAsterisk } from '@/utils/aes'
164
+import { userDecryptToAsterisk,userToAsterisk } from '@/utils/aes'
166 165
 
167 166
 const router = useRouter();
168 167
 const loading = ref(false)
@@ -178,6 +177,10 @@ const iconFlag = ref(true)
178 177
 //   resource: '',
179 178
 // })
180 179
 
180
+function viewPhoneHandle(mobile,index) {
181
+  taskList.value[index].mobile = userToAsterisk(mobile) 
182
+}
183
+
181 184
 // 跳转到患者详情
182 185
 function handleDetail(row) {
183 186
     

+ 1 - 1
src/views/main/patientFile/patientFileList/config/content.config.js

@@ -3,7 +3,7 @@ export const contentTableConfig = {
3 3
   contentTableHeader: true,
4 4
   propList: [
5 5
     { prop: 'name', label: '姓名', slotName: 'patientId', minWidth: '100', customSlot: true, fixed : 'left' },
6
-    { prop: 'phoneNumber', label: '手机号', slotName: 'phoneNumber', customSlot: true, minWidth: '100' },
6
+    { prop: 'phoneNumber', label: '手机号', slotName: 'phoneNumber', customSlot: true, minWidth: '150' },
7 7
     { prop: 'sex', label: '性别', slotName: 'sex', customSlot: true, minWidth: '80' },
8 8
     { prop: 'label', label: '标签', slotName: 'labellist', customSlot: true, minWidth: '260' },
9 9
     { prop: 'jzks', label: '就诊科室', minWidth: '150'},

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

@@ -18,8 +18,8 @@
18 18
         <el-button type="primary" link @click="buttonHandle(row.patientId)">{{ row.name || '未知' }}</el-button>
19 19
       </template>
20 20
       <template #phoneNumber="{ row }">
21
+        <!-- <el-icon color="#409efc" style="margin-right: 8px;" @click="viewPhoneHandle(row.phoneNumber,index)"><View /></el-icon> -->
21 22
         {{ row.phoneNumber && userDecryptToAsterisk(row.phoneNumber) }}
22
-        
23 23
       </template>
24 24
       <template #patientStatus="{ row }">
25 25
         <el-tag v-if="row.patientStatus && statusMap[row.patientStatus]" :type="statusMap[row.patientStatus].color">{{
@@ -99,6 +99,9 @@ export default defineComponent({
99 99
       delivery: '',
100 100
       resource: '',
101 101
     })
102
+    function viewPhoneHandle(params) {
103
+      pageContentRef.value.dataList.value[index].mobile = userToAsterisk(mobile) 
104
+    }
102 105
     function buttonHandle(id) {
103 106
       console.log(id);
104 107
       router.push({
@@ -230,6 +233,7 @@ export default defineComponent({
230 233
       usePageModal(blackNewCallback, blackEditCallback)
231 234
 
232 235
     return {
236
+      viewPhoneHandle,
233 237
       userDecryptToAsterisk,
234 238
       blackOtherInfo,
235 239
       joinBlacklist,

+ 0 - 3
src/views/main/telephone/callRecord/callRecord.vue

@@ -169,10 +169,7 @@
169 169
         const callNumber = getOfffixNuber(data.phone);
170 170
         if (callNumber) {
171 171
           callOut(callNumber)
172
-        }else{
173
-          proxy.$modal.msgSuccess('手机号不能为空');
174 172
         }
175
-        
176 173
       };
177 174
 
178 175
       function getTimeLimit(startTime, endTime) {