回访

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

@@ -0,0 +1,31 @@
+<!--
+ * @Author: seimin
+ * @Date: 2024-08-26 11:00:55
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-08-26 11:30:53
+ * @Description: 处理信息展示
+-->
+<div class="detailItem">
+  <div class="name">解决方案：</div>
+  <div class="value">{{incidentData.handleDescription}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">处理人：</div>
+  <div class="value">{{computedHandlerUser}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">处理时间：</div>
+  <div class="value">{{incidentData.handleTime | date:'yyyy-MM-dd HH:mm'}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">接单时间：</div>
+  <div class="value">{{incidentData.responseHandleTime | date:'yyyy-MM-dd HH:mm'}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">处理图片：</div>
+  <div class="value thumbs">
+    <div class="thumb" *ngFor="let item of handleImgs;let index = index;" (click)="previewImageHandler(handleImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+  </div>
+</div>
+<!-- 图片预览 -->
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>

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

@@ -0,0 +1,39 @@
+@import "../../../../../src/theme.less";
+.detailItem{
+  display: flex;
+  padding-bottom: 16px;
+  .name{
+    width: 5em;
+    flex-shrink: 0;
+    text-align: left;
+  }
+  .value{
+    flex: 1;
+    text-align: justify;
+  }
+  .thumbs{
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 8px;
+    .thumb{
+      width: 64px;
+      height: 64px;
+      padding: 4px;
+      border-radius: 4px;
+      border: 1px solid rgba(0,0,0,0.15);
+      img{
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+        object-position: center;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .audio{
+    width: 264px;
+    height: 1.5em;
+  }
+}

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

@@ -0,0 +1,71 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+
+@Component({
+  selector: 'app-incident-handle-handle',
+  templateUrl: './incident-handle-handle.component.html',
+  styleUrls: ['./incident-handle-handle.component.less']
+})
+export class IncidentHandleHandleComponent implements OnInit {
+  @Input() incidentData: any = {};
+
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private tool: ToolService,
+  ) { }
+
+  hosId:any;
+
+  ngOnInit() {
+    console.log(this.incidentData);
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getRepairImgs();
+  }
+
+  // 处理人
+  get computedHandlerUser(){
+    if(this.incidentData.state.value == 'pending' && this.incidentData.currentLog){
+      return this.incidentData.currentLog.workerName;
+    }
+    if(this.incidentData.state.value != 'pending' && this.incidentData.handlingPersonnelUser){
+      return this.incidentData.handlingPersonnelUser.name;
+    }
+  }
+
+  // 获取处理图片
+  handleImgs:any[] = [];//处理图片
+  getRepairImgs() {
+    this.mainService
+      .getPreviewImage('incident', this.incidentData.id)
+      .subscribe((res:any) => {
+        res.data = res.data || [];
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+        })
+        this.handleImgs = res.data;
+      });
+  }
+
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  initialViewIndex:number = 0;
+  previewImageHandler(data = [], index = 0) {
+    this.initialViewIndex = index;
+    console.log(index)
+    this.isPreview = false;
+    data = data || [];
+    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+    setTimeout(() => {
+      this.isPreview = true;
+    }, 0)
+  }
+}
+
+
+
+

src/app/components/incidentManagement/incident-handle-handle/incident-handle-handle.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentHandleHandleComponent } from './incident-handle-handle.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentHandleHandleComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    IncidentHandleHandleComponent,
+  ]
+})
+export class IncidentHandleHandleModule { }

src/app/components/incidentManagement/incident-handle-info-simple/incident-handle-info-simple.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit, Input, Output, EventEmitter, ViewChild, OnChanges, S
 import { MainService } from '../../../services/main.service';
 import { Router } from '@angular/router';
 import { ToolService } from 'src/app/services/tool.service';
-import { NzMessageService, UploadFile, UploadXHRArgs } from 'ng-zorro-antd';
+import { NzMessageService, UploadFile } from 'ng-zorro-antd';
 import cloneDeep from 'lodash-es/cloneDeep'
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
@@ -13,7 +13,7 @@ import { HttpClient, HttpEvent, HttpResponse, HttpEventType, HttpRequest } from
   templateUrl: './incident-handle-info-simple.component.html',
   styleUrls: ['./incident-handle-info-simple.component.less']
 })
