报修类型

src/app/components/incidentManagement/incident-create/incident-create.component.html

@@ -22,7 +22,7 @@
             </nz-option>
           </nz-select>
         </div>
-        <div class="newTopItem">
+        <div class="newTopItem" [hidden]="incidentModel.repairIncidentType === 'public'">
           <span class="grayFont required">申请科室：</span>
           <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeInp('itsm', $event)" nzPlaceHolder="请选择申请科室" [(ngModel)]="incidentModel.department" (ngModelChange)="changeApplyDept($event)" nzAllowClear (nzOpenChange)="openChangeApplyDept($event)">
             <ng-container *ngFor="let option of applicationDeptList">
@@ -34,7 +34,7 @@
           </nz-select>
         </div>
         <div class="newTopItem">
-          <span class="grayFont">申请人：</span>
+          <span class="grayFont" [ngClass]="{'required': incidentModel.repairIncidentType === 'public'}">申请人：</span>
           <ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
           <ng-container *ngIf="buildType !== '报修转事件'">
             <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
@@ -45,9 +45,19 @@
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
               </nz-option>
             </nz-select>
-            <label nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
+            <label [hidden]="incidentModel.repairIncidentType === 'public'" nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
           </ng-container>
         </div>
+        <div class="newTopItem" *ngIf="incidentModel.incomingPhone">
+          <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
+        </div>
+        <div class="newTopItem">
+          <span class="grayFont">
+            <nz-radio-group [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
+              <label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>
+            </nz-radio-group>
+          </span>
+        </div>
       </div>
     </div>
     <div nz-row class="content">

src/app/components/incidentManagement/incident-create/incident-create.component.less

@@ -2105,10 +2105,13 @@
         font-size: 14px;
         .name{
           font-weight: bold;
-          margin-right: 48px;
+          margin-right: 24px;
         }
         .newTopItem{
-          margin-right: 24px;
+          margin-right: 16px;
+          &:last-of-type{
+            margin-right: 0;
+          }
         }
       }
     }

src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -97,6 +97,7 @@ export class IncidentCreateComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -604,6 +605,19 @@ export class IncidentCreateComponent implements OnInit {
       this.applicationSourceList = data || [];
     });
   }
