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

src/components/main/Navbar/cpns/TelephoneLogin/index.vue

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

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

@@ -391,11 +391,11 @@ watch(
     if (newValue.IncomintType !== 2) {
       getCallData.value = newValue
       // telNumber.value = getCallData.value.Number
-      phoneViewNumber.value = getCallData.value.Number
+      // getCallData.value.Number = '013623812616'
+      phoneViewNumber.value = getOfffixNuber(getCallData.value.Number) 
       callDirection.value = 1
-      // telNumber.value = '13623812616'
-      if (getOfffixNuber(telNumber.value).toString().length>4) {
-        getCallMobile(telNumber.value)
+      if (getOfffixNuber(phoneViewNumber.value).toString().length>4) {
+        getCallMobile(getOfffixNuber(phoneViewNumber.value))
       }
     }
   }
@@ -604,6 +604,7 @@ function phoneIconHandle(item) {
 }
 function btnCallType() {
   if (!telNumber.value) {
+    proxy.$modal.msgError('拨打号码不能为空')
     return
   }
   phoneViewNumber.value = telNumber.value
@@ -623,7 +624,6 @@ function btnCallType() {
   getPhoneFix(telNumber.value).then((data) => {
     if (data.state === 'success') {
       scoketDatas.value.DestinationNumber = data.data[0]
-      
       if (phoneType !== 'SIP') {
         Send(scoketDatas.value, (data) => {
           if (data.Type === 'MakeCall') {
@@ -680,6 +680,7 @@ const handleScrollCall = () => {
 }
 const locationName = ref('')
 function getCallMobile(tel) {
+
   const params = {
     mobilePrefix:tel.substring(0,7)
   }

src/components/page-order/index.vue

@@ -36,6 +36,10 @@
     import repair from './src/form/repair';
     import consultation from './src/form/consultation';
     const props = defineProps({
+        propRecordData: {
+            type: Object,
+            default: () => ({}),
+        },
         inCommingData: {
             type: Object,
             default: () => ({}),
@@ -83,6 +87,10 @@
             orderInfo.value.callId = data.inCommingData.CallID
             orderInfo.value.callnum = data.inCommingData.Number
         }
+        if (data.propRecordData.id) {
+            orderInfo.value.callId = data.propRecordData.id
+            orderInfo.value.callnum = data.propRecordData.phone
+        }
     }
     const compsObj = shallowRef({
         consult,

src/utils/socket.js

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

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

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

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

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

src/views/main/patientFile/patientblack/patientblack.vue

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

src/views/main/telephone/callRecord/callRecord.vue

@@ -66,11 +66,12 @@
       :modal="false"
       :show-close="true"
     >
-      <add-order
+      <page-order :propRecordData="recordData" @refreshOrder="submitRefresh()"></page-order>
+      <!-- <add-order
         :OrderSource="'话务'"
         :porpRecordData="recordData"
         @handleClose="getDialogHandle"
-      ></add-order>
+      ></add-order> -->
     </el-dialog>
     <handle v-if="openViewOrder" v-model:dialogVisible="openViewOrder" :rowData="clRowData">
     </handle>
@@ -83,7 +84,7 @@
   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';
@@ -107,7 +108,7 @@
       PageSearch,
       PageContent,
       audioPlayer,
-      addOrder,
+      PageOrder,
       handle,
     },
     setup() {
@@ -134,6 +135,10 @@
           callPhoneFlag.value = false;
         }
       });
+      function submitRefresh() {
+				openCreatOrder.value = false
+				pageContentRef.value.getPageData()
+			}
       //查看详情
       const handleViewData = (data) => {
         console.log(data.recordPath);
@@ -178,6 +183,7 @@
       }
 
       return {
+        submitRefresh,
         callOut,
         getCallSate,
         getOfffixNuber,
@@ -194,7 +200,7 @@
         open,
         openCreatOrder,
         openViewOrder,
-        addOrder,
+        // addOrder,
         filePath,
         getDialogHandle,
         handleViewData,