-export class IncidentHandleInfoSimpleComponent implements OnInit, OnChanges {
+export class IncidentHandleInfoSimpleComponent implements OnInit {
   @Input() incidentData:any = {};
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
@@ -30,19 +30,6 @@ export class IncidentHandleInfoSimpleComponent implements OnInit, OnChanges {
 
   changeInpSubject = new Subject(); //防抖
 
-  ngOnChanges(changes: SimpleChanges){
-    console.log('changes:', changes)
-
-    // 初始化
-    if(changes.incidentData && !changes.incidentData.firstChange && changes.incidentData.currentValue && changes.incidentData.previousValue && !changes.incidentData.previousValue.id){
-      this.init();
-    }
-
-    if(changes.incidentData && changes.incidentData.firstChange && changes.incidentData.currentValue && !changes.incidentData.previousValue){
-      this.init();
-    }
-  }
-
   ngOnInit() {
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -52,6 +39,7 @@ export class IncidentHandleInfoSimpleComponent implements OnInit, OnChanges {
         this.getAssetProductList(v[1]);
       }
     });
+    this.init();
   }
 
   init(){

src/app/components/incidentManagement/incident-handle-info/incident-handle-info.component.ts

@@ -36,15 +36,6 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
     if(changes.incidentData && !changes.incidentData.firstChange && changes.incidentData.currentValue){
       this.incidentDataCopy.handleDescription = changes.incidentData.currentValue.handleDescription;
     }
-
-    // 初始化
-    if(changes.incidentData && !changes.incidentData.firstChange && changes.incidentData.currentValue && changes.incidentData.previousValue && !changes.incidentData.previousValue.id){
-      this.init();
-    }
-
-    if(changes.incidentData && changes.incidentData.firstChange && changes.incidentData.currentValue && !changes.incidentData.previousValue){
-      this.init();
-    }
   }
 
   ngOnInit() {
@@ -59,6 +50,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
         this.getIncidentCategoryList(v[1]);
       }
     });
