fix

.env.development

@@ -31,8 +31,8 @@ VITE_APP_BASE_CHAT_WS = 'ws://192.168.1.15:8060/'
 # VITE_APP_SIP_PASSWORD = '123456'
 # VITE_APP_SIP_CONTACT_URL = "@192.168.8.17;transport=ws"
 
-VITE_APP_PHONE_TYPE = 'PHONE'
-# VITE_APP_PHONE_TYPE = 'SIP'
+# VITE_APP_PHONE_TYPE = 'PHONE'
+VITE_APP_PHONE_TYPE = 'SIP'
 VITE_APP_CALL_TYPE = 'VIOCE'
 VITE_APP_SIP_URL = 'ws://192.168.1.19:5066'
 VITE_APP_SIP_IP = '192.168.1.19'

bash.exe.stackdump

@@ -0,0 +1,28 @@
+Stack trace:
+Frame         Function      Args
+0007FFFF33E0  00021006118E (00021028DEE8, 000210272B3E, 0007FFFF33E0, 0007FFFF22E0) msys-2.0.dll+0x2118E
+0007FFFF33E0  0002100469BA (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x69BA
+0007FFFF33E0  0002100469F2 (00021028DF99, 0007FFFF3298, 0007FFFF33E0, 000000000000) msys-2.0.dll+0x69F2
+0007FFFF33E0  00021006A41E (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A41E
+0007FFFF33E0  00021006A545 (0007FFFF33F0, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A545
+0001004F94B7  00021006B9A5 (0007FFFF33F0, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2B9A5
+End of stack trace
+Loaded modules:
+000100400000 bash.exe
+7FFDD3550000 ntdll.dll
+7FFDD2C80000 KERNEL32.DLL
+7FFDCF8E0000 KERNELBASE.dll
+7FFDD1320000 USER32.dll
+7FFDD0660000 win32u.dll
+7FFDD34F0000 GDI32.dll
+7FFDCF620000 gdi32full.dll
+7FFDD05C0000 msvcp_win.dll
+7FFDCF7E0000 ucrtbase.dll
+000210040000 msys-2.0.dll
+7FFDD2DA0000 advapi32.dll
+7FFDD0850000 msvcrt.dll
+7FFDD0780000 sechost.dll
+7FFDD1660000 RPCRT4.dll
+7FFDCEE90000 CRYPTBASE.DLL
+7FFDCFB80000 bcryptPrimitives.dll
+7FFDD0820000 IMM32.DLL

src/components/main/Navbar/index.vue

@@ -158,7 +158,8 @@
    function getInterval() {
     getPageListData('/getauthdate').then(({ data }) => {
       console.log(data)
-      intervalDate.value = data || 0;
+      
+      // intervalDate.value = data || 0;
       if ( data === 0 ) {
         logout()
       }

src/components/page-order/src/form/complain.vue

@@ -3,7 +3,7 @@
 
         <el-form-item label="工单类别" prop="workordercate">
             <el-cascader v-model="form.workordercate" :props="{ value: 'id', }" placeholder="请选择工单类型"
-                :options="childrenTypes" filterable />
+                :options="childrenTypes" filterable  @change="changeType"/>
         </el-form-item>
         <el-form-item label="责任科室" prop="complaintdept">
             <el-tree-select style="width: 100%" v-model="form.complaintdept" filterable :data="deptData" check-strictly
@@ -12,15 +12,14 @@
         </el-form-item>
         <el-form-item label="责任人" prop="complaintuser">
             <el-select v-model="form.complaintuser" filterable placeholder="请选择责任人" style="width: 214px;">
-                <el-option v-for="item in userData" :key="item.userName" :label="item.nickName"
-                    :value="item.userName" />
+                <el-option v-for="item in userData" :key="item.userName" :label="item.nickName" :value="item.userName" />
             </el-select>
         </el-form-item>
-        <el-form-item label="患者姓名" prop="caller">
-            <el-input v-model="form.caller" placeholder="请输入患者姓名" />
+        <el-form-item :label="callerName" prop="caller">
+            <el-input v-model="form.caller" placeholder="请输入姓名" />
         </el-form-item>
-        <el-form-item label="患者电话" prop="callnum">
-            <el-input v-model="form.callnum" placeholder="请输入患者电话" />
+        <el-form-item :label="callerPhone" prop="callnum">
+            <el-input v-model="form.callnum" placeholder="请输入电话" />
         </el-form-item>
         <el-form-item label="内容" prop="content">
             <!-- complaintdept -->
@@ -63,8 +62,8 @@
     </div>
 </template>
 
-<script lang="ts" setup>
-import { reactive, ref, toRaw } from 'vue'
+<script setup>
+import { reactive, ref, toRaw, computed, watch, onMounted } from 'vue'
 import useSelectStore from '@/store/commonSelect/common';
 import { createPageData, editPageData, getPageListData } from '@/api/main/system/system';
 import { getUnprefixNuber } from '@/utils';
@@ -74,6 +73,9 @@ import moment from 'moment';
 import { initDb } from '@/utils/indexdb'
 import { getInstance } from "@michaelray/indexdb";
 
+
+const callerName = ref('患者姓名')
+const callerPhone = ref('患者电话')
 const childrenTypes = ref([]);
 const deptData = ref([])
 const userData = ref([])
@@ -97,11 +99,13 @@ watch(props, (nweProps) => {
 onMounted(() => {
     initMethod(props)
 });
+
 const stageState = computed(() => {
     return useSocketStore().stageState
 })
 const stageFlag = ref(true)
 function initMethod(props) {
+    userData.value = useSelectStore().userData;
     if (props.orderInfo && props.orderInfo.type) {
         getOrderType(props.orderInfo.type)
     }
@@ -178,26 +182,40 @@ async function customerDetail(customerno) {
         form.value.caller = resultData.data.name
     }
 }
+const changeType = (val) => {
+    console.log(val, 'changeType')
+    if (val.length && (val.indexOf(5010)!== -1)) {
+        callerName.value = '投诉人姓名'
+        callerPhone.value = '投诉人电话'
+    } else if(val.length && val.indexOf(4006)!== -1) {
+        callerName.value = '建议人姓名' 
+        callerPhone.value = '建议人电话'
+    } else {
+        callerName.value = '患者姓名'
+        callerPhone.value = '患者电话'
+       
+    }
+}
 function deptChange(val) {
     let deptId
     if (val) {
         deptId = val
-        getUserList(deptId)
+        // getUserList(deptId)
     } else {
         deptId = ''
     }
 
 }
 
-function getUserList(deptId = 0) {
-    const params = { deptId }
-    getPageListData('/common/user', params).then((res) => {
-        userData.value = res.data
-        form.value.complaintuser = props.orderInfo.complaintuser
-    })
-}
+// function getUserList(deptId = 0) {
+//     const params = { deptId }
+//     getPageListData('/common/user', params).then((res) => {
+//         userData.value = res.data
+//         form.value.complaintuser = props.orderInfo.complaintuser
+//     })
+// }
 // do not use same name with ref
-const form: any = ref({
+const form = ref({
     firsttype: 1000,
     workordercate: [],   // 工单类型
     callnum: '', // 患者电话 
@@ -261,7 +279,7 @@ const onSubmit = (formEl) => {
     formEl.validate((valid, fields) => {
         if (valid) {
 
-            const params: any = {
+            const params = {
                 ...form.value,
             };
 
@@ -312,10 +330,10 @@ function resetForm() {
     orderRef.value.resetFields()
 }
 
-const dealUsers: any = ref([]);
+const dealUsers = ref([]);
 const dealDeptChange = async (val) => {
 
-    const users = userData.value.filter((o: any) => {
+    const users = userData.value.filter((o) => {
         return o.deptId === val;
     });
     if (users && users.length > 0) {

src/utils/telWebsocket.js

@@ -23,6 +23,7 @@ const errorType = ['SayBusy','SayFree','Logout','Login','Auth']
 // 创建scoket连接
 
 export function createWebSocket(wsUrl) {
+  console.log(wsUrl)
   try {
     if ('WebSocket' in window) {
       ws = new WebSocket(wsUrl)

src/views/main/followUp/followUpTask/cpns/visitDetails.vue

@@ -251,11 +251,15 @@ async function initMethod(props) {
 }
 
 const taskStatusMap = ArrayToMap(taskStatus, 'value');
-
+const scoketState = computed(() => {
+  return useSocketStore().lineState
+})
 // 提交结果
 const submit = () => {
-    console.log(lineState.value)
-    if (!(lineState.value === '' || lineState.value === '在线')) return proxy.$modal.msgError('请等待用户挂断');
+    
+    lineState.value = scoketState.value
+    console.log('lineState.value', lineState.value)
+    if (!(lineState.value === '' || lineState.value === '在线' || lineState.value === '签出')) return proxy.$modal.msgError('请等待用户挂断');
     let params = {}
     if (planDetail.value.way === 1 &&  form.value.state === '正常接听') {
     // if (planDetail.value.way === 1) {
@@ -390,10 +394,10 @@ const callPhone = () => {
                     callId.value = data.CallID;
                 }
 
-                if (data.Type === 'State') {
-                    lineState.value = stateObj[data.State];
-                }
-                console.log(lineState.value)
+                // if (data.Type === 'State') {
+                //     lineState.value = stateObj[data.State];
+                // }
+                // console.log(lineState.value)
             });
         } else {
             lineState.value = '';