bug fix

CallCenterWeb.UI/RMYY/bash.exe.stackdump

@@ -0,0 +1,28 @@
+Stack trace:
+Frame         Function      Args
+0007FFFFA3D0  00021006118E (00021028DEE8, 000210272B3E, 0007FFFFA3D0, 0007FFFF92D0) msys-2.0.dll+0x2118E
+0007FFFFA3D0  0002100469BA (000000000000, 000000000000, 000000000000, 000000000004) msys-2.0.dll+0x69BA
+0007FFFFA3D0  0002100469F2 (00021028DF99, 0007FFFFA288, 0007FFFFA3D0, 000000000000) msys-2.0.dll+0x69F2
+0007FFFFA3D0  00021006A41E (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A41E
+0007FFFFA3D0  00021006A545 (0007FFFFA3E0, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A545
+0001004F94B7  00021006B9A5 (0007FFFFA3E0, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2B9A5
+End of stack trace
+Loaded modules:
+000100400000 bash.exe
+7FFB8C6A0000 ntdll.dll
+7FFB89F90000 KERNEL32.DLL
+7FFB89420000 KERNELBASE.dll
+7FFB8A6F0000 USER32.dll
+7FFB89760000 win32u.dll
+7FFB89A80000 GDI32.dll
+7FFB88A80000 gdi32full.dll
+7FFB896C0000 msvcp_win.dll
+7FFB89780000 ucrtbase.dll
+000210040000 msys-2.0.dll
+7FFB8A590000 advapi32.dll
+7FFB8A650000 msvcrt.dll
+7FFB8AA20000 sechost.dll
+7FFB8A8F0000 RPCRT4.dll
+7FFB880A0000 CRYPTBASE.DLL
+7FFB88A00000 bcryptPrimitives.dll
+7FFB8C630000 IMM32.DLL

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -867,6 +867,7 @@ export default {
       hospitalDataLists: [],
       coperDataLists: [],
       orderTypeSzData: ['menzhen', 'JZ', 'zhuyuan', 'jiancha'],
+      orderTypeYqData: ['menzhen', 'JZ', 'zhuyuan', 'jiancha','XZ','huizhen'],
       isshowmen: '1',
       // 工单标识为 'menzhen','JZ','zhuyuan','jiancha' 的患者信息
       patientMsgAll: [
@@ -1002,6 +1003,7 @@ export default {
         ]
       },
       F_Type2: '',
+      linkManYQ: '',
       ruleForm: {
         jzks: '',
         patientName: '',
@@ -1071,14 +1073,23 @@ export default {
   watch: {
     'patientDatas': function() {
       this.zsyh = this.patientDatas.zsyh
-      this.ruleForm.F_Customer = this.patientDatas.hzxm
+      if (this.orderTypeYqData.indexOf(this.worktypeInfo3) === -1) {
+        this.ruleForm.F_Customer = this.patientDatas.hzxm
+      }
+     
       this.ruleForm.F_FullName = this.patientDatas.hzxm
       this.ruleForm.F_IDNumber = this.patientDatas.zjhm
       this.ruleForm.F_IDNumberShow =  this.patientDatas.zjhmShow
       this.ruleForm.F_CusAddress = this.patientDatas.jtdz
       this.ruleForm.F_CusAddressShow =  this.patientDatas.jtdzShow
+<<<<<<< HEAD
       this.patientMsgAll[0].guanchuangyisheng = this.ruleForm.F_Customer
       this.clickbefore = 0
+=======
+      // this.patientMsgAll[0].guanchuangyisheng = this.ruleForm.F_Customer
+      this.clickbefore = 0
+
+>>>>>>> master
     },
     'orderTypeData.F_Type2': function() {
       this.ruleForm.clbm = ''
@@ -1119,10 +1130,14 @@ export default {
       if (this.worktypeInfo3 === 'ywzx_lasc') {
         this.getRelations()
       }
+      if (this.orderTypeYqData.indexOf(this.worktypeInfo3) !== -1) {
+        this.getYQmsg()
+      }
       if (this.orderTypeSzData.indexOf(this.worktypeInfo3) !== -1) {
         this.getCoperyq()
         this.getListyq()
-        this.getYQmsg()
+
+       
         console.log('F_Customer',this.ruleForm.F_Customer)
         this.patientMsgAll[0].guanchuangtel = this.ruleForm.F_Phon
         if (!this.wid) {
@@ -1390,7 +1405,7 @@ export default {
         jzyq: '',
         F_nl: '',
         F_Sex: '0',
-        guanchuangyisheng: this.ruleForm.F_Customer,
+        guanchuangyisheng: this.linkManYQ,
         guanchuangtel: this.ruleForm.F_Phon,
         F_sxzzd: '1', // 双向转诊单
         F_lyfs: '0', // 来院方式
@@ -1500,8 +1515,8 @@ export default {
             // const getPointOfCare =  this.$store.getters.deptmap[this.zhuyuanArr[0].AssignedPatientLocation.PointOfCare].ids
             console.log('getPointOfCare',this.zhuyuanArr[0].AssignedPatientLocation.PointOfCare)
             // this.patientMsgXZ[this.currentIndexXZ].zyks = getPointOfCare // PointOfCareName
-            this.patientMsgXZ[this.currentIndexXZ].inpatientnum = this.zhuyuanArr[0].VisitNumber.CardID
-            this.patientMsgXZ[this.currentIndexXZ].guanchuangyisheng = this.zhuyuanArr[0].AttendingDoctor.FamilyName
+            // this.patientMsgXZ[this.currentIndexXZ].inpatientnum = this.zhuyuanArr[0].VisitNumber.CardID
+            // this.patientMsgXZ[this.currentIndexXZ].guanchuangyisheng = this.zhuyuanArr[0].AttendingDoctor.FamilyName
 
           })
 
@@ -1597,8 +1612,10 @@ export default {
       GetModelByTel(params).then(res => {
         if (res.state == 'success' && res.data) {
           this.ruleForm.F_Yqname = res.data.F_YqName
-          res.data.F_LinkMan && (this.ruleForm.F_Customer = res.data.F_LinkMan)
-          this.patientMsgAll[0].guanchuangyisheng = this.ruleForm.F_Customer
+          // res.data.F_LinkMan && (this.ruleForm.F_Customer = res.data.F_LinkMan)
+          this.patientMsgAll[0].guanchuangyisheng = res.data.F_LinkMan
+          this.ruleForm.F_Customer = res.data.F_LinkMan
+          this.linkManYQ = res.data.F_LinkMan
         } else {
           this.ruleForm.F_Yqname = ''
           this.isAddHos = 1 // 没有数据存标识，提交工单调添加合作院区接口
@@ -1640,8 +1657,11 @@ export default {
           setTimeout(() => {
             const this_ = this
             this_.zsyh = window.localStorage.getItem('zsyh') || ''
-            this_.ruleForm.F_Customer = window.localStorage.getItem('huanxm') || ''
-            this.patientMsgAll[0].guanchuangyisheng = this.ruleForm.F_Customer
+            if (this.orderTypeYqData.indexOf(this.worktypeInfo3) === -1) {
+              this_.ruleForm.F_Customer = window.localStorage.getItem('huanxm') || ''
+              this.patientMsgAll[0].guanchuangyisheng = this.ruleForm.F_Customer
+            }
+           
           }, 1000)
         }
         if (!this.ruleForm.F_FullName) {

CallCenterWeb.UI/RMYY/src/views/callScreen/components/RegList.vue

@@ -402,7 +402,7 @@ export default {
       console.log(e)
       const newValue = e.split('_')[0]
       this.tableObj.deptName = this.findNameById(newValue, this.deptarr, 'ksmc', 'ksdm')
-      this.tableObj.czlxDept = this.findNameById(newValue, this.deptarr, 'czlx', 'ksdm')
+      this.tableObj.czlxDept = e.split('_')[1]
 
       const params = {
         ksdm: newValue,

CallCenterWeb.UI/RMYY/src/views/callScreen/components/callScreen.vue

@@ -178,7 +178,8 @@ export default {
       }
     })
     this.callinNum = this.telCallNum // 来电号码  $route.params.telInNumber
-    // this.callinNum = '15638114211' // 来电号码  $route.params.telInNumber
+    // this.callinNum = '13803899019' // 来电号码  $route.params.telInNumber 13803899019 
+    // this.callinNum = '15638114211' // 来电号码  $route.params.telInNumber 13803899019   
     this.ldphone = this.$route.params.telInNumber
     if (this.$route.params.callid) {
       this.callinCallid = this.$route.params.callid.toString() // 来电callid  $route.params.callid

CallCenterWeb.UI/RMYY/src/views/customerManagement/customerList/components/detail.vue

@@ -89,9 +89,15 @@ export default {
   },
   methods: {
     clickEye() {
-      this.ruleForm.idcard = decrypt(this.ruleForm.F_IdCardShow)
-      this.ruleForm.telphone = decrypt(this.ruleForm.F_TelephoneShow)
-      this.ruleForm.adddress = decrypt(this.ruleForm.F_AddressShow)
+      if (this.ruleForm.F_IdCardShow)  {
+        this.ruleForm.idcard = decrypt(this.ruleForm.F_IdCardShow)
+      }
+      if (this.ruleForm.F_TelephoneShow) {
+        this.ruleForm.telphone = decrypt(this.ruleForm.F_TelephoneShow) 
+      }
+      if (this.ruleForm.F_AddressShow) {
+        this.ruleForm.adddress = decrypt(this.ruleForm.F_AddressShow)
+      }
       this.clickbefore = 1
       // const params = {
       //   id:this.ruleForm.id