+  // 报修类型列表
+  repairIncidentTypeList:any[] = [];
+  getRepairIncidentType() {
+    this.mainService.getDictionary("list", "repair_incident_type").subscribe((data) => {
+      this.repairIncidentTypeList = data || [];
+    });
+  }
+  // 选择报修类型
+  changeRepairIncidentType(value){
+    this.incidentModel.department = undefined;
+    this.isRelatedDepartment = false;
+    this.changeApplyRelatedDepartment(this.isRelatedDepartment);
+  }
   // 楼栋列表
   applicationBuildingList:any[] = [];
   searchApplicationBuilding(keyWord?, buildingId?) {
@@ -823,6 +837,11 @@ export class IncidentCreateComponent implements OnInit {
   maskFlag:any = false;
   // 运维-直接解决
   directOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -834,7 +853,7 @@ export class IncidentCreateComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -881,6 +900,7 @@ export class IncidentCreateComponent implements OnInit {
         "deleteFlag": 0,
         "duty": this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "alarmType": false,
         "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
         "contactsInformation": this.incidentModel.contactsInformation,
@@ -951,6 +971,11 @@ export class IncidentCreateComponent implements OnInit {
   }
   // 运维-建单并派单
   assignOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -962,7 +987,7 @@ export class IncidentCreateComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -1011,6 +1036,7 @@ export class IncidentCreateComponent implements OnInit {
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -1085,6 +1111,7 @@ export class IncidentCreateComponent implements OnInit {
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -1132,6 +1159,11 @@ export class IncidentCreateComponent implements OnInit {
   buildType;
   editOrder;
   saveOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -1143,7 +1175,7 @@ export class IncidentCreateComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -1187,6 +1219,7 @@ export class IncidentCreateComponent implements OnInit {
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -1328,7 +1361,11 @@ export class IncidentCreateComponent implements OnInit {
   resetOrderData2(){
     this.fileList = [];
     this.repairImgs = [];
-    this.isRelatedDepartment = true;
+    if(this.incidentModel.repairIncidentType === 'public'){
+      this.isRelatedDepartment = false;
+    }else{
+      this.isRelatedDepartment = true;
+    }
   }
 
   // 打开新建工单
@@ -1343,13 +1380,14 @@ export class IncidentCreateComponent implements OnInit {
     this.searchApplicationCategory();
     this.searchApplicationPriority();
     this.searchApplicationSource();
+    this.getRepairIncidentType();
     isInit ? this.searchApplicationDepartment('itsm', undefined, undefined, undefined, true) : this.searchApplicationDepartment('itsm');
     isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) || this.buildType === '报修转事件' ) && this.incidentModel.hosId && this.searchApplicationBuilding();
     isInit && this.incidentModel.area && this.searchApplicationFloor();
 
     this.currentRTab = 0;
     this.rightTitle_tab = [];
-    this.incidentModel = isInit ? this.incidentModel : {};
+    this.incidentModel = isInit ? this.incidentModel : { repairIncidentType: 'dept' };
     this.incidentMsg = isInit ? this.incidentMsg : {};
     this.isBuildOrderAgagin = false;
     this.incidentModel.department = isInit ? this.incidentModel.department : null;

src/app/views/fuwutai/fuwutai.component.html

@@ -988,7 +988,7 @@
               </nz-option>
             </nz-select>
           </div>
-          <div class="newTopItem">
+          <div class="newTopItem" [hidden]="incidentModel.repairIncidentType === 'public'">
             <span class="grayFont required">申请科室：</span>
             <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeInp('itsm', $event)" nzPlaceHolder="请选择申请科室" [(ngModel)]="incidentModel.department" (ngModelChange)="changeApplyDept($event)" nzAllowClear (nzOpenChange)="openChangeApplyDept($event)">
               <ng-container *ngFor="let option of applicationDeptList">
@@ -1000,7 +1000,7 @@
             </nz-select>
           </div>
           <div class="newTopItem">
-            <span class="grayFont">申请人：</span>
+            <span class="grayFont" [ngClass]="{'required': incidentModel.repairIncidentType === 'public'}">申请人：</span>
             <ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
             <ng-container *ngIf="buildType !== '报修转事件'">
               <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
@@ -1011,12 +1011,19 @@
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
                 </nz-option>
               </nz-select>
-              <label nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
+              <label [hidden]="incidentModel.repairIncidentType === 'public'" nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
             </ng-container>
           </div>
-          <div class="newTopItem" *ngIf="buildType !== '编辑事件'">
+          <div class="newTopItem" *ngIf="incidentModel.incomingPhone">
             <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
           </div>
+          <div class="newTopItem">
+            <span class="grayFont">
+              <nz-radio-group [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
+                <label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>
+              </nz-radio-group>
+            </span>
+          </div>
         </div>
       </div>
       <div nz-row class="content">

src/app/views/fuwutai/fuwutai.component.less

@@ -2140,10 +2140,13 @@
           font-size: 14px;
           .name{
             font-weight: bold;
-            margin-right: 48px;
+            margin-right: 24px;
           }
           .newTopItem{
-            margin-right: 24px;
+            margin-right: 16px;
+            &:last-of-type{
+              margin-right: 0;
+            }
           }
         }
       }

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

@@ -1040,7 +1040,7 @@ export class FuwutaiComponent implements OnInit {
     //呼入回调函数
     TLWSA.onCallin = function (jso) {
       console.log(jso);
-      _this.incidentModel = {};
+      _this.incidentModel = { repairIncidentType: 'dept' };
       _this.callNumber = _this.incidentModel.incomingPhone = jso.caller;//来电的电话
       _this.incidentModel.callID = jso.crs;//来电的话机id
       if (jso) {
@@ -1426,20 +1426,20 @@ export class FuwutaiComponent implements OnInit {
         // 200签入 201摘机 202来电
         if (data.status == 200 && data.phone) {
           this.incomingService.setPhoneNumber(phoneNumber);
-          this.incidentModel = {};
+          this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
           this.msg.info('签入成功');
           this.cancelBindExtensionNumber();
         } else if (data.status == 201 && data.phone) {
-          this.incidentModel = {};
+          this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
 
           this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data.phone;
           this.searchBxDept();
         } else if (data.status == 201 && data.phone === "") {
-          this.incidentModel = {};
+          this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
           //没绑定科室
@@ -2382,7 +2382,11 @@ export class FuwutaiComponent implements OnInit {
   resetOrderData2(){
     this.fileList = [];
     this.repairImgs = [];
-    this.isRelatedDepartment = true;
+    if(this.incidentModel.repairIncidentType === 'public'){
+      this.isRelatedDepartment = false;
+    }else{
+      this.isRelatedDepartment = true;
+    }
   }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
@@ -2405,6 +2409,7 @@ export class FuwutaiComponent implements OnInit {
       this.searchApplicationCategory();
       this.searchApplicationPriority();
       this.searchApplicationSource();
+      this.getRepairIncidentType();
       isInit ? this.searchApplicationDepartment('itsm', undefined, undefined, undefined, true) : this.searchApplicationDepartment('itsm');
       isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) || this.buildType === '报修转事件' ) && this.incidentModel.hosId && this.searchApplicationBuilding();
       isInit && this.incidentModel.area && this.searchApplicationFloor();
@@ -2415,7 +2420,7 @@ export class FuwutaiComponent implements OnInit {
         this.fixedTab = "newOrder";
         this.currentRTab = 0;
         this.rightTitle_tab = [];
-        this.incidentModel = isInit ? this.incidentModel : {};
+        this.incidentModel = isInit ? this.incidentModel : { repairIncidentType: 'dept' };
         this.incidentMsg = isInit ? this.incidentMsg : {};
         this.isBuildOrderAgagin = false;
         this.applyDept = null;
@@ -2457,7 +2462,7 @@ export class FuwutaiComponent implements OnInit {
     this.fixedTab = "newOrder";
     this.currentRTab = 0;
     this.rightTitle_tab = [];
-    this.incidentModel = isInit ? this.incidentModel : {};
+    this.incidentModel = isInit ? this.incidentModel : { repairIncidentType: 'dept' };
     this.incidentMsg = isInit ? this.incidentMsg : {};
     this.isBuildOrderAgagin = false;
     this.applyDept = null;
@@ -2854,6 +2859,7 @@ export class FuwutaiComponent implements OnInit {
         "deleteFlag": 0,
         "duty": this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "alarmType": false,
         "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
         "contactsInformation": this.incidentModel.contactsInformation,
@@ -3129,6 +3135,19 @@ export class FuwutaiComponent implements OnInit {
       this.applicationSourceList = data || [];
     });
   }
+  // 报修类型列表
+  repairIncidentTypeList:any[] = [];
+  getRepairIncidentType() {
+    this.mainService.getDictionary("list", "repair_incident_type").subscribe((data) => {
+      this.repairIncidentTypeList = data || [];
+    });
+  }
+  // 选择报修类型
+  changeRepairIncidentType(value){
+    this.incidentModel.department = undefined;
+    this.isRelatedDepartment = false;
+    this.changeApplyRelatedDepartment(this.isRelatedDepartment);
+  }
   // 楼栋列表
   applicationBuildingList:any[] = [];
   searchApplicationBuilding(keyWord?, buildingId?) {
@@ -3504,6 +3523,11 @@ export class FuwutaiComponent implements OnInit {
   maskFlag:any = false;
   // 运维-直接解决
   directOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -3515,7 +3539,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -3549,6 +3573,11 @@ export class FuwutaiComponent implements OnInit {
   }
   // 运维-建单并派单
   assignOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -3561,7 +3590,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -3610,6 +3639,7 @@ export class FuwutaiComponent implements OnInit {
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -3684,6 +3714,7 @@ export class FuwutaiComponent implements OnInit {
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -3730,6 +3761,11 @@ export class FuwutaiComponent implements OnInit {
 
   // 运维-保存
   saveOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -3741,7 +3777,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -3784,6 +3820,7 @@ export class FuwutaiComponent implements OnInit {
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -4936,6 +4973,7 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -4966,6 +5004,7 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -5064,6 +5103,7 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);