소스 검색

新增耗材BUG和详情汇总单显示

seimin 11 달 전
부모
커밋
5884e5b110
3개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      manifest.json
  2. 1 1
      pages/consumableList/consumableList.vue
  3. 1 1
      pages/incidentDetail/incidentDetail.vue

+ 1 - 1
manifest.json

@@ -62,7 +62,7 @@
62 62
         "devServer" : {
63 63
             "proxy" : {
64 64
                 "/service" : {
65
-                    "target" : "http://192.168.3.111", //请求的目标域名
65
+                    "target" : "http://192.168.4.105", //请求的目标域名
66 66
                     "changeOrigin" : true, //是否跨域
67 67
                     "secure" : false
68 68
                 }

+ 1 - 1
pages/consumableList/consumableList.vue

@@ -85,7 +85,7 @@
85 85
     let postData = {
86 86
       "consumableList": [
87 87
         {
88
-          "consumablesId": dataInfo.selectData.id,
88
+          "consumablesId": dataInfo.selectData.consumableId,
89 89
           "consumablesNum": dataInfo.evtNumber
90 90
         }
91 91
       ],

+ 1 - 1
pages/incidentDetail/incidentDetail.vue

@@ -363,7 +363,7 @@
363 363
         dataInfo.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
364 364
         
365 365
         // 维修汇总单
366
-        if(dataInfo.incidentData.state.value == 'close' && dataInfo.incidentData.duty.addSummary == 1){
366
+        if(dataInfo.incidentData.state.value == 'close' && dataInfo.incidentData.duty.addSummary == 1 && dataInfo.incidentData.repairSummary == 1){
367 367
           let flag = dataInfo.tabs.some(v => v.value === '2');
368 368
           !flag && dataInfo.tabs.splice(1, 0, {id: 2, name: '维修汇总单', value: '2', num: ''});
369 369
         }