服务台编辑事件

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

@@ -454,6 +454,7 @@
                   </div>
                 </div>
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                  <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
                   <input type="button" *ngIf="data.computedReceiveFlag" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗？','接单','receive')" />
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
@@ -658,6 +659,7 @@
                   </div>
                 </div>
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                  <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
                   <input type="button" *ngIf="data.computedHandleFlag" class="top_bot" value="处理" (click)="handle(data.data)" />
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
@@ -1190,7 +1192,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>
@@ -1201,7 +1203,7 @@
               <label nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
             </ng-container>
           </div>
-          <div class="newTopItem">
+          <div class="newTopItem" *ngIf="buildType !== '编辑事件'">
             <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
           </div>
         </div>
@@ -1212,7 +1214,7 @@
             <div class="tabs__inner" #tab>
               <div class="tabs__wrap" [style.transform]="'translateX(' + disX + 'px)'">
                 <ng-container *ngFor="let item of workTypesArrange | keyvalue">
-                  <div [ngClass]="{ tab: true, checked: currentTabIndex == item.key}" (click)="tabClick(item.key)">
+                  <div [ngClass]="{ tab: true, checked: currentTabIndex == item.key}" (click)="tabClick(item.key)" *ngIf="buildType !== '编辑事件' || (buildType === '编辑事件' && item.key == 99999)">
                     {{ item.value[0].associationTypeName }}
                   </div>
                 </ng-container>
@@ -1890,7 +1892,7 @@
                       <span class="name">报修人电话：</span>
                       <ng-container *ngIf="incidentMsg.requesterPhone">{{incidentMsg.requesterPhone}}<em (click)="importPhone(incidentMsg.requesterPhone)">引入</em></ng-container>
                     </div>
-                    <div class="col">
+                    <div class="col" *ngIf="buildType !== '编辑事件'">
                       <span class="name">来电电话：</span>
                       <ng-container *ngIf="incidentModel.incomingPhone">{{incidentModel.incomingPhone}}<em (click)="importPhone(incidentModel.incomingPhone)">引入</em></ng-container>
                     </div>
@@ -1914,7 +1916,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>
@@ -1977,7 +1979,7 @@
                     </div>
                   </div>
 
-                  <div class="row gap8">
+                  <div class="row gap8" *ngIf="buildType !== '编辑事件'">
                     <div class="col">
                       <span class="name required">处理组：</span>
                       <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('group', $event)" nzPlaceHolder="请选择处理组" [(ngModel)]="incidentModel.group" (ngModelChange)="changeApplyGroup($event)" (nzOpenChange)="openChangeApplyGroup($event)">
@@ -2252,7 +2254,7 @@
             {{isYyInspect ? '预约建单' :'直接建单'}}
           </button>
         </ng-container>
-        <ng-container *ngIf="currentTabIndex === '99999'">
+        <ng-container *ngIf="currentTabIndex === '99999' && buildType !== '编辑事件'">
           <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件' && buildType !== '留言转事件'">是否连续建单</label>
           <button nz-button class="btn" nzType="primary" (click)="directOrder()">
             直接解决
@@ -2264,6 +2266,11 @@
             暂存
           </button>
         </ng-container>
+        <ng-container *ngIf="currentTabIndex === '99999' && buildType === '编辑事件'">
+          <button nz-button class="btn" nzType="primary" (click)="saveOrder()">
+            保存
+          </button>
+        </ng-container>
         <button class="btn cancel" nz-button nzType="default" (click)="newOrderCancel()">
           取消
         </button>

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

@@ -2013,6 +2013,7 @@ export class FuwutaiComponent implements OnInit {
             if(item.type === 'mdv2'){
               item.computedSubstitutionFlag = this.computedSubstitution(item.data)
               item.computedReceiveFlag = this.computedReceive(item.data)
+              item.computedEditFlag = this.computedEdit(item.data)
             }
           });
           this.arriveList = arriveList;
@@ -2027,6 +2028,7 @@ export class FuwutaiComponent implements OnInit {
             if(item.type === 'mdv2'){
               item.computedSubstitutionFlag = this.computedSubstitution(item.data)
               item.computedHandleFlag = this.computedHandle(item.data)
+              item.computedEditFlag = this.computedEdit(item.data)
             }
           });
           this.executionList = executionList;
