代码提交

src/components/main/drawer-phone/index.vue

@@ -36,7 +36,7 @@
             <div class="p-6 bg-gradient-to-r from-blue-500 to-blue-600 rounded-t-lg text-white">
                 <div class="flex justify-between items-center mb-4">
                     <div class="flex items-center space-x-2">
-                        <el-avatar :size="48" :src="currentCall.avatar" />
+                        <el-avatar :size="48" :src="defaultTubiao" />
                         <div>
                             <h3 class="font-semibold text-lg">{{ currentCall.name || '暂无姓名' }}</h3>
                             <p class="text-sm opacity-90">{{ currentCall.phone || '暂无电话'}}</p>
@@ -131,10 +131,10 @@
                         <div class="flex items-center">
                             <el-avatar :size="32" :src="defaultTubiao" class="mr-3" />
                             <div>
-                                <p class="font-medium">{{ record.patientName || '未知' }}</p>
+                                <p class="font-medium">{{ record.phone || '未知' }}</p>
                                 <div class="flex items-center space-x-2">
                                     <p class="text-xs text-gray-500">{{ record.answerTime }}</p>
-                                    <p class="text-xs text-gray-500">{{ record.phone }}</p>
+                                    <!-- <p class="text-xs text-gray-500">{{ record.phone }}</p> -->
                                 </div>
                             </div>
                         </div>
@@ -162,7 +162,7 @@ import { hidePhone } from '@/utils/tools';
 import { useRouter } from 'vue-router';
 import { getPageListData } from '@/api/main/system/system'
 import defaultTubiao from '@/assets/images/defaultTubiao.png'
-import { getCallSate} from '@/utils/index';
+import { getCallSate,getUnprefixNuber} from '@/utils/index';
 
 const router = useRouter();
 import {
@@ -260,7 +260,8 @@ onMounted(() => {
     // document.removeEventListener('mousemove', handleDrag);
     // document.removeEventListener('mouseup', stopDrag);
     initWs();
-    getCustomeData()
+    getcalllogData()
+
 });
 
 const stateObj = {
@@ -329,8 +330,9 @@ const initWs = () => {
                     break
                 case 'incoming': // 来电
                     {
-                        currentCall.value.phone = telWSData.Number
+                        currentCall.value.phone = getUnprefixNuber(telWSData.Number) 
                         currentCall.value.truePhone = hidePhone(telWSData.Number)
+                        getUserInfo(currentCall.value.phone)
                         router.push({
                             path: '/inComming/callScreen/' + telWSData.Number,
                             query: {
@@ -475,7 +477,8 @@ const callActions = [
 
 ];
 const callHistory  = ref([])
-function getCustomeData() {
+
+function getcalllogData() {
   callHistory.value = []
   const params = {
     pageNum: 1,
@@ -489,6 +492,22 @@ function getCustomeData() {
     }
   )
 }
+
+function getUserInfo(phoneNumber) {
+  
+  getPageListData('/patient/patient', { phoneNumber }).then(
+    ({ data, total }) => {
+      const newArray = data[0]
+      console.log(newArray)
+      currentCall.value = {
+        name: newArray.name,
+        phone: phoneNumber,
+        avatar: newArray.avatar,
+        location:  newArray.address
+      }
+    }
+  )
+}
 const dialKeys = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'];
 
 

src/components/page-order/index.vue

@@ -53,6 +53,7 @@ import transport from './src/form/transport';
 import useSelectStore from '@/store/commonSelect/common';
 import { ElMessage } from 'element-plus';
 import { getPageListData, editPageData, createPageData } from '@/api/main/system/system';
+import { getUnprefixNuber} from '@/utils/index';
 
 const formRef: any = ref(null);
 let form = ref({
@@ -71,6 +72,10 @@ const props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    propRecordData: {
+        type: Object,
+        default: () => ({}),
+    }
 });
 watch(props, (nweProps) => {
     initMethod(props);
@@ -93,6 +98,14 @@ const initMethod = (props) => {
             department: '',
         }
     }
+    console.log(props.propRecordData)
+    if (props.propRecordData.id) {
+        form.value = {
+            callId: props.propRecordData.id,
+            phone: getUnprefixNuber(props.propRecordData.phone),
+            handleMethod:'1'
+        }
+    }
 }
 
 const emit = defineEmits(["refreshOrder", "orderTypeChange"]);
@@ -158,6 +171,9 @@ const submit = async () => {
                 isend: +form.value.handleMethod,
                 workordercate: form.value.type[form.value.type.length - 1],
             };
+            if (form.value.callId) {
+                params.callId = form.value.callId
+            }
             // 提交表单
             if (form.value.id) {
                 params.workorderId = form.value.id;

src/utils/index.js

@@ -53,14 +53,45 @@ export function getCallSate(type, state) {
   }
   return typeStr + '-' + stateStr
 }
+// export function getUnprefixNuber(teleNuber) {
+//   let resultValue = ''
+//   if (teleNuber) {
+//     const dataValue =  teleNuber.toString()
+//     if (dataValue.length=== 12) {
+//       if(dataValue.substr(0, 2) == '01'){
+//         resultValue  = dataValue.substring(1,12)
+//       }
+//     }else{
+//       resultValue = dataValue
+//     }
+//   }
+  
+//   return resultValue
+// }
 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/telephone/callRecord/callRecord.vue

@@ -36,7 +36,7 @@
       </template>
       <template #recordCreatOrderHandler="scope">
         <el-button
-          v-if="!scope.row.callType"
+          v-if="scope.row.callType === 1"
           size="small"
           type="primary"
           text
@@ -61,11 +61,12 @@
       :modal="false"
       :show-close="true"
     >
-      <add-order
+    
+      <page-order
         :OrderSource="'话务'"
-        :porpRecordData="recordData"
-        @handleClose="getDialogHandle"
-      ></add-order>
+        :propRecordData="recordData"
+        @refreshOrder="getDialogHandle"
+      ></page-order>
     </el-dialog>
     <handle v-if="openViewOrder" v-model:dialogVisible="openViewOrder" :rowData="clRowData">
     </handle>
@@ -78,7 +79,10 @@
   import PageSearch from '@/components/page-search';
   import PageContent from '@/components/page-content';
   import audioPlayer from './cpns/audioPlayer';
+
   import addOrder from '@/components/workOrder/add-order/add-order';
+  import pageOrder from '@/components/page-order';
+
   import handle from '@/components/workOrder/handle';
 
   import { searchFormConfig } from './config/search.config';
@@ -103,6 +107,7 @@
       PageContent,
       audioPlayer,
       addOrder,
+      pageOrder,
       handle,
     },
     setup() {
@@ -136,9 +141,8 @@
         open.value = true;
       };
 
-      const getDialogHandle = (data) => {
-        if (data) {
-          openCreatOrder.value = false;
+      const getDialogHandle = () => {
+        openCreatOrder.value = false;
           useSystemStore().getPageListAction({
             pageName: '/call/calllog',
             queryInfo: {
@@ -146,7 +150,6 @@
               pageSize: 10,
             },
           });
-        }
       };
       const handleOrderCall = (data) => {
         if (data.workordercode) {
@@ -158,6 +161,7 @@
           router.push({ path: '/workHandle' });
         } else {
           recordData.value = data;
+          console.log(recordData.value)
           openCreatOrder.value = true;
         }
       };
@@ -212,6 +216,7 @@
         openCreatOrder,
         openViewOrder,
         addOrder,
+        pageOrder,
         filePath,
         getDialogHandle,
         handleViewData,