瀏覽代碼

BUG修复

seimin 7 月之前
父節點
當前提交
647709ec63

+ 17 - 5
src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -901,7 +901,11 @@ export class IncidentCreateComponent implements OnInit {
901
       if(this.buildType === '报修转事件'){
901
       if(this.buildType === '报修转事件'){
902
         postData.incident.fromWx = true;
902
         postData.incident.fromWx = true;
903
       }
903
       }
904
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
904
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
905
+        postData.incident = Object.assign({}, postData.incident);
906
+      }else{
907
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
908
+      }
905
     }
909
     }
906
 
910
 
907
     this.mainService
911
     this.mainService
@@ -1010,7 +1014,11 @@ export class IncidentCreateComponent implements OnInit {
1010
       if(this.buildType === '报修转事件'){
1014
       if(this.buildType === '报修转事件'){
1011
         postData.incident.fromWx = true;
1015
         postData.incident.fromWx = true;
1012
       }
1016
       }
1013
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
1017
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
1018
+        postData.incident = Object.assign({}, postData.incident);
1019
+      }else{
1020
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
1021
+      }
1014
     }
1022
     }
1015
     console.log(postData);
1023
     console.log(postData);
1016
     // return;
1024
     // return;
@@ -1080,7 +1088,11 @@ export class IncidentCreateComponent implements OnInit {
1080
       if(this.buildType === '报修转事件'){
1088
       if(this.buildType === '报修转事件'){
1081
         postData.incident.fromWx = true;
1089
         postData.incident.fromWx = true;
1082
       }
1090
       }
1083
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
1091
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
1092
+        postData.incident = Object.assign({}, postData.incident);
1093
+      }else{
1094
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
1095
+      }
1084
     }
1096
     }
1085
     console.log(postData);
1097
     console.log(postData);
1086
     // return;
1098
     // return;
@@ -1303,7 +1315,7 @@ export class IncidentCreateComponent implements OnInit {
1303
     this.solutionId = undefined;
1315
     this.solutionId = undefined;
1304
   }
1316
   }
1305
 
1317
 
1306
-  // 重置新建工单数据-继续建单-编辑
1318
+  // 重置新建工单数据-继续建单-编辑-报修转事件
1307
   resetOrderData2(){
1319
   resetOrderData2(){
1308
     this.fileList = [];
1320
     this.fileList = [];
1309
     this.repairImgs = [];
1321
     this.repairImgs = [];
@@ -1313,7 +1325,7 @@ export class IncidentCreateComponent implements OnInit {
1313
   // 打开新建工单
1325
   // 打开新建工单
1314
   async showNewOrder(des = '', phone = '', isInit = false, buildType = '') {
1326
   async showNewOrder(des = '', phone = '', isInit = false, buildType = '') {
1315
     this.buildType = buildType;
1327
     this.buildType = buildType;
1316
-    if(this.buildType !== '编辑事件'){
1328
+    if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
1317
       this.resetOrderData();
1329
       this.resetOrderData();
1318
     }else{
1330
     }else{
1319
       this.resetOrderData2();
1331
       this.resetOrderData2();

+ 10 - 2
src/app/views/fuwutai/fuwutai.component.ts

@@ -2793,7 +2793,11 @@ export class FuwutaiComponent implements OnInit {
2793
       if(this.buildType === '报修转事件'){
2793
       if(this.buildType === '报修转事件'){
2794
         postData.incident.fromWx = true;
2794
         postData.incident.fromWx = true;
2795
       }
2795
       }
2796
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
2796
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
2797
+        postData.incident = Object.assign({}, postData.incident);
2798
+      }else{
2799
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
2800
+      }
2797
     }
2801
     }
2798
 
2802
 
2799
     this.mainService
2803
     this.mainService
@@ -3527,7 +3531,11 @@ export class FuwutaiComponent implements OnInit {
3527
       if(this.buildType === '报修转事件'){
3531
       if(this.buildType === '报修转事件'){
3528
         postData.incident.fromWx = true;
3532
         postData.incident.fromWx = true;
3529
       }
3533
       }
3530
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
3534
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
3535
+        postData.incident = Object.assign({}, postData.incident);
3536
+      }else{
3537
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
3538
+      }
3531
     }
3539
     }
3532
     console.log(postData);
3540
     console.log(postData);
3533
     // return;
3541
     // return;