@@ -2299,7 +2301,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 +2762,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 +3166,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()
   }
@@ -3452,7 +3460,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.group){
+    if(!this.incidentModel.group && this.buildType !== '编辑事件'){
       this.msg.warning('请选择处理组!');
       return;
     }
@@ -3479,7 +3487,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 +3557,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,
@@ -3590,6 +3598,71 @@ export class FuwutaiComponent implements OnInit {
       });
   }
 
+  // 运维-保存
+  saveOrder(){
+    this.maskFlag = this.msg.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let category;
+    if(this.incidentModel.category){
+      category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
+    }
+
+    let postData:any = {
+      solutionId: this.solutionId,
+      "incident": {
+        "id": this.incidentModel.id || undefined,
+        "deleteFlag": 0,
+        "duty": this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
+        "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
+        "contactsInformation": this.incidentModel.contactsInformation,
+        "contacts": this.incidentModel.contacts,
+        "hosId": this.incidentModel.hosId || undefined,
+        "area": this.incidentModel.area ? { id: this.incidentModel.area } : undefined,
+        "place": this.incidentModel.place ? { id: this.incidentModel.place } : undefined,
+        "houseNumber": this.incidentModel.houseNumber,
+        "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
+        "priorityId": this.incidentModel.priorityId || undefined,
+        "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
+        "title": category ? category.mutiCategory : '',
+        "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,
+        "acceptUser": { id: this.tool.getCurrentUserId() },
+        "callID": this.incidentModel.callID || undefined,
+        "incomingPhone": this.incidentModel.incomingPhone || undefined,
+        "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+      }
+    };
+    if(this.buildType){
+      postData.incident = Object.assign({}, this.editOrder, postData.incident);
+    }
+    console.log(postData);
+    // return;
+
+    this.mainService
+      .flowPost("incident/task/edit", postData)
+      .subscribe((result) => {
+        this.msg.remove(this.maskFlag);
+        this.maskFlag = false;
+
+        if (result.state == 200) {
+          // 图片上传
+          if(this.fileList.length){
+            console.log(this.fileList.map(v => v.originFileObj));
+            this.fileList.map(v => v.originFileObj).forEach(async file => {
+              await this.uploadImages(file, result.data.id);
+            })
+          }
+          // this.msg.success('编辑成功');
+          this.isBuildOrderAgaginFn();
+        } else {
+          this.msg.error('编辑失败');
+        }
+      });
+  }
+
   // 是否连续建单
   isBuildOrderAgaginFn(){
     if(this.isBuildOrderAgagin){
@@ -4726,6 +4799,35 @@ export class FuwutaiComponent implements OnInit {
     });
   }
 
+  // 编辑-弹窗
+  edit(data){
+    this.editOrder = cloneDeep(data);
+    let incidentModel = cloneDeep(data);
+    let incidentMsg:any = {};
+    console.log('data:', data)
+    incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
+    incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
+    incidentModel.department && (incidentModel.department = incidentModel.department.id);
+    incidentModel.requester && (this.applicationRequesterList = [cloneDeep(incidentModel.requester)]);
+    incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
+    incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
+    incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    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.applicationRequesterList:', this.applicationRequesterList)
+    console.log('this.applicationDeptList:', this.applicationDeptList)
+    console.log('incidentModel:', incidentModel)
+    this.showNewOrder('', '', true, '编辑事件');
+
+    // 查询报修图片
+    this.getRepairImgs(data.id);
+  }
+
   // 换人处理-弹窗
   substitutionModalShow = false; //弹窗开关
   substitution(data) {
@@ -4763,6 +4865,11 @@ export class FuwutaiComponent implements OnInit {
     return (data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign)) && data.deleteFlag !== 1;
   }
 
+  // 是否显示编辑按钮
+  computedEdit(data){
+    return (data.state.value === 'pending' || data.state.value === 'reassign' || data.state.value === 'handler' || data.state.value === 'close') && this.coopBtns.edit && data.deleteFlag !== 1;
+  }
+
   // 是否显示处理按钮
   computedHandle(data){
     return this.coopBtns.handle && data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;