Merge branch 'master' into develop

src/app/components/incidentManagement/incident-handle-order/incident-handle-order.component.ts

@@ -238,22 +238,31 @@ export class IncidentHandleOrderComponent implements OnInit {
 
     if (this.add) {
       //增加
-      let workHourManagementList = this.summaryObj.workHourManagementList || [];
-      postData = {
-        "workHourManagementList": workHourManagementList.map(v => ({workHourId: v.id, workHourNum: v.workHourNum2 || 1})),
-        "summaryId": this.summaryId,
-      };
-      let index = postData.workHourManagementList.findIndex(v => v.workHourId == this.validateWorkHourManagementForm.value.workHourId.slice(-1)[0]);
-      if(index > -1){
-        postData.workHourManagementList[index].workHourNum += this.validateWorkHourManagementForm.value.workHourNum;
-      }else{
-        postData.workHourManagementList.push(
-          {
-            "workHourId": this.validateWorkHourManagementForm.value.workHourId.slice(-1)[0],
-            "workHourNum": this.validateWorkHourManagementForm.value.workHourNum,
-          }
-        );
-      }
+      // let workHourManagementList = this.summaryObj.workHourManagementList || [];
+      // postData = {
+      //   "workHourManagementList": workHourManagementList.map(v => ({workHourId: v.id, workHourNum: v.workHourNum2 || 1})),
+      //   "summaryId": this.summaryId,
+      // };
+      // let index = postData.workHourManagementList.findIndex(v => v.workHourId == this.validateWorkHourManagementForm.value.workHourId.slice(-1)[0]);
+      // if(index > -1){
+      //   postData.workHourManagementList[index].workHourNum += this.validateWorkHourManagementForm.value.workHourNum;
+      // }else{
+      //   postData.workHourManagementList.push(
+      //     {
+      //       "workHourId": this.validateWorkHourManagementForm.value.workHourId.slice(-1)[0],
+      //       "workHourNum": this.validateWorkHourManagementForm.value.workHourNum,
+      //     }
+      //   );
+      // }
+			postData ={
+				"workHourManagementList": [
+				  {
+				    "workHourId": this.validateWorkHourManagementForm.value.workHourId.slice(-1)[0],
+				    "workHourNum": this.validateWorkHourManagementForm.value.workHourNum,
+				  }
+				],
+				"summaryId": this.summaryId,
+			}
     } else {
       //编辑
       postData = {