liuzhihui 2 years ago
parent
commit
8608a7c844

+ 2 - 2
CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -1468,8 +1468,8 @@
1468 1468
         this.wocode = code;
1469 1469
         this.fid = row.F_ID;
1470 1470
         this.rowdata = row;
1471
-        this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].tag
1472
-        console.log(name, "name",row.F_SonType,this.worktypeInfo);
1471
+        this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(row.F_SonType || row.F_WorkOrderCategory)].tag
1472
+        console.log(name, "name",row.F_SonType,row.F_WorkOrderCategory,this.worktypeInfo);
1473 1473
         console.log(this.getNowDate());
1474 1474
         if (name === "dispatch_zhuantongshi") {
1475 1475
           console.log(111);

+ 5 - 2
CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -1077,7 +1077,7 @@ export default {
1077 1077
               }
1078 1078
               this.ruleForm.F_WorkOrderContents = res.F_WorkOrderContents // 工单内容
1079 1079
               this.ruleForm.F_DealOpinions = res.F_DealOpinions // 处理意见
1080
-              this.ruleForm.F_FullName = res.F_FullName
1080
+              this.ruleForm.F_FullName = res.F_FullName || res.F_Customer
1081 1081
               this.ruleForm.F_IDNumber = decrypt(res.F_IDNumberShow)
1082 1082
               this.ruleForm.F_Relationship = res.F_Relationship
1083 1083
               this.ruleForm.EmergencyTypes = res.F_EmergencyTypes
@@ -1175,7 +1175,7 @@ export default {
1175 1175
       if(this.worktypeInfo3 == 'huizhen'){
1176 1176
         this.ruleForm.F_lyfs = ''
1177 1177
         this.ruleForm.F_sxzzd = ''
1178
-        this.patientMsgAll = null
1178
+        this.patientMsgAll = []
1179 1179
       }
1180 1180
       await this.clickEye()
1181 1181
       this.$refs.ruleForm.validate((valid) => {
@@ -1224,6 +1224,9 @@ export default {
1224 1224
             F_jzsj: this.ruleForm.F_jzsj,//就诊时间
1225 1225
             Hzxx: this.patientMsgAll
1226 1226
           }
1227
+          if(this.worktypeInfo3 !== 'menzhen'){
1228
+            delete params.Hzxx
1229
+          }
1227 1230
           // 添加
1228 1231
           if (!this.wid) {
1229 1232
             addOrEdittOrder(params)

+ 3 - 0
CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeWorkReport/cpns/LineBack.vue

@@ -71,6 +71,9 @@ export default {
71 71
            if(response.data == null){
72 72
              res = []
73 73
            }
74
+           if(res.length>15){
75
+             res = res.slice(0,15)
76
+           }
74 77
            res.forEach((element) => {
75 78
              deptarr.push(element.deptname)
76 79
              numarr.push(element.allnum)

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeWorkReport/index.vue

@@ -39,7 +39,7 @@
39 39
       <el-tab-pane label="趋势图" name="first">
40 40
         <report-charts ref="reportCharts"></report-charts>
41 41
       </el-tab-pane>
42
-      <el-tab-pane label="报工撤趋势图" name="second">
42
+      <el-tab-pane label="报工撤趋势图" name="second">
43 43
         <line-back ref="LineBack"></line-back>
44 44
       </el-tab-pane>
45 45
       <el-tab-pane label="表格" name="third">

+ 2 - 2
CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,8 +2,8 @@
2 2
     "name" : "郑州人民医院综合服务保障调度平台",
3 3
     "appid" : "__UNI__5A5207D",
4 4
     "description" : "",
5
-    "versionName" : "1.2.69",
6
-    "versionCode" : 169,
5
+    "versionName" : "1.2.70",
6
+    "versionCode" : 170,
7 7
     "transformPx" : false,
8 8
     /* 5+App特有相关 */
9 9
     "app-plus" : {

BIN
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/__UNI__5A5207D_cm.apk


+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/apkurl

@@ -1 +1 @@
1
-https://ide.dcloud.net.cn/build/download/ee843300-37e1-11ee-8cf8-3543b5db907e
1
+https://ide.dcloud.net.cn/build/download/03509180-3fd4-11ee-ab43-9945cebcc2b0

File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/cmManifestCache.json


File diff suppressed because it is too large
+ 9 - 9
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-service.js


File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-view.js


File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/manifest.json