+    this.init();
   }
 
   init(){

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.component.html

@@ -0,0 +1,48 @@
+<div class="detailItem">
+  <div class="name">申请时间：</div>
+  <div class="value">{{incidentData.startDate | date:'yyyy-MM-dd HH:mm'}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">登记时间：</div>
+  <div class="value">{{incidentData.acceptDate | date:'yyyy-MM-dd HH:mm'}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">故障描述：</div>
+  <div class="value">{{incidentData.description}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">报修科室：</div>
+  <div class="value">{{incidentData.department?.dept}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">详细地址：</div>
+  <div class="value">{{ incidentData.place ? incidentData.place.building.buildingName : '' }}{{ incidentData.place ? incidentData.place.floorName : '' }}{{ incidentData.houseNumber }}</div>
+</div>
+<div class="detailItem">
+  <div class="name">报修图片：</div>
+  <div class="value thumbs">
+    <div class="thumb" *ngFor="let item of repairImgs;let index = index;" (click)="previewImageHandler(repairImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+  </div>
+</div>
+<div class="detailItem">
+  <div class="name">联系人：</div>
+  <div class="value">{{incidentData.contacts}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">联系电话：</div>
+  <div class="value">{{incidentData.contactsInformation}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">来电电话：</div>
+  <div class="value">{{incidentData.incomingPhone}}</div>
+</div>
+<div class="detailItem">
+  <div class="name">电话录音：</div>
+  <div class="value">
+    <audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID">
+      <source [src]="audioSrc">
+    </audio>
+  </div>
+</div>
+<!-- 图片预览 -->
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.component.less

@@ -0,0 +1,39 @@
+@import "../../../../../src/theme.less";
+.detailItem{
+  display: flex;
+  padding-bottom: 16px;
+  .name{
+    width: 5em;
+    flex-shrink: 0;
+    text-align: left;
+  }
+  .value{
+    flex: 1;
+    text-align: justify;
+  }
+  .thumbs{
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 8px;
+    .thumb{
+      width: 64px;
+      height: 64px;
+      padding: 4px;
+      border-radius: 4px;
+      border: 1px solid rgba(0,0,0,0.15);
+      img{
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+        object-position: center;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .audio{
+    width: 264px;
+    height: 1.5em;
+  }
+}

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.component.ts

@@ -0,0 +1,85 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+
+@Component({
+  selector: 'app-incident-handle-repair',
+  templateUrl: './incident-handle-repair.component.html',
+  styleUrls: ['./incident-handle-repair.component.less']
+})
+export class IncidentHandleRepairComponent implements OnInit {
+  @Input() incidentData: any = {};
+
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private tool: ToolService,
+  ) { }
+
+  hosId:any;
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.incidentData.callID && this.getCallrecord();
+    this.incidentData.reqAttachment && this.getRepairImgs();
+  }
+
+  // 获取通话音频
+  audioSrc =  '';//音频
+  getCallrecord() {
+    let postData = {
+      idx: 0,
+      sum: 1,
+      callrecord: {callAccept: this.incidentData.callID},
+    };
+    this.mainService
+      .getFetchDataList('simple/data', 'callrecord', postData)
+      .subscribe((result) => {
+        if(result.status == 200){
+          result.list = result.list || [];
+          if(result.list.length){
+            this.audioSrc = location.origin + result.list[0].recordingFileName;
+          }else{
+            this.audioSrc = '';
+          }
+        }else{
+          this.message.error(result.msg || '请求数据失败！');
+        }
+      });
+  }
+
+  // 获取报修图片
+  repairImgs:any[] = [];//报修图片
+  getRepairImgs() {
+    this.mainService
+      .getPreviewImage('wechatRequesterIncident', this.incidentData.id)
+      .subscribe((res:any) => {
+        res.data = res.data || [];
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+        })
+        this.repairImgs = res.data;
+      });
+  }
+
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  initialViewIndex:number = 0;
+  previewImageHandler(data = [], index = 0) {
+    this.initialViewIndex = index;
+    console.log(index)
+    this.isPreview = false;
+    data = data || [];
+    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+    setTimeout(() => {
+      this.isPreview = true;
+    }, 0)
+  }
+}
+
+
+
+

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentHandleRepairComponent } from './incident-handle-repair.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentHandleRepairComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    IncidentHandleRepairComponent,
+  ]
+})
+export class IncidentHandleRepairModule { }

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

@@ -1,54 +1,9 @@
-<div class="modal display_flex justify-content_flex-center align-items_center">
+<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="incidentData">
   <div class="modalBody">
     <div class="title">详细处理<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
-    <div class="content" [ngStyle]="{'visibility': incidentData.id ? 'visible' : 'hidden'}">
+    <div class="content">
       <overlay-scrollbars #osComponentRef1 class="detail">
-        <div class="detailItem">
-          <div class="name">申请时间：</div>
-          <div class="value">{{incidentData.startDate | date:'yyyy-MM-dd HH:mm'}}</div>
-        </div>
-        <div class="detailItem">
-          <div class="name">登记时间：</div>
-          <div class="value">{{incidentData.acceptDate | date:'yyyy-MM-dd HH:mm'}}</div>
-        </div>
-        <div class="detailItem">
-          <div class="name">故障描述：</div>
-          <div class="value">{{incidentData.description}}</div>
-        </div>
-        <div class="detailItem">
-          <div class="name">报修科室：</div>
-          <div class="value">{{incidentData.department?.dept}}</div>
-        </div>
-        <div class="detailItem">
-          <div class="name">详细地址：</div>
-          <div class="value">{{ incidentData.place ? incidentData.place.building.buildingName : '' }}{{ incidentData.place ? incidentData.place.floorName : '' }}{{ incidentData.houseNumber }}</div>
-        </div>
-        <div class="detailItem">
-          <div class="name">报修图片：</div>
-          <div class="value thumbs">
-            <div class="thumb" *ngFor="let item of repairImgs;let index = index;" (click)="previewImageHandler(repairImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
-          </div>
-        </div>
-        <div class="detailItem">
-          <div class="name">联系人：</div>
-          <div class="value">{{incidentData.contacts}}</div>
-        </div>
-        <div class="detailItem">
-          <div class="name">联系电话：</div>
-          <div class="value">{{incidentData.contactsInformation}}</div>
-        </div>
-        <div class="detailItem">
-          <div class="name">来电电话：</div>
-          <div class="value">{{incidentData.incomingPhone}}</div>
-        </div>
-        <div class="detailItem">
-          <div class="name">电话录音：</div>
-          <div class="value">
-            <audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID">
-              <source [src]="audioSrc">
-            </audio>
-          </div>
-        </div>
+        <app-incident-handle-repair [incidentData]="incidentData"></app-incident-handle-repair>
       </overlay-scrollbars>
       <overlay-scrollbars #osComponentRef2 class="workingArea">
         <div class="tabs">
@@ -82,9 +37,6 @@
   </div>
 </div>
 
-<!-- 图片预览 -->
-<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>
-
 <!-- 知识库查看 -->
 <app-knowledge-look (cancelKnowledgeModal)="cancelKnowledgeModal()" *ngIf="isShowKnowledge" [knowledgeData]="coopData"></app-knowledge-look>
 

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

@@ -82,43 +82,6 @@
         height: 100%;
         padding: 16px;
         border-right: 1px solid #E9E9E9;
-        .detailItem{
-          display: flex;
-          margin-bottom: 16px;
-          .name{
-            width: 5em;
-            flex-shrink: 0;
-          }
-          .value{
-            flex: 1;
-            text-align: justify;
-          }
-          .thumbs{
-            display: flex;
-            align-items: center;
-            flex-wrap: wrap;
-            gap: 8px;
-            .thumb{
-              width: 64px;
-              height: 64px;
-              padding: 4px;
-              border-radius: 4px;
-              border: 1px solid rgba(0,0,0,0.15);
-              img{
-                width: 100%;
-                height: 100%;
-                object-fit: cover;
-                object-position: center;
-                cursor: pointer;
-              }
-            }
-          }
-
-          .audio{
-            width: 264px;
-            height: 1.5em;
-          }
-        }
       }
       .workingArea{
         flex: 1;

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

@@ -105,7 +105,7 @@ export class IncidentHandleComponent implements OnInit {
   }
 
   // 获取详情数据
-  incidentData:any = {};
+  incidentData:any;
   maskFlag:any = false;
   getDetail() {
     this.maskFlag = this.message.loading("正在加载中..", {
@@ -117,37 +117,11 @@ export class IncidentHandleComponent implements OnInit {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
         this.incidentData = result.data || {};
-        this.incidentData.callID && this.getCallrecord();
-        this.incidentData.reqAttachment && this.getRepairImgs();
 
         this.getDictionaryList();
       });
   }
 
-  // 获取通话音频
-  audioSrc =  '';//音频
-  getCallrecord() {
-    let postData = {
-      idx: 0,
-      sum: 1,
-      callrecord: {callAccept: this.incidentData.callID},
-    };
-    this.mainService
-      .getFetchDataList('simple/data', 'callrecord', postData)
-      .subscribe((result) => {
-        if(result.status == 200){
-          result.list = result.list || [];
-          if(result.list.length){
-            this.audioSrc = location.origin + result.list[0].recordingFileName;
-          }else{
-            this.audioSrc = '';
-          }
-        }else{
-          this.message.error(result.msg || '请求数据失败！');
-        }
-      });
-  }
-
   //获取知识库状态/类型
   knowageLoading:boolean = false;
   getDictionaryList() {
@@ -215,36 +189,6 @@ export class IncidentHandleComponent implements OnInit {
     this.isShowKnowledge = false;
   }
 
-  // 获取报修图片
-  repairImgs:any[] = [];//报修图片
-  getRepairImgs() {
-    this.mainService
-      .getPreviewImage('wechatRequesterIncident', this.id)
-      .subscribe((res:any) => {
-        res.data = res.data || [];
-        res.data.forEach(v => {
-          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
-          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
-        })
-        this.repairImgs = res.data;
-      });
-  }
-
-  // 预览图片
-  imgs = [];
-  isPreview = false;
-  initialViewIndex:number = 0;
-  previewImageHandler(data = [], index = 0) {
-    this.initialViewIndex = index;
-    console.log(index)
-    this.isPreview = false;
-    data = data || [];
-    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
-    setTimeout(() => {
-      this.isPreview = true;
-    }, 0)
-  }
-
   // 图片上传
   uploadImages(file, id){
     const formData = new FormData();
@@ -280,7 +224,7 @@ export class IncidentHandleComponent implements OnInit {
     if(this.itsmSimpleHandle.value == 0){
       // 详细处理
       console.log(this.incidentHandleInfoComponent)
-      return;
+      // return;
       if(!this.incidentHandleInfoComponent.incidentDataCopy.handleDescription){
         this.message.warning('请选择解决方案！');
         return;
@@ -351,6 +295,7 @@ export class IncidentHandleComponent implements OnInit {
     }else if(this.itsmSimpleHandle.value == 1){
       // 简单处理
       console.log(this.incidentHandleInfoSimpleComponent)
+      // return;
       if(!this.incidentHandleInfoSimpleComponent.incidentDataCopy.handleCategory){
         this.message.warning('请选择处理方式！');
         return;

src/app/components/incidentManagement/incident-handle/incident-handle.module.ts

@@ -7,6 +7,7 @@ import { IncidentHandleInfoComponent } from '../incident-handle-info/incident-ha
 import { IncidentHandleInfoSimpleComponent } from '../incident-handle-info-simple/incident-handle-info-simple.component';
 import { IncidentHandleOrderComponent } from '../incident-handle-order/incident-handle-order.component';
 import { KnowledgeLookModule } from '../../knowledge-look/knowledge-look.module';
+import { IncidentHandleRepairModule } from '../incident-handle-repair/incident-handle-repair.module';
 
 
 @NgModule({
@@ -20,6 +21,7 @@ import { KnowledgeLookModule } from '../../knowledge-look/knowledge-look.module'
     CommonModule,
     ShareModule,
     KnowledgeLookModule,
+    IncidentHandleRepairModule,
   ],
   exports: [
     IncidentHandleComponent,

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

@@ -1,13 +1,33 @@
+<!--
+ * @Author: seimin
+ * @Date: 2024-08-23 16:49:04
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-08-26 11:36:09
+ * @Description: 回访
+-->
 <div class="save display_flex justify-content_flex-center align-items_center add">
   <div class="modalBody">
-    <div class="title">延期处理<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title">回访<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
+      <overlay-scrollbars #osComponentRef1 class="workingArea">
+        <div class="tabs">
+          <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
+        </div>
+        <div class="detail">
+          <ng-container *ngIf="activeTabValue === 1">
+            <app-incident-handle-repair [incidentData]="incidentData"></app-incident-handle-repair>
+          </ng-container>
+          <ng-container *ngIf="activeTabValue === 2">
+            <app-incident-handle-handle [incidentData]="incidentData"></app-incident-handle-handle>
+          </ng-container>
+        </div>
+      </overlay-scrollbars>
       <form nz-form [formGroup]="validateForm" class="addForm">
         <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="repairTypeId">延期原因</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择延期原因!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="repairTypeId" nzPlaceHolder="请选择延期原因" nzServerSearch>
-              <ng-container *ngFor="let data of repairTypeList">
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="degree">满意度评价</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择满意度评价!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="degree" nzPlaceHolder="请选择满意度评价" nzServerSearch>
+              <ng-container *ngFor="let data of deferralDayList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
               </ng-container>
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
@@ -17,11 +37,11 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="deferralDayId">延期天数</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择延期天数!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="deferralDayId" nzPlaceHolder="请选择延期天数" nzServerSearch>
-              <ng-container *ngFor="let data of deferralDayList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="data.text" [nzValue]="data.value"></nz-option>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="handleResult">回访处理结果</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择回访处理结果!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="handleResult" nzPlaceHolder="请选择回访处理结果" nzServerSearch>
+              <ng-container *ngFor="let data of repairTypeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
               </ng-container>
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -30,10 +50,10 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="deferralRemark">延期说明</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请输入延期说明!">
+          <nz-form-label [nzSpan]="6" nzFor="visitRemarks" style="text-indent: 11px;">回访备注</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入回访备注!">
             <nz-input-group>
-              <textarea formControlName="deferralRemark" nz-input rows="3" placeholder="请输入延期说明"></textarea>
+              <textarea formControlName="visitRemarks" nz-input rows="3" placeholder="请输入回访备注"></textarea>
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>

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

@@ -86,17 +86,19 @@
   // 新增
   &.add {
     .modalBody {
-      width: 480px;
+      width: 944px;
       height: auto;
 
       .content {
         width: 100%;
-        height: auto;
-        padding: 19px 14px 0 14px;
-        max-height: 500px;
+        height: 529px;
         overflow-y: auto;
+        display: flex;
 
         .addForm {
+          width: 50%;
+          height: 100%;
+          padding: 16px;
           .ant-form-item {
             margin-bottom: 14px;
 
@@ -122,4 +124,36 @@
       }
     }
   }
+
+  .workingArea{
+    width: 50%;
+    height: 100%;
+    border-right: 1px solid #D9D9D9;
+    .detail{
+      padding: 16px 16px 0;
+    }
+    .tabs{
+      height: 60px;
+      border-bottom: 1px solid #D9D9D9;
+      display: flex;
+      align-items: center;
+      background-color: #fff;
+      .tab{
+        flex: 1;
+        display: flex;
+        height: 100%;
+        justify-content: center;
+        align-items: center;
+        border-right: 1px solid #D9D9D9;
+        font-size: #333;
+        cursor: pointer;
+        &:last-of-type{
+          border-right: none;
+        }
+        &.active{
+          background-color: #F0F6ED;
+        }
+      }
+    }
+  }
 }

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

@@ -40,41 +40,49 @@ export class IncidentVisitComponent implements OnInit {
     this.getDeferralDayList();
   }
 
+  tabs:any[] = [
+    { name: '报修信息', value: 1 },
+    { name: '处理信息', value: 2 },
+  ]
+
+  // 点击tab
+  activeTabValue:any = 1;
+  clickTbab(item){
+    this.activeTabValue = item.value;
+  }
+
   // 初始化新增form表单
   validateForm: FormGroup; //新增/编辑表单
   initForm() {
     this.validateForm = this.fb.group({
-      repairTypeId: [null, [Validators.required]],//延期原因
-      deferralDayId: [null, [Validators.required]],//延期天数
-      deferralRemark: [null, [Validators.required]],//延期说明
+      handleResult: [null, [Validators.required]],//回访处理结果
+      degree: [null, [Validators.required]],//满意度评价
+      visitRemarks: [null],//回访备注
     });
     console.log(this.validateForm.controls)
   }
 
-  // 获取延期原因
+  // 获取回访处理结果
   repairTypeList: any = [];
   getRepairTypeList() {
     this.mainService
-    .getDictionary('list', 'repair_type')
+    .getDictionary('list', 'incident_closecode')
     .subscribe((data) => {
       this.repairTypeList = data || [];
     });
   }
 
-  // 获取延期天数
+  // 获取满意度评价
   deferralDayList: any = [];
   getDeferralDayList() {
-    this.deferralDayList = this.tool.generateNumberArray(1, 15).map(v => ({
-      text: v + '天',
-      value: v,
-    }));
-		this.deferralDayList.unshift({
-			text: '0.5天',
-			value: 0.5,
-		})
+    this.mainService
+    .getDictionary('list', 'incident_degree')
+    .subscribe((data) => {
+      this.deferralDayList = data || [];
+    });
   }
 
-  // 操作权限
+  // 事件详情
   incidentData:any = {};
   getDetail(){
     this.maskFlag = this.message.loading("正在加载中..", {
@@ -110,26 +118,28 @@ export class IncidentVisitComponent implements OnInit {
     }).messageId;
 
     let postData = {
-      incident: this.incidentData,
+      incident: {
+        ...this.incidentData,
+        visitRemarks: this.validateForm.value.visitRemarks,
+        handleResult: this.validateForm.value.handleResult ? { id: this.validateForm.value.handleResult } : undefined,
+        degree: this.validateForm.value.degree ? { id: this.validateForm.value.degree } : undefined,
+      },
     }
 
-    postData.incident.currentLog = {
-      remark: this.validateForm.value.deferralRemark,
-      extra1: this.validateForm.value.repairTypeId,
-      extra2: this.validateForm.value.deferralDayId,
-    }
+    console.log(postData);
+    // return;
 
     this.mainService
-    .flowPost("incident/task/overtime", postData)
+    .flowPost("incident/task/callback", postData)
     .subscribe((result) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       this.confirmModelHs.emit();
 
       if (result.state == 200) {
-        this.message.success('操作成功');
+        this.message.success('回访成功');
       } else {
-        this.message.error('操作失败');
+        this.message.error('回访失败');
       }
     });
   }

src/app/components/incidentManagement/incident-visit/incident-visit.module.ts

@@ -3,6 +3,8 @@ import { CommonModule } from '@angular/common';
 
 import { IncidentVisitComponent } from './incident-visit.component';
 import { ShareModule } from 'src/app/share/share.module';
+import { IncidentHandleRepairModule } from '../incident-handle-repair/incident-handle-repair.module';
+import { IncidentHandleHandleModule } from '../incident-handle-handle/incident-handle-handle.module';
 
 
 @NgModule({
@@ -12,6 +14,8 @@ import { ShareModule } from 'src/app/share/share.module';
   imports: [
     CommonModule,
     ShareModule,
+    IncidentHandleRepairModule,
+    IncidentHandleHandleModule,
   ],
   exports: [
     IncidentVisitComponent,