Merge branch 'master' into develop

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

@@ -1190,7 +1190,7 @@
             <span class="grayFont">申请人：</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>
+              <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
                 <ng-container *ngFor="let option of applicationRequesterList">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
                 </ng-container>
@@ -1914,7 +1914,7 @@
                   <div class="row gap8">
                     <div class="col">
                       <span class="name required">故障现象：</span>
-                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)">
+                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">>
                         <ng-container *ngFor="let option of applicationCategoryList">
                           <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [nzValue]="option.id"></nz-option>
                         </ng-container>

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

@@ -2299,7 +2299,7 @@ export class FuwutaiComponent implements OnInit {
     }
     this.buildType = buildType;
     if(this.itsmData.mdv2Switch){
-      this.resetOrderData();
+      this.buildType !== '继续建单' && this.resetOrderData();
       this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
@@ -2760,7 +2760,7 @@ export class FuwutaiComponent implements OnInit {
         "directProcess": 1,
         "handleDescription": this.incidentModel.handleDescription,
         "handlingPersonnelUser": {id: this.tool.getCurrentUserId()},
-        "yyTime": this.incidentModel.yyTime ? format(this.incidentModel.yyTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
+        "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "closecode": this.incidentModel.closecode ? { id: this.incidentModel.closecode } : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
@@ -3164,6 +3164,12 @@ export class FuwutaiComponent implements OnInit {
   openChangeApplyDept(flag){
     flag && this.searchApplicationDepartment('itsm');
   }
+  openChangeApplyRequester(flag){
+    flag && this.searchApplicationRequester();
+  }
+  openChangeApplyCategory(flag){
+    flag && this.searchApplicationCategory();
+  }
   openChangeApplyGroup(flag){
     flag && this.searchApplicationGroup()
   }
@@ -3479,7 +3485,7 @@ export class FuwutaiComponent implements OnInit {
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
         "title": category.mutiCategory,
         "description": this.incidentModel.description,
-        "yyTime": this.incidentModel.yyTime ? format(this.incidentModel.yyTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
+        "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,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
@@ -3549,7 +3555,7 @@ export class FuwutaiComponent implements OnInit {
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
         "title": category ? category.mutiCategory : '',
         "description": this.incidentModel.description,
-        "yyTime": this.incidentModel.yyTime ? format(this.incidentModel.yyTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
+        "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,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
@@ -4646,6 +4652,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)