合并代码

src/app/views/fuwutai/fuwutai.component.ts

@@ -2301,7 +2301,7 @@ export class FuwutaiComponent implements OnInit {
     }
     this.buildType = buildType;
     if(this.itsmData.mdv2Switch){
-      this.buildType !== '编辑事件' && this.resetOrderData();
+      this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.resetOrderData();
       this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
@@ -4719,6 +4719,8 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
+    incidentModel.category && (this.applicationCategoryList = [cloneDeep(incidentModel.category)]);
+    incidentModel.category && (incidentModel.category = incidentModel.category.id);
     this.incidentModel = incidentModel;
     this.incidentMsg = incidentMsg;
     console.log('this.applicationDeptList:', this.applicationDeptList)