Browse Source

bUG修复

seimin 5 months ago
parent
commit
c9dd51a788

+ 2 - 2
src/app/views/fuwutai/fuwutai.component.html

@@ -1190,7 +1190,7 @@
1190
             <span class="grayFont">申请人:</span>
1190
             <span class="grayFont">申请人:</span>
1191
             <ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
1191
             <ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
1192
             <ng-container *ngIf="buildType !== '报修转事件'">
1192
             <ng-container *ngIf="buildType !== '报修转事件'">
1193
-              <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear>
1193
+              <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
1194
                 <ng-container *ngFor="let option of applicationRequesterList">
1194
                 <ng-container *ngFor="let option of applicationRequesterList">
1195
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
1195
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
1196
                 </ng-container>
1196
                 </ng-container>
@@ -1914,7 +1914,7 @@
1914
                   <div class="row gap8">
1914
                   <div class="row gap8">
1915
                     <div class="col">
1915
                     <div class="col">
1916
                       <span class="name required">故障现象:</span>
1916
                       <span class="name required">故障现象:</span>
1917
-                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)">
1917
+                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">>
1918
                         <ng-container *ngFor="let option of applicationCategoryList">
1918
                         <ng-container *ngFor="let option of applicationCategoryList">
1919
                           <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [nzValue]="option.id"></nz-option>
1919
                           <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [nzValue]="option.id"></nz-option>
1920
                         </ng-container>
1920
                         </ng-container>

+ 12 - 4
src/app/views/fuwutai/fuwutai.component.ts

@@ -2299,7 +2299,7 @@ export class FuwutaiComponent implements OnInit {
2299
     }
2299
     }
2300
     this.buildType = buildType;
2300
     this.buildType = buildType;
2301
     if(this.itsmData.mdv2Switch){
2301
     if(this.itsmData.mdv2Switch){
2302
-      this.resetOrderData();
2302
+      this.buildType !== '继续建单' && this.resetOrderData();
2303
       this.searchApplicationHospital();
2303
       this.searchApplicationHospital();
2304
       this.searchApplicationCategory();
2304
       this.searchApplicationCategory();
2305
       this.searchApplicationPriority();
2305
       this.searchApplicationPriority();
@@ -2760,7 +2760,7 @@ export class FuwutaiComponent implements OnInit {
2760
         "directProcess": 1,
2760
         "directProcess": 1,
2761
         "handleDescription": this.incidentModel.handleDescription,
2761
         "handleDescription": this.incidentModel.handleDescription,
2762
         "handlingPersonnelUser": {id: this.tool.getCurrentUserId()},
2762
         "handlingPersonnelUser": {id: this.tool.getCurrentUserId()},
2763
-        "yyTime": this.incidentModel.yyTime ? format(this.incidentModel.yyTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
2763
+        "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
2764
         "closecode": this.incidentModel.closecode ? { id: this.incidentModel.closecode } : undefined,
2764
         "closecode": this.incidentModel.closecode ? { id: this.incidentModel.closecode } : undefined,
2765
         "acceptUser": { id: this.tool.getCurrentUserId() },
2765
         "acceptUser": { id: this.tool.getCurrentUserId() },
2766
         "callID": this.incidentModel.callID || undefined,
2766
         "callID": this.incidentModel.callID || undefined,
@@ -3164,6 +3164,12 @@ export class FuwutaiComponent implements OnInit {
3164
   openChangeApplyDept(flag){
3164
   openChangeApplyDept(flag){
3165
     flag && this.searchApplicationDepartment('itsm');
3165
     flag && this.searchApplicationDepartment('itsm');
3166
   }
3166
   }
3167
+  openChangeApplyRequester(flag){
3168
+    flag && this.searchApplicationRequester();
3169
+  }
3170
+  openChangeApplyCategory(flag){
3171
+    flag && this.searchApplicationCategory();
3172
+  }
3167
   openChangeApplyGroup(flag){
3173
   openChangeApplyGroup(flag){
3168
     flag && this.searchApplicationGroup()
3174
     flag && this.searchApplicationGroup()
3169
   }
3175
   }
@@ -3479,7 +3485,7 @@ export class FuwutaiComponent implements OnInit {
3479
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
3485
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
3480
         "title": category.mutiCategory,
3486
         "title": category.mutiCategory,
3481
         "description": this.incidentModel.description,
3487
         "description": this.incidentModel.description,
3482
-        "yyTime": this.incidentModel.yyTime ? format(this.incidentModel.yyTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
3488
+        "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
3483
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
3489
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
3484
         "acceptUser": { id: this.tool.getCurrentUserId() },
3490
         "acceptUser": { id: this.tool.getCurrentUserId() },
3485
         "callID": this.incidentModel.callID || undefined,
3491
         "callID": this.incidentModel.callID || undefined,
@@ -3549,7 +3555,7 @@ export class FuwutaiComponent implements OnInit {
3549
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
3555
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
3550
         "title": category ? category.mutiCategory : '',
3556
         "title": category ? category.mutiCategory : '',
3551
         "description": this.incidentModel.description,
3557
         "description": this.incidentModel.description,
3552
-        "yyTime": this.incidentModel.yyTime ? format(this.incidentModel.yyTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
3558
+        "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
3553
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
3559
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
3554
         "acceptUser": { id: this.tool.getCurrentUserId() },
3560
         "acceptUser": { id: this.tool.getCurrentUserId() },
3555
         "callID": this.incidentModel.callID || undefined,
3561
         "callID": this.incidentModel.callID || undefined,
@@ -4646,6 +4652,8 @@ export class FuwutaiComponent implements OnInit {
4646
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
4652
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
4647
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
4653
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
4648
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
4654
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
4655
+    incidentModel.category && (this.applicationCategoryList = [cloneDeep(incidentModel.category)]);
4656
+    incidentModel.category && (incidentModel.category = incidentModel.category.id);
4649
     this.incidentModel = incidentModel;
4657
     this.incidentModel = incidentModel;
4650
     this.incidentMsg = incidentMsg;
4658
     this.incidentMsg = incidentMsg;
4651
     console.log('this.applicationDeptList:', this.applicationDeptList)
4659
     console.log('this.applicationDeptList:', this.applicationDeptList)