转派，删除，延期处理，设置责任部门

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.3.108",
+		"target": "http://192.168.4.105",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -128,6 +128,7 @@ export class ConfigurationCategoryComponent implements OnInit {
   userList: any = [];
   getUsers(keyword = '', isShowValue = false) {
     if((!this.validateConfigForm.value.groupId && this.validateConfigForm.value.userGroup === 1) || this.validateConfigForm.value.userGroup === 2){
+      this.isLoading = false;
       this.userList = [];
       return;
     }
@@ -137,6 +138,8 @@ export class ConfigurationCategoryComponent implements OnInit {
         name: keyword,
         simpleQuery: true,
         groupdata: { id: this.validateConfigForm.value.groupId },
+        roleCodes: 'first-line support',
+        engineer: 1,
       },
       idx: 0,
       sum: 10,
@@ -158,6 +161,7 @@ export class ConfigurationCategoryComponent implements OnInit {
   groupList: any = []; //所有所属科室(搜索)
   getGroups(keyword = '', isShowValue = false) {
     if(!this.validateConfigForm.value.dutyId){
+      this.isLoading = false;
       this.groupList = [];
       return;
     }
@@ -300,10 +304,12 @@ export class ConfigurationCategoryComponent implements OnInit {
   dutyList: any = [];
   getHospitals(type:number, parentId?) {
     if(type === 1){
+      this.isLoading = false;
       this.hospitalList = this.tool.getHospitalList().filter(v => !v.parent);
       return;
     }
     if(type === 2 && !parentId){
+      this.isLoading = false;
       this.dutyList = [];
       return;
     }

src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component.ts

@@ -166,7 +166,9 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			user: {
 				// name:name,
 				hospital: { id: this.hosId || "" },
-				groupdata:{id:groupId || ""}
+				groupdata:{id:groupId || ""},
+        roleCodes: 'first-line support',
+        engineer: 1,
 			},
 		};
 		this.mainService

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -4,7 +4,7 @@
     <div class="address">
       <div class="contentHead">工时大类
 				<div>
-					<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id" (click)="delCategoryModal(1)">删除</button>
+					<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="delCategoryModal(1)">删除</button>
 					<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button>
 				</div>
 			</div>
@@ -45,7 +45,7 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSpan]="5" nzRequired nzFor="workName">工时名称</nz-form-label>
 				  <nz-form-control [nzSpan]="19" nzErrorTip="请填写工时名称!">
@@ -80,7 +80,7 @@
           <nz-form-control [nzSpan]="19" nzErrorTip="请选择工时积分!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear formControlName="integral" nzPlaceHolder="请选择工时积分">
               <ng-container *ngFor="let option of scoreList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.value" [nzValue]="option.id"></nz-option>
               </ng-container>
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -103,6 +103,6 @@
 </app-prompt-modal>
 
 <!-- 删除模态框 -->
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" 
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" [content]="delContent" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>

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

@@ -0,0 +1,50 @@
+<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="content">
+      <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-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> 搜索中...
+              </nz-option>
+            </nz-select>
+          </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>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </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-input-group>
+              <textarea formControlName="deferralRemark" nz-input rows="3" placeholder="请输入延期说明"></textarea>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -0,0 +1,125 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,140 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-detail',
+  templateUrl: './incident-detail.component.html',
+  styleUrls: ['./incident-detail.component.less']
+})
+export class IncidentDetailComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  isLoading = false;
+
+  ngOnInit() {
+    this.initForm();
+    this.getDetail();
+    this.getRepairTypeList();
+    this.getDeferralDayList();
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      repairTypeId: [null, [Validators.required]],//延期原因
+      deferralDayId: [null, [Validators.required]],//延期天数
+      deferralRemark: [null, [Validators.required]],//延期说明
+    });
+    console.log(this.validateForm.controls)
+  }
+
+  // 获取延期原因
+  repairTypeList: any = [];
+  getRepairTypeList() {
+    this.mainService
+    .getDictionary('list', 'repair_type')
+    .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,
+		})
+  }
+
+  // 操作权限
+  incidentData:any = {};
+  getDetail(){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("simple/data", "incident", this.id)
+      .subscribe((result) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.incidentData = result.data || {};
+      });
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  maskFlag:any = false;
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData = {
+      incident: this.incidentData,
+    }
+
+    postData.incident.currentLog = {
+      remark: this.validateForm.value.deferralRemark,
+      extra1: this.validateForm.value.repairTypeId,
+      extra2: this.validateForm.value.deferralDayId,
+    }
+
+    this.mainService
+    .flowPost("incident/task/overtime", postData)
+    .subscribe((result) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      this.confirmModelHs.emit();
+
+      if (result.state == 200) {
+        this.message.success('操作成功');
+      } else {
+        this.message.error('操作失败');
+      }
+    });
+  }
+}
+
+
+
+

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

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

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

@@ -3,10 +3,8 @@
     <div class="formItem">
       <div class="name"><i class="icon_transport transport-required red"></i>处理方式：</div>
       <div class="value w100">
-        <nz-select class="w100" [(ngModel)]="selectedValue" nzAllowClear nzPlaceHolder="请选择处理方式">
-          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
-          <nz-option nzValue="disabled" nzLabel="Disabled" nzDisabled></nz-option>
+        <nz-select class="w100" [(ngModel)]="incidentDataCopy.handleCategory" nzAllowClear nzPlaceHolder="请选择处理方式">
+          <nz-option [nzValue]="item.id" [nzLabel]="item.name" *ngFor="let item of handleCategoryList"></nz-option>
         </nz-select>
       </div>
     </div>
@@ -16,10 +14,14 @@
     <div class="formItem">
       <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>协同人员：</div>
       <div class="value w100">
-        <nz-select class="w100" [(ngModel)]="selectedValue" nzAllowClear nzPlaceHolder="请选择协同人员">
-          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
-          <nz-option nzValue="disabled" nzLabel="Disabled" nzDisabled></nz-option>
+        <nz-select class="w100" nzMode="multiple" [(ngModel)]="incidentDataCopy.synergetic" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+        (nzOnSearch)="changeInp('synergetic', $event)" nzAllowClear  nzPlaceHolder="请选择协同人员">
+          <ng-container *ngFor="let option of synergeticList">
+            <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+          </ng-container>
+          <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+            <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+          </nz-option>
         </nz-select>
       </div>
     </div>
@@ -28,32 +30,31 @@
   <div class="formItem">
     <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>关联资产：</div>
     <div class="value w100">
-      <nz-select class="w100" [(ngModel)]="selectedValue" nzAllowClear nzPlaceHolder="请选择关联资产">
-        <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-        <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
-        <nz-option nzValue="disabled" nzLabel="Disabled" nzDisabled></nz-option>
-      </nz-select>
+      <nz-select class="w100" [(ngModel)]="incidentDataCopy.assetId" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+        (nzOnSearch)="changeInp('assetId', $event)" nzAllowClear  nzPlaceHolder="请选择关联资产">
+          <ng-container *ngFor="let option of assetProducList">
+            <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+          </ng-container>
+          <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+            <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+          </nz-option>
+        </nz-select>
     </div>
   </div>
 
   <div class="formItem">
     <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>处理图片：</div>
     <div class="value w100 upload">
-      <nz-upload
-        nzAction="https://jsonplaceholder.typicode.com/posts/"
-        nzName="avatar"
-        nzListType="picture-card"
-        [nzShowUploadList]="false"
-        [nzBeforeUpload]="beforeUpload"
-        (nzChange)="handleChange($event)"
-      >
-        <ng-container *ngIf="!avatarUrl">
-          <i class="upload-icon" nz-icon [nzType]="loading ? 'loading' : 'plus'"></i>
-          <div class="ant-upload-text">上传图片</div>
-        </ng-container>
-        <img *ngIf="avatarUrl" [src]="avatarUrl" class="avatar" />
+      <nz-upload nzListType="picture-card" [(nzFileList)]="fileList" [nzShowUploadList]="showUploadList" [nzPreview]="handlePreview" nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png" [nzShowButton]="fileList.length < 3" [nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl" [nzSize]="10240">
+        <i nz-icon nzType="plus"></i>
+        <div class="ant-upload-text">上传照片</div>
       </nz-upload>
-      <div class="tips">只支持jpg,png 格式</div>
+      <nz-modal [nzVisible]="previewVisible" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible = false">
+        <ng-template #modalContent>
+          <img [src]="previewImage" [ngStyle]="{ width: '100%' }" />
+        </ng-template>
+      </nz-modal>
+      <div class="tips">(支持JPG/PNG格式图片，单张大小10M以内)</div>
     </div>
   </div>
 </div>

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

@@ -2,6 +2,10 @@
 :host{
   display: inline-block;
   width: 100%;
+  .anticon-plus{
+    font-size: 32px;
+    margin-bottom: 8px;
+  }
   .incident_handle_info{
     padding: 16px;
     .row{

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

@@ -1,15 +1,20 @@
-import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
 import { MainService } from '../../../services/main.service';
 import { Router } from '@angular/router';
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService, UploadFile, UploadXHRArgs } from 'ng-zorro-antd';
+import cloneDeep from 'lodash-es/cloneDeep'
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { HttpClient, HttpEvent, HttpResponse, HttpEventType, HttpRequest } from '@angular/common/http';
 
 @Component({
   selector: 'app-incident-handle-info-simple',
   templateUrl: './incident-handle-info-simple.component.html',
   styleUrls: ['./incident-handle-info-simple.component.less']
 })
-export class IncidentHandleInfoSimpleComponent implements OnInit {
+export class IncidentHandleInfoSimpleComponent implements OnInit, OnChanges {
+  @Input() incidentData:any = {};
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
@@ -17,42 +22,193 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
     private mainService: MainService,
     private router: Router,
     public tool: ToolService,
+    private message: NzMessageService,
+    private http: HttpClient,
   ) { }
 
-  isLoading = false;
-  formDTO:any =  {};
+  incidentDataCopy:any =  {};
+
+  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.getOrders();
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'synergetic'){
+        this.getSynergeticList(v[1]);
+      }else if(v[0] === 'assetId'){
+        this.getAssetProductList(v[1]);
+      }
+    });
   }
+
+  init(){
+    console.log('初始化')
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.incidentDataCopy = cloneDeep(this.incidentData);
+    if(Array.isArray(this.incidentDataCopy.synergetic)){
+      this.incidentDataCopy.synergetic = this.incidentDataCopy.synergetic.map(v => v.id);
+    }else{
+      this.incidentDataCopy.synergetic = [];
+    }
+    this.getHandleCategorys();
+    this.getSynergeticList();
+    this.getAssetProductList();
+  }
+
+  // 边输边搜节流阀
+  changeInp(model, e) {
+    this.isLoading = true;
+    this.changeInpSubject.next([model, e]);
+  }
+
   // 关闭弹窗
   hideModal() {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
   }
-  // 获取列表数据
-  getOrders(idx?) {
-    // if (idx) {
-    //   this.historySpecimenPageIndex = 1;
-    // }
-    // let postData = {
-    //   idx: this.historySpecimenPageIndex - 1,
-    //   sum: this.historySpecimenPageSize,
-    //   workOrder: {
-    //     hosId: JSON.parse(localStorage.getItem("user")).user.currentHospital.id,
-    //     gdState: {id: "72"},
-    //     taskType: {associationType: {id: 256}},
-    //   }
-    // }
-    // this.mainService.getFetchDataList('data','workOrder',postData).subscribe(data => {
-    //   this.historySpecimenList = data.list || [];
-    //   this.historySpecimenListLength = data.totalNum || 0;
-    // })
+
+  // 获取处理方式列表
+  handleCategoryList:any[] = [];
+  getHandleCategorys(){
+    this.mainService.getDictionary("list", "incident_handleCategory").subscribe((data) => {
+      this.handleCategoryList = data || [];
+      console.log(this.incidentDataCopy)
+      if(!this.incidentDataCopy.handleCategory){
+        let handleCategory = this.handleCategoryList.find(v => v.value == 'SUPPORT');
+        this.incidentDataCopy.handleCategory = handleCategory ? handleCategory.id : undefined;
+      }
+    });
+  }
+
+  // 获取协同人员
+  hosId:any;
+  isLoading = false;
+  synergeticList: any = [];
+  getSynergeticList(keyword = '') {
+    let postData = {
+      user: {
+        hospital: { id: this.hosId },
+        name: keyword,
+        simpleQuery: true,
+        roleCodes: 'first-line support',
+        engineer: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "user", postData)
+      .subscribe((data) => {
+        this.synergeticList = data.list;
+        this.isLoading = false;
+      });
+  }
+
+  // 获取资产列表
+  assetProducList: any = [];
+  getAssetProductList(keyword = '') {
+    let postData = {
+      assetProduct: {
+        hosId: this.hosId,
+        name: keyword,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "assetProduct", postData)
+      .subscribe((data) => {
+        this.assetProducList = data.list;
+      });
   }
 
-  // 表单提交
-  submitForm(): void {
-    this.confirmModelHs.emit();
+  // 图片相关
+  showUploadList = {
+    showPreviewIcon: true,
+    showRemoveIcon: true,
+    hidePreviewIconInNonImage: true
+  };
+  fileList = [
+    // {
+    //   uid: -1,
+    //   name: 'xxx.png',
+    //   status: '1',
+    //   url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png'
+    // }
+  ];
+  previewImage: string | undefined = '';
+  previewVisible = false;
+
+  handlePreview = (file: UploadFile) => {
+  	console.log('file1:', file)
+    this.previewImage = file.url || file.thumbUrl;
+    this.previewVisible = true;
+  };
+
+  beforeUpload = (file: UploadFile): boolean => {
+  	console.log('file2:', file)
+    this.fileList = [...this.fileList, file];
+    setTimeout(async () => {
+      file.url = await this.getBase64(file);
+    }, 0);
+    console.log('this.fileList:', this.fileList)
+    return true;
+  };
+
+  // customReq = (item: UploadXHRArgs) => {
+  //   console.log(item);
+  //   // Create a FormData here to store files and other parameters.
+  //   const formData = new FormData();
+  //   // tslint:disable-next-line:no-any
+  //   formData.append('file', item.file as any);
+  //   formData.append('filename', item.file.name);
+  //   const req = new HttpRequest('POST', item.action!, formData, {
+  //     reportProgress: true,
+  //     withCredentials: true
+  //   });
+  //   // Always returns a `Subscription` object. nz-upload would automatically unsubscribe it at correct time.
+  //   return this.http.request(req).subscribe(
+  //     // tslint:disable-next-line no-any
+  //     (event: HttpEvent<any>) => {
+  //       if (event.type === HttpEventType.UploadProgress) {
+  //         if (event.total! > 0) {
+  //           // tslint:disable-next-line:no-any
+  //           (event as any).percent = (event.loaded / event.total!) * 100;
+  //         }
+  //         item.onProgress!(event, item.file!);
+  //       } else if (event instanceof HttpResponse) {
+  //         item.onSuccess!(event.body, item.file!, event);
+  //       }
+  //     },
+  //     err => {
+  //       item.onError!(err, item.file!);
+  //     }
+  //   );
+  // };
+
+  getBase64(file: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = () => resolve(reader.result);
+      reader.onerror = error => reject(error);
+    });
   }
+
+  // 临时上传图片
+  temporarilyUrl = this.mainService.returnUploadUrl('temporarily', 0);
 }
 
 

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

@@ -2,6 +2,10 @@
 :host{
   display: inline-block;
   width: 100%;
+  .anticon-plus{
+    font-size: 32px;
+    margin-bottom: 8px;
+  }
   .incident_handle_info{
     padding: 16px;
     .row{

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

@@ -1,58 +1,298 @@
-import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
 import { MainService } from '../../../services/main.service';
 import { Router } from '@angular/router';
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { ToolService } from 'src/app/services/tool.service';
+import { UploadFile } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import cloneDeep from 'lodash-es/cloneDeep'
+import { HttpClient } from '@angular/common/http';
 
 @Component({
   selector: 'app-incident-handle-info',
   templateUrl: './incident-handle-info.component.html',
   styleUrls: ['./incident-handle-info.component.less']
 })
-export class IncidentHandleInfoComponent implements OnInit {
+export class IncidentHandleInfoComponent implements OnInit, OnChanges {
+  @Input() incidentData:any = {};
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() changeCategoryHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
   constructor(
     private mainService: MainService,
     private router: Router,
     public tool: ToolService,
+    private http: HttpClient,
   ) { }
 
-  isLoading = false;
-  formDTO:any =  {};
+  incidentDataCopy:any =  {};
+
+  changeInpSubject = new Subject(); //防抖
+
+  ngOnChanges(changes: SimpleChanges){
+    console.log('changes:', changes)
+    // 引入知识库
+    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() {
-    this.getOrders();
+    console.log('ngOnInit')
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'synergetic'){
+        this.getSynergeticList(v[1]);
+      }else if(v[0] === 'assetId'){
+        this.getAssetProductList(v[1]);
+      }else if(v[0] === 'category'){
+        this.getIncidentCategoryList(v[1]);
+      }
+    });
+  }
+
+  init(){
+    console.log('初始化')
+    this.hosId = this.tool.getCurrentHospital().id;
+    console.log('this.incidentData:', this.incidentData)
+    this.incidentDataCopy = cloneDeep(this.incidentData);
+    if(Array.isArray(this.incidentDataCopy.synergetic)){
+      this.incidentDataCopy.synergetic = this.incidentDataCopy.synergetic.map(v => v.id);
+    }else{
+      this.incidentDataCopy.synergetic = [];
+    }
+    if(this.incidentDataCopy.category){
+      this.incidentDataCopy.category = this.incidentDataCopy.category.id;
+    }
+    if(this.incidentDataCopy.transSolution === undefined){
+      this.incidentDataCopy.transSolution = 0;
+    }
+    console.log('this.incidentDataCopy:', this.incidentDataCopy)
+    this.getHandleCategorys();
+    this.getClosecodes();
+    this.getSynergeticList();
+    this.getAssetProductList();
+    this.getIncidentCategoryList();
   }
+
+  // 修改故障现象
+  changeCategory(id){
+    this.changeCategoryHs.emit(id);
+  }
+
+  // 边输边搜节流阀
+  changeInp(model, e) {
+    this.isLoading = true;
+    this.changeInpSubject.next([model, e]);
+  }
+
   // 关闭弹窗
   hideModal() {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
   }
-  // 获取列表数据
-  getOrders(idx?) {
-    // if (idx) {
-    //   this.historySpecimenPageIndex = 1;
-    // }
-    // let postData = {
-    //   idx: this.historySpecimenPageIndex - 1,
-    //   sum: this.historySpecimenPageSize,
-    //   workOrder: {
-    //     hosId: JSON.parse(localStorage.getItem("user")).user.currentHospital.id,
-    //     gdState: {id: "72"},
-    //     taskType: {associationType: {id: 256}},
-    //   }
+
+  // 获取处理方式列表
+  handleCategoryList:any[] = [];
+  getHandleCategorys(){
+    this.mainService.getDictionary("list", "incident_handle_type").subscribe((data) => {
+      this.handleCategoryList = data || [];
+      console.log(this.incidentDataCopy)
+      if(!this.incidentDataCopy.handleCategory){
+        let handleCategory = this.handleCategoryList.find(v => v.value == '1');
+        this.incidentDataCopy.handleCategory = handleCategory ? handleCategory.id : undefined;
+      }
+    });
+  }
+
+  // 获取处理结果列表
+  closecodeList:any[] = [];
+  getClosecodes(){
+    this.mainService.getDictionary("list", "incident_closecode").subscribe((data) => {
+      this.closecodeList = data || [];
+      console.log(this.incidentDataCopy)
+      if(!this.incidentDataCopy.closecode){
+        let closecode = this.closecodeList.find(v => v.value == '1');
+        this.incidentDataCopy.closecode = closecode ? closecode.id : undefined;
+      }
+    });
+  }
+
+  // 获取协同人员
+  hosId:any;
+  isLoading = false;
+  synergeticList: any = [];
+  getSynergeticList(keyword = '') {
+    let postData = {
+      user: {
+        hospital: { id: this.hosId },
+        name: keyword,
+        simpleQuery: true,
+        roleCodes: 'first-line support',
+        engineer: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "user", postData)
+      .subscribe((data) => {
+        this.synergeticList = data.list;
+        this.isLoading = false;
+      });
+  }
+
+  // 获取故障现象
+  incidentCategoryList:any[] = [];
+  handleInfoLoading:boolean = false;
+  getIncidentCategoryList(keyword = ''){
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+    if(type === 'hospital' || type === 'department'){
+      this.incidentCategoryList = [];
+      this.incidentDataCopy.category = null;
+      return;
+    };
+    let postData = {
+      category: {
+        category: keyword,
+        selectType: 'mutlQuery',
+        hierarchy: 3,
+        dutyIds: type === 'duty' ? hospital.id.toString()  : undefined,
+      },
+    };
+    this.handleInfoLoading = true;
+    this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
+      this.handleInfoLoading = false;
+      this.incidentCategoryList = res.data || [];
+      if(this.incidentDataCopy.category){
+        let obj = this.incidentCategoryList.find(v => v.id == this.incidentDataCopy.category);
+        this.incidentDataCopy.category = obj ? obj.id : undefined;
+        this.changeCategoryHs.emit(this.incidentDataCopy.category);
+      }
+    })
+  }
+
+  // 获取资产列表
+  assetProducList: any = [];
+  getAssetProductList(keyword = '') {
+    let postData = {
+      assetProduct: {
+        hosId: this.hosId,
+        name: keyword,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "assetProduct", postData)
+      .subscribe((data) => {
+        this.assetProducList = data.list;
+      });
+  }
+
+  // 图片相关
+  showUploadList = {
+    showPreviewIcon: true,
+    showRemoveIcon: true,
+    hidePreviewIconInNonImage: true
+  };
+  fileList = [
+    // {
+    //   uid: -1,
+    //   name: 'xxx.png',
+    //   status: '1',
+    //   url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png'
     // }
-    // this.mainService.getFetchDataList('data','workOrder',postData).subscribe(data => {
-    //   this.historySpecimenList = data.list || [];
-    //   this.historySpecimenListLength = data.totalNum || 0;
-    // })
+  ];
+  previewImage: string | undefined = '';
+  previewVisible = false;
+
+  handlePreview = (file: UploadFile) => {
+  	console.log('file1:', file)
+    this.previewImage = file.url || file.thumbUrl;
+    this.previewVisible = true;
+  };
+
+  beforeUpload = (file: UploadFile): boolean => {
+  	console.log('file2:', file)
+    this.fileList = [...this.fileList, file];
+    setTimeout(async () => {
+      file.url = await this.getBase64(file);
+    }, 0);
+    console.log('this.fileList:', this.fileList)
+    return true;
+  };
+
+  // customReq = (item: UploadXHRArgs) => {
+  //   console.log(item);
+  //   // Create a FormData here to store files and other parameters.
+  //   const formData = new FormData();
+  //   // tslint:disable-next-line:no-any
+  //   formData.append('file', item.file as any);
+  //   formData.append('filename', item.file.name);
+  //   const req = new HttpRequest('POST', item.action!, formData, {
+  //     reportProgress: true,
+  //     withCredentials: true
+  //   });
+  //   // Always returns a `Subscription` object. nz-upload would automatically unsubscribe it at correct time.
+  //   return this.http.request(req).subscribe(
+  //     // tslint:disable-next-line no-any
+  //     (event: HttpEvent<any>) => {
+  //       if (event.type === HttpEventType.UploadProgress) {
+  //         if (event.total! > 0) {
+  //           // tslint:disable-next-line:no-any
+  //           (event as any).percent = (event.loaded / event.total!) * 100;
+  //         }
+  //         item.onProgress!(event, item.file!);
+  //       } else if (event instanceof HttpResponse) {
+  //         item.onSuccess!(event.body, item.file!, event);
+  //       }
+  //     },
+  //     err => {
+  //       item.onError!(err, item.file!);
+  //     }
+  //   );
+  // };
+
+  getBase64(file: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = () => resolve(reader.result);
+      reader.onerror = error => reject(error);
+    });
   }
 
-  // 表单提交
-  submitForm(): void {
-    this.confirmModelHs.emit();
+  // 临时上传图片
+  temporarilyUrl = this.mainService.returnUploadUrl('temporarily', 0);
+
+  // 上传附件---start
+  // model-取消
+  maskFlag:boolean = false;
+  isShow = false;
+  hideExcelImport() {
+    this.isShow = false;
+  }
+  // 触发
+  excelImport() {
+    this.isShow = true;
   }
+  submitExcelImport({fileList}){
+    this.isShow = false;
+    console.log(fileList);
+  }
+  // 上传附件---end
+  fileList2:any[] = [];
+
 }
 
 

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

@@ -19,7 +19,7 @@
               <span>X{{ item.consumablesNum }}{{ item.consumablesUnit }}</span>
               <span class="unitPrice">总价：{{item.consumablesNum * item.consumableEndPrice}}元</span>
             </div>
-            <button nz-button class="btn default ml8" (click)="delConsumable(item)">删除</button>
+            <button nz-button class="btn default ml8" (click)="showDelModal(item,'您确认要删除吗？','删除','delConsumable')">删除</button>
           </div>
         </div>
       </div>
@@ -33,12 +33,12 @@
   <div class="orderList manHour">
     <div class="title">工时清单</div>
     <ng-container *ngIf="summaryObj.workHourManagementList.length">
-      <div class="orderItem" *ngFor="let item of summaryObj.workHourManagementList" (click)="numberClick(item, 'editWorkHourManagement')">
+      <div class="orderItem" *ngFor="let item of summaryObj.workHourManagementList">
         <div class="row">
           <div class="name">{{ item.workName }}</div>
           <div class="value">
             <span class="unitPrice">单价：{{ item.wage }}元</span>
-            <button nz-button class="btn default ml8" (click)="numberClick(item, 'editWorkHourManagement')">编辑</button>
+            <button nz-button class="btn default ml8" (click)="editWorkHourManagement(item)">编辑</button>
           </div>
         </div>
 
@@ -49,7 +49,7 @@
               <span>X{{ item.workHourNum2 }}{{ item.workUnit }}</span>
               <span class="unitPrice">总价：{{item.workHourNum2 * item.wage}}元</span>
             </div>
-            <button nz-button class="btn default ml8" (click)="numberClick(item, 'delWorkHourManagement')">删除</button>
+            <button nz-button class="btn default ml8" (click)="showDelModal(item,'您确认要删除吗？','删除','delWorkHourManagement')">删除</button>
           </div>
         </div>
       </div>
@@ -68,11 +68,10 @@
     <div class="title">{{modelName}}耗材<i class="icon_transport transport-guanbi" (click)="hideConsumableModal()"></i></div>
     <div class="content">
       <form nz-form [formGroup]="validateConsumableForm" class="addForm">
-
         <nz-form-item>
           <nz-form-label [nzSpan]="6" nzRequired nzFor="consumablesId">耗&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;材</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择耗材!">
-            <nz-select (nzOnSearch)="changeInp('consumable', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="consumablesId" nzPlaceHolder="请选择耗材">
+            <nz-select *ngIf="add" (nzOnSearch)="changeInp('consumable', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="consumablesId" nzPlaceHolder="请选择耗材">
               <ng-container *ngFor="let option of consumableList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -80,6 +79,7 @@
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
               </nz-option>
             </nz-select>
+            <span *ngIf="!add">{{coopData.consumableName}} ({{coopData.consumableBrandModel}}) {{coopData.consumableEndPrice}}元</span>
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
@@ -99,7 +99,41 @@
   </div>
 </div>
 
+<!-- 新增/编辑工时模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalWorkHourManagement">
+  <div class="modalBody">
+    <div class="title">{{modelName}}工时<i class="icon_transport transport-guanbi" (click)="hideWorkHourManagementModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateWorkHourManagementForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="workHourId">工&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;时</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择工时!">
+            <nz-cascader *ngIf="add" [nzOptions]="workHourManagementList" formControlName="workHourId" nzPlaceHolder="请选择工时"></nz-cascader>
+            <span *ngIf="!add">{{coopData.workName}} {{coopData.wage}}元</span>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="workHourNum">数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入数量!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="workHourNum" nzPlaceHolder="请输入数量" [nzMin]="1" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitWorkHourManagementForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideWorkHourManagementModal()">取消</button>
+    </div>
+  </div>
+</div>
+
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo">
 </app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>

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

@@ -36,8 +36,11 @@ export class IncidentHandleOrderComponent implements OnInit {
     this.hosId = this.tool.getCurrentHospital().id;
     this.getSummaryList();
     this.getConsumableList();
+    this.getWorkHourManagementList();
   }
 
+  // ============耗材start=================
+
   // 新增耗材/工时弹框
   modelName = ""; //模态框名称
   modalConsumable: boolean = false; //新增/编辑模态框
@@ -62,8 +65,8 @@ export class IncidentHandleOrderComponent implements OnInit {
     this.modalConsumable = true;
     this.initConsumableForm();
     this.coopData = data;
-    this.validateConsumableForm.controls.orders.setValue(data.orders);
-    this.validateConsumableForm.controls.workdayClassId.setValue(data.workdayClassId);
+    this.validateConsumableForm.controls.consumablesId.setValue(data.consumableId);
+    this.validateConsumableForm.controls.consumablesNum.setValue(data.consumablesNum);
   }
 
   // 新增/编辑表单提交
@@ -94,17 +97,14 @@ export class IncidentHandleOrderComponent implements OnInit {
     } else {
       //编辑
       postData = {
-        // priority: {
-          ...this.coopData,
-          ...{
-            name: this.validateConsumableForm.value.name,
-            orders: this.validateConsumableForm.value.orders,
-            responseTime: this.validateConsumableForm.value.responseTime,
-            handleTime: this.validateConsumableForm.value.handleTime,
-            holidayClassId: this.validateConsumableForm.value.holidayClassId,
-            workdayClassId: this.validateConsumableForm.value.workdayClassId,
+        "consumableList": [
+          {
+            "consumablesId": this.validateConsumableForm.value.consumablesId,
+            "consumablesNum": this.validateConsumableForm.value.consumablesNum,
           }
-        // }
+        ],
+        "modifyNum": "edit",
+        "summaryId": this.summaryId,
       };
     }
     this.mainService
@@ -150,6 +150,7 @@ export class IncidentHandleOrderComponent implements OnInit {
       consumable: {
         name: keyword,
         hosId: this.hosId,
+        showZero: true,
       },
       idx: 0,
       sum: 20,
@@ -167,6 +168,131 @@ export class IncidentHandleOrderComponent implements OnInit {
       });
   }
 
+  // ============耗材end=================
+
+  // ============工时start=================
+
+  // 新增耗材/工时弹框
+  modalWorkHourManagement: boolean = false; //新增/编辑模态框
+  addWorkHourManagement() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalWorkHourManagement = true;
+    this.initWorkHourManagementForm();
+  }
+  //关闭新增/编辑弹框
+  hideWorkHourManagementModal() {
+    this.modalWorkHourManagement = false;
+  }
+
+  // 编辑
+  editWorkHourManagement(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalWorkHourManagement = true;
+    this.initWorkHourManagementForm();
+    this.coopData = data;
+    this.validateWorkHourManagementForm.controls.workHourId.setValue(data.id);
+    this.validateWorkHourManagementForm.controls.workHourNum.setValue(data.workHourNum2);
+  }
+
+  // 新增/编辑表单提交
+  submitWorkHourManagementForm(): void {
+    for (const i in this.validateWorkHourManagementForm.controls) {
+      this.validateWorkHourManagementForm.controls[i].markAsDirty();
+      this.validateWorkHourManagementForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateWorkHourManagementForm.invalid) {
+      return;
+    }
+    console.log(this.validateWorkHourManagementForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      let workHourManagementList = this.summaryObj.workHourManagementList || [];
+      postData = {
+        "workHourManagementList": workHourManagementList.map(v => ({workHourId: v.id, workHourNum: v.workHourNum2 || 1})),
+        "summaryId": this.summaryId,
+      };
+      let index = postData.workHourManagementList.findIndex(v => v.workHourId == this.validateWorkHourManagementForm.value.workHourId.slice(-1)[0]);
+      if(index > -1){
+        postData.workHourManagementList[index].workHourNum += this.validateWorkHourManagementForm.value.workHourNum;
+      }else{
+        postData.workHourManagementList.push(
+          {
+            "workHourId": this.validateWorkHourManagementForm.value.workHourId.slice(-1)[0],
+            "workHourNum": this.validateWorkHourManagementForm.value.workHourNum,
+          }
+        );
+      }
+    } else {
+      //编辑
+      postData = {
+        "workHourManagementList": [
+          {
+            "workHourId": this.coopData.id,
+            "workHourNum": this.validateWorkHourManagementForm.value.workHourNum,
+          }
+        ],
+        "modifyNum": "edit",
+        "summaryId": this.summaryId,
+      };
+    }
+    this.mainService
+      .addSummaryDoc(postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideWorkHourManagementModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validateWorkHourManagementForm: FormGroup; //新增/编辑表单
+  initWorkHourManagementForm() {
+    this.validateWorkHourManagementForm = this.fb.group({
+      workHourId: [null, [Validators.required]],
+      workHourNum: [1, [Validators.required]],
+    });
+    console.log(this.validateWorkHourManagementForm.controls)
+  }
+
+  // 获取工时
+  workHourManagementList: any = [];
+  getWorkHourManagementList() {
+    let postData = {
+      workHourManagement: {
+        hosId: this.hosId,
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "workHourManagement", postData)
+      .subscribe((res) => {
+        this.isLoading = false;
+        let workHourManagementList = res.list || [];
+        workHourManagementList = workHourManagementList.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, label: v.workName, value: v.id}));
+        this.workHourManagementList = this.tool.tranListToTreeDataLeaf(workHourManagementList, undefined, "parentId");
+        console.log(this.workHourManagementList);
+      });
+  }
+
+  // ============工时end=================
+
   // 获取汇总单信息
   summaryObj:any = {
     consumableList: [],//耗材列表
@@ -196,6 +322,78 @@ export class IncidentHandleOrderComponent implements OnInit {
       });
   }
 
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "delConsumable") {
+      //删除-耗材
+      let postData = {
+        "consumableList": [
+          {
+            "consumablesId": this.coopData.consumableId,
+            "consumablesNum": this.coopData.consumablesNum,
+          }
+        ],
+        "remove": "remove",
+        "summaryId": this.summaryId,
+      };
+      this.mainService
+        .addSummaryDoc(postData)
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }else if (this.confirmDelType === "delWorkHourManagement") {
+      //删除-工时
+      let postData = {
+        "workHourManagementList": [
+          {
+            "workHourId": this.coopData.id,
+            "workHourNum": this.coopData.workHourNum2,
+          }
+        ],
+        "remove": "remove",
+        "summaryId": this.summaryId,
+      };
+      this.mainService
+        .addSummaryDoc(postData)
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败

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

@@ -1,7 +1,7 @@
 <div class="modal display_flex justify-content_flex-center align-items_center">
   <div class="modalBody">
     <div class="title">详细处理<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
-    <div class="content">
+    <div class="content" [ngStyle]="{'visibility': incidentData.id ? 'visible' : 'hidden'}">
       <overlay-scrollbars #osComponentRef1 class="detail">
         <div class="detailItem">
           <div class="name">申请时间：</div>
@@ -55,8 +55,8 @@
           <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
         </div>
         <ng-container *ngIf="activeTabValue === 1">
-          <app-incident-handle-info [id]="id"></app-incident-handle-info>
-          <!-- <app-incident-handle-info-simple [id]="id"></app-incident-handle-info-simple> -->
+          <app-incident-handle-info [incidentData]="incidentData" (changeCategoryHs)="changeCategoryHs($event)" *ngIf="itsmSimpleHandle.value == 0"></app-incident-handle-info>
+          <app-incident-handle-info-simple [incidentData]="incidentData" *ngIf="itsmSimpleHandle.value == 1"></app-incident-handle-info-simple>
         </ng-container>
         <ng-container *ngIf="activeTabValue === 2">
           <app-incident-handle-order [id]="id"></app-incident-handle-order>
@@ -67,10 +67,11 @@
           <div class="knowageTitle">{{item.title}}</div>
           <div class="knowageDescription">{{item.content | stripHtml}}</div>
           <div class="knowageBtns">
-            <button nz-button nzType="primary" (click)="submitForm()">引用</button>
+            <button nz-button nzType="primary" (click)="importKnowage(item)" *ngIf="activeTabValue === 1 && itsmSimpleHandle.value == 0">引用</button>
             <button class="ml8" nz-button nzType="primary" (click)="showKnowledgeModal(item)">查看</button>
           </div>
         </div>
+        <nz-empty *ngIf="!knowageLoading && knowageList.length === 0" style="margin-top: 80px;"></nz-empty>
         <nz-spin nzSimple [nzSpinning]="knowageLoading" class="mt8 text_align_center"></nz-spin>
       </overlay-scrollbars>
     </div>

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

@@ -5,6 +5,11 @@ import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { NzMessageService } from 'ng-zorro-antd';
 import { ToolService } from 'src/app/services/tool.service';
 import { forkJoin } from 'rxjs';
+import { IncidentHandleInfoComponent } from '../incident-handle-info/incident-handle-info.component';
+import { IncidentHandleInfoSimpleComponent } from '../incident-handle-info-simple/incident-handle-info-simple.component';
+import cloneDeep from 'lodash-es/cloneDeep'
+import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http';
+import { filter } from 'rxjs/operators';
 
 @Component({
   selector: 'app-incident-handle',
@@ -28,6 +33,9 @@ export class IncidentHandleComponent implements OnInit {
   })
   osComponentRef3: OverlayScrollbarsComponent;
 
+  @ViewChild(IncidentHandleInfoComponent, { static: false }) incidentHandleInfoComponent: IncidentHandleInfoComponent;
+  @ViewChild(IncidentHandleInfoSimpleComponent, { static: false }) incidentHandleInfoSimpleComponent: IncidentHandleInfoSimpleComponent;
+
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
@@ -38,6 +46,7 @@ export class IncidentHandleComponent implements OnInit {
     private router: Router,
     private message: NzMessageService,
     private tool: ToolService,
+    private http: HttpClient,
   ) { }
 
   isLoading = false;
@@ -64,12 +73,13 @@ export class IncidentHandleComponent implements OnInit {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
   }
   // 是否进入汇总单
-  get isInSummaryOrder(){
+  isInSummaryOrder(){
     return this.incidentData.duty && this.itsmSummarySheet.value == 1 && (this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId());
   }
 
   // 获取院区配置信息
-  itsmSummarySheet:any = {};
+  itsmSummarySheet:any = {};//是否需要填写汇总单
+  itsmSimpleHandle:any = {};//是否简单处理
   getHospitalConfig() {
     let postData = {
       idx: 0,
@@ -84,8 +94,11 @@ export class IncidentHandleComponent implements OnInit {
       .subscribe((result) => {
         let list = result.list || [];
         this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
+        this.itsmSimpleHandle = list.find(v => v.key == 'itsmSimpleHandle') || {};
+        console.log(this.itsmSummarySheet)
         if(this.isInSummaryOrder){
           let summary = this.tabs.some(v => v.value == 2);
+          console.log(summary)
           !summary && this.tabs.push({ name: '汇总单', value: 2 });
         }
       });
@@ -142,30 +155,39 @@ export class IncidentHandleComponent implements OnInit {
     let solutionStatus$ = this.mainService.getDictionary('list', 'solution_status', true);
     let solutionType$ = this.mainService.getDictionary('list', 'solution_type', true);
     forkJoin(solutionStatus$, solutionType$).subscribe((data:any[]) => {
+      this.knowageLoading = false;
       let solutionStatusList = data[0] || [];
       let solutionTypeList = data[1] || [];
 
-      let solutionStatus = solutionStatusList.find(item => item.value == 2);
-      	console.log('solutionStatus:', solutionStatus)
-      let solutionType = solutionTypeList.find(item => item.value == 1);
-      	console.log('solutionType:', solutionType)
-
-      if(solutionStatus && solutionType){
-        this.getKnowledgeList(solutionStatus, solutionType);
-      }
+      this.solutionStatus = solutionStatusList.find(item => item.value == 2);
+      	console.log('this.solutionStatus:', this.solutionStatus)
+      this.solutionType = solutionTypeList.find(item => item.value == 1);
+      	console.log('this.solutionType:', this.solutionType)
     })
   }
+  solutionStatus;//知识库状态
+  solutionType;//知识库类型
+  // 修改故障现象
+  changeCategoryHs(categoryId){
+    this.getKnowledgeList(categoryId);
+  }
 
   // 获取知识库
   knowageList:any[] =  [];
-  getKnowledgeList(solutionStatus, solutionType) {
+  getKnowledgeList(categoryId) {
+    if(!(categoryId && this.solutionStatus && this.solutionType)){
+      this.knowageLoading = false;
+      this.knowageList = [];
+      return;
+    }
+    this.knowageLoading = true;
     let postData:any = {
       idx: 0,
       sum: 9999,
       solution: {
-        category: this.incidentData.category,
-				status: solutionStatus,
-				type: solutionType,
+        category: categoryId,
+				status: this.solutionStatus,
+				type: this.solutionType,
       },
     };
 
@@ -223,9 +245,156 @@ export class IncidentHandleComponent implements OnInit {
     }, 0)
   }
 
+  // 图片上传
+  uploadImages(file, id){
+    const formData = new FormData();
+    formData.append('file', file);
+    formData.append('fileName', file.name);
+    const req = new HttpRequest('Post', this.mainService.returnUploadUrl('incident', id), formData, {
+      reportProgress: true
+    });
+    return this.http.request(req).pipe(filter(e => e instanceof HttpResponse)).toPromise();
+  }
+
+  // 附件上传
+  uploadFiles(file, id){
+    const formData = new FormData();
+    formData.append('file', file);
+    formData.append('fileName', file.name);
+    const req = new HttpRequest('Post', this.mainService.returnUploadUrl('handleAttachment', id), formData, {
+      reportProgress: true
+    });
+    return this.http.request(req).pipe(filter(e => e instanceof HttpResponse)).toPromise();
+  }
+
+  // 引入知识库
+  solutionId;//引用的知识库Id
+  importKnowage(item){
+    console.log(item)
+    this.incidentData = {...this.incidentData, handleDescription:  `引用知识库解决，知识库编号：${item.solutionNumber}`};
+    this.solutionId = item.id;
+  }
+
   // 表单提交
-  submitForm(): void {
-    this.confirmModelHs.emit();
+  submitForm() {
+    if(this.itsmSimpleHandle.value == 0){
+      // 详细处理
+      console.log(this.incidentHandleInfoComponent)
+      return;
+      if(!this.incidentHandleInfoComponent.incidentDataCopy.handleDescription){
+        this.message.warning('请选择解决方案！');
+        return;
+      }
+      if(!this.incidentHandleInfoComponent.incidentDataCopy.category){
+        this.message.warning('请选择故障现象！');
+        return;
+      }
+      if(!this.incidentHandleInfoComponent.incidentDataCopy.handleCategory){
+        this.message.warning('请选择处理方式！');
+        return;
+      }
+      if(!this.incidentHandleInfoComponent.incidentDataCopy.closecode){
+        this.message.warning('请选择处理结果！');
+        return;
+      }
+
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+
+      let incidentDataCopy = cloneDeep(this.incidentHandleInfoComponent.incidentDataCopy);
+
+      // 图片上传
+      if(this.incidentHandleInfoComponent.fileList.length){
+        console.log(this.incidentHandleInfoComponent.fileList.map(v => v.originFileObj));
+        this.incidentHandleInfoComponent.fileList.map(v => v.originFileObj).forEach(async file => {
+          await this.uploadImages(file, incidentDataCopy.id);
+        })
+      }
+      // return;
+
+      // 附件上传
+      if(this.incidentHandleInfoComponent.fileList2.length){
+        console.log(this.incidentHandleInfoComponent.fileList2.map(v => v.originFileObj));
+        this.incidentHandleInfoComponent.fileList2.map(v => v.originFileObj).forEach(async file => {
+          await this.uploadFiles(file, incidentDataCopy.id);
+        })
+      }
+      // return;
+
+      let postData = {
+        solutionId: this.solutionId,
+        incident: {
+          ...incidentDataCopy,
+          handleCategory: incidentDataCopy.handleCategory ? { id: incidentDataCopy.handleCategory }: undefined,
+          closecode: incidentDataCopy.closecode ? { id: incidentDataCopy.closecode }: undefined,
+          synergetic: incidentDataCopy.synergetic.length ? incidentDataCopy.synergetic.map(v => ({id: v})): undefined,
+          category: incidentDataCopy.category ? { id: incidentDataCopy.category }: undefined,
+        },
+      }
+
+      console.log(postData);
+      // return;
+      this.mainService
+      .flowPost("incident/task/doing", postData)
+      .subscribe((result) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.confirmModelHs.emit();
+
+        if (result.state == 200) {
+          this.message.success('处理成功');
+        } else {
+          this.message.error('处理失败');
+        }
+      });
+    }else if(this.itsmSimpleHandle.value == 1){
+      // 简单处理
+      console.log(this.incidentHandleInfoSimpleComponent)
+      if(!this.incidentHandleInfoSimpleComponent.incidentDataCopy.handleCategory){
+        this.message.warning('请选择处理方式！');
+        return;
+      }
+
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+
+      let incidentDataCopy = cloneDeep(this.incidentHandleInfoSimpleComponent.incidentDataCopy);
+
+      // 图片上传
+      if(this.incidentHandleInfoSimpleComponent.fileList.length){
+        console.log(this.incidentHandleInfoSimpleComponent.fileList.map(v => v.originFileObj));
+        this.incidentHandleInfoSimpleComponent.fileList.map(v => v.originFileObj).forEach(async file => {
+          await this.uploadImages(file, incidentDataCopy.id);
+        })
+      }
+      // return;
+
+      let postData = {
+        incident: {
+          ...incidentDataCopy,
+          handleCategory: incidentDataCopy.handleCategory ? { id: incidentDataCopy.handleCategory }: undefined,
+          synergetic: incidentDataCopy.synergetic.length ? incidentDataCopy.synergetic.map(v => ({id: v})): undefined,
+        },
+      }
+
+      console.log(postData);
+
+      this.mainService
+      .flowPost("incident/task/doing", postData)
+      .subscribe((result) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.confirmModelHs.emit();
+
+        if (result.state == 200) {
+          this.message.success('处理成功');
+        } else {
+          this.message.error('处理失败');
+        }
+      });
+    }
   }
 }
 

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

@@ -0,0 +1,50 @@
+<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="content">
+      <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-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> 搜索中...
+              </nz-option>
+            </nz-select>
+          </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>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </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-input-group>
+              <textarea formControlName="deferralRemark" nz-input rows="3" placeholder="请输入延期说明"></textarea>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -0,0 +1,125 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,140 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-postpone',
+  templateUrl: './incident-postpone.component.html',
+  styleUrls: ['./incident-postpone.component.less']
+})
+export class IncidentPostponeComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  isLoading = false;
+
+  ngOnInit() {
+    this.initForm();
+    this.getDetail();
+    this.getRepairTypeList();
+    this.getDeferralDayList();
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      repairTypeId: [null, [Validators.required]],//延期原因
+      deferralDayId: [null, [Validators.required]],//延期天数
+      deferralRemark: [null, [Validators.required]],//延期说明
+    });
+    console.log(this.validateForm.controls)
+  }
+
+  // 获取延期原因
+  repairTypeList: any = [];
+  getRepairTypeList() {
+    this.mainService
+    .getDictionary('list', 'repair_type')
+    .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,
+		})
+  }
+
+  // 操作权限
+  incidentData:any = {};
+  getDetail(){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("simple/data", "incident", this.id)
+      .subscribe((result) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.incidentData = result.data || {};
+      });
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  maskFlag:any = false;
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData = {
+      incident: this.incidentData,
+    }
+
+    postData.incident.currentLog = {
+      remark: this.validateForm.value.deferralRemark,
+      extra1: this.validateForm.value.repairTypeId,
+      extra2: this.validateForm.value.deferralDayId,
+    }
+
+    this.mainService
+    .flowPost("incident/task/overtime", postData)
+    .subscribe((result) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      this.confirmModelHs.emit();
+
+      if (result.state == 200) {
+        this.message.success('操作成功');
+      } else {
+        this.message.error('操作失败');
+      }
+    });
+  }
+}
+
+
+
+

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

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

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

@@ -0,0 +1,44 @@
+<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="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="hosId">院&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择院区!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="hosId" nzShowSearch
+              nzPlaceHolder="请选择院区" nzServerSearch (ngModelChange)="changeHospital($event)">
+              <ng-container *ngFor="let data of hospitalList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.hosName" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="dutyId">责任部门</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择责任部门!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="dutyId" nzShowSearch
+              nzPlaceHolder="请选择责任部门" nzServerSearch>
+              <ng-container *ngFor="let data of dutyList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.hosName" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -0,0 +1,125 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,130 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-setduty',
+  templateUrl: './incident-setduty.component.html',
+  styleUrls: ['./incident-setduty.component.less']
+})
+export class IncidentSetdutyComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  isLoading = false;
+
+  ngOnInit() {
+    this.initForm();
+    this.getHospitals(1);
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      hosId: [null, [Validators.required]],//院区
+      dutyId: [null, [Validators.required]],//责任部门
+    });
+    console.log(this.validateForm.controls)
+  }
+
+  // 修改院区
+  changeHospital(id){
+    this.validateForm.controls.dutyId.setValue(null);
+
+    this.dutyList = [];
+    this.getHospitals(2, id);
+  }
+
+  // 获取院区
+  hospitalList: any = [];
+  dutyList: any = [];
+  getHospitals(type:number, parentId?) {
+    if(type === 1){
+      this.hospitalList = this.tool.getHospitalList().filter(v => !v.parent);
+      return;
+    }
+    if(type === 2 && !parentId){
+      this.dutyList = [];
+      return;
+    }
+    let postData = {
+      hospital: {
+        parent: { id: parentId },
+        type: { key: 'hospital_type', value: '6' },
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("data", "hospital", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.dutyList = data.list || [];
+      });
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  maskFlag:any = false;
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData = {
+      orderId: this.id,
+      dutyId: this.validateForm.value.dutyId,
+    }
+
+    this.mainService
+    .changeIncidentDuty(postData)
+    .subscribe((result) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      this.confirmModelHs.emit();
+
+      if (result.status == 200) {
+        this.message.success('设置成功');
+      } else {
+        this.message.error('设置失败');
+      }
+    });
+  }
+}
+
+
+
+

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

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

src/app/components/incidentManagement/incident-substitutio-assign/incident-substitution-assign.component.ts

@@ -145,6 +145,8 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
         name: keyword,
         simpleQuery: true,
         groupdata: { id: this.validateForm.value.groupId },
+        roleCodes: 'first-line support,second-line support',
+        engineer: 1,
       },
       idx: 0,
       sum: 10,

src/app/components/incidentManagement/incident-substitutio-redeploy/incident-substitution-redeploy.component.html

@@ -1,33 +1,5 @@
 <form nz-form [formGroup]="validateForm" class="addForm">
   <nz-form-item>
-    <nz-form-label [nzSpan]="6" nzRequired nzFor="hosId">院&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</nz-form-label>
-    <nz-form-control [nzSpan]="18" nzErrorTip="请选择院区!">
-      <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="hosId" nzShowSearch
-        nzPlaceHolder="请选择院区" nzServerSearch (ngModelChange)="changeHospital($event)">
-        <ng-container *ngFor="let data of hospitalList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="data.hosName" [nzValue]="data.id"></nz-option>
-        </ng-container>
-        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-        </nz-option>
-      </nz-select>
-    </nz-form-control>
-  </nz-form-item>
-  <nz-form-item>
-    <nz-form-label [nzSpan]="6" nzRequired nzFor="dutyId">责任部门</nz-form-label>
-    <nz-form-control [nzSpan]="18" nzErrorTip="请选择责任部门!">
-      <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="dutyId" nzShowSearch
-        nzPlaceHolder="请选择责任部门" nzServerSearch (ngModelChange)="changeDuty($event)">
-        <ng-container *ngFor="let data of dutyList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="data.hosName" [nzValue]="data.id"></nz-option>
-        </ng-container>
-        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-        </nz-option>
-      </nz-select>
-    </nz-form-control>
-  </nz-form-item>
-  <nz-form-item>
     <nz-form-label [nzSpan]="6" nzRequired nzFor="groupId">工&nbsp;&nbsp;作&nbsp;&nbsp;组</nz-form-label>
     <nz-form-control [nzSpan]="18" nzErrorTip="请选择工作组!">
       <nz-select (nzOnSearch)="changeInp('group', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="groupId" nzPlaceHolder="请选择工作组" (ngModelChange)="changeGroup($event)">
@@ -41,8 +13,8 @@
     </nz-form-control>
   </nz-form-item>
   <nz-form-item>
-    <nz-form-label [nzSpan]="7" nzFor="userGroup">是否指派到人</nz-form-label>
-    <nz-form-control [nzSpan]="17" nzErrorTip="请选择是否指派到人!">
+    <nz-form-label [nzSpan]="7" nzFor="userGroup">是否转派到人</nz-form-label>
+    <nz-form-control [nzSpan]="17" nzErrorTip="请选择是否转派到人!">
       <nz-radio-group formControlName="userGroup" (ngModelChange)="changeUserGroup($event)">
         <label nz-radio [nzValue]="1">是</label>
         <label nz-radio [nzValue]="0">否</label>
@@ -50,9 +22,9 @@
     </nz-form-control>
   </nz-form-item>
   <nz-form-item *ngIf="validateForm.value.userGroup === 1">
-    <nz-form-label [nzSpan]="6" nzRequired nzFor="userId">指派对象</nz-form-label>
-    <nz-form-control [nzSpan]="18" nzErrorTip="请选择指派对象!">
-      <nz-select (nzOnSearch)="changeInp('user', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="userId" nzPlaceHolder="请选择指派对象">
+    <nz-form-label [nzSpan]="6" nzRequired nzFor="userId">转派对象</nz-form-label>
+    <nz-form-control [nzSpan]="18" nzErrorTip="请选择转派对象!">
+      <nz-select (nzOnSearch)="changeInp('user', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="userId" nzPlaceHolder="请选择转派对象">
         <ng-container *ngFor="let option of userList">
           <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
@@ -62,4 +34,12 @@
       </nz-select>
     </nz-form-control>
   </nz-form-item>
+  <nz-form-item>
+    <nz-form-label [nzSpan]="6" nzRequired nzFor="redeployRemark">转派原因</nz-form-label>
+    <nz-form-control [nzSpan]="18" nzErrorTip="请输入转派原因!">
+      <nz-input-group>
+        <textarea formControlName="redeployRemark" nz-input rows="3" placeholder="请输入转派原因"></textarea>
+      </nz-input-group>
+    </nz-form-control>
+  </nz-form-item>
 </form>

src/app/components/incidentManagement/incident-substitutio-redeploy/incident-substitution-redeploy.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
 import { MainService } from '../../../services/main.service';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { Subject } from 'rxjs';
@@ -11,6 +11,7 @@ import { ToolService } from 'src/app/services/tool.service';
   styleUrls: ['./incident-substitution-redeploy.component.less']
 })
 export class IncidentSubstitutionRedeployComponent implements OnInit {
+  @Input() duty:any;
   constructor(
     private mainService: MainService,
     private fb: FormBuilder,
@@ -29,44 +30,21 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
       }
     });
     this.initForm();
-    this.getHospitals(1);
+    this.getGroups();
   }
 
   // 初始化新增form表单
   validateForm: FormGroup; //新增/编辑表单
   initForm() {
     this.validateForm = this.fb.group({
-      hosId: [null, [Validators.required]],//院区
-      dutyId: [null, [Validators.required]],//责任部门
       userGroup: [1, [Validators.required]],//分配方式
       userId: [null],//人
       groupId: [null, [Validators.required]],//组
+      redeployRemark: [null, [Validators.required]],//转派原因
     });
     console.log(this.validateForm.controls)
   }
 
-  // 修改院区
-  changeHospital(id){
-    this.validateForm.controls.dutyId.setValue(null);
-    this.validateForm.controls.userId.setValue(null);
-    this.validateForm.controls.groupId.setValue(null);
-
-    this.dutyList = [];
-    this.userList = [];
-    this.groupList = [];
-    this.getHospitals(2, id);
-  }
-
-  // 修改责任部门
-  changeDuty(id){
-    this.validateForm.controls.userId.setValue(null);
-    this.validateForm.controls.groupId.setValue(null);
-
-    this.userList = [];
-    this.groupList = [];
-    this.getGroups();
-  }
-
   // 修改组
   changeGroup(id){
     this.validateForm.controls.userId.setValue(null);
@@ -76,7 +54,6 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
   // 选择人|组
   changeUserGroup(id){
     this.validateForm.controls.userId.setValue(null);
-    this.userList = [];
     if(id === 1){
       // 人
       this.requiredConfigChange('userId', true);
@@ -104,34 +81,6 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
     this.changeInpSubject.next([model, e]);
   }
 
-  // 获取院区
-  hospitalList: any = [];
-  dutyList: any = [];
-  getHospitals(type:number, parentId?) {
-    if(type === 1){
-      this.hospitalList = this.tool.getHospitalList().filter(v => !v.parent);
-      return;
-    }
-    if(type === 2 && !parentId){
-      this.dutyList = [];
-      return;
-    }
-    let postData = {
-      hospital: {
-        parent: { id: parentId },
-        type: { key: 'hospital_type', value: '6' },
-      },
-      idx: 0,
-      sum: 9999,
-    };
-    this.mainService
-      .getFetchDataList("data", "hospital", postData)
-      .subscribe((data) => {
-        this.isLoading = false;
-        this.dutyList = data.list || [];
-      });
-  }
-
   // 搜索
   // 获取用户
   userList: any = [];
@@ -142,10 +91,12 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
     }
     let postData = {
       user: {
-        hospital: { id: this.validateForm.value.dutyId },
+        hospital: { id: this.duty.id },
         name: keyword,
         simpleQuery: true,
         groupdata: { id: this.validateForm.value.groupId },
+        roleCodes: 'first-line support,second-line support',
+        engineer: 1,
       },
       idx: 0,
       sum: 10,
@@ -162,14 +113,10 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
   // 获取组
   groupList: any = []; //所有所属科室(搜索)
   getGroups(keyword = '') {
-    if(!this.validateForm.value.dutyId){
-      this.groupList = [];
-      return;
-    }
     let postData = {
       group2: {
         groupName: keyword,
-        hospitals: this.validateForm.value.dutyId,
+        hospitals: this.duty.id,
         type: 1,
       },
       idx: 0,

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

@@ -7,7 +7,7 @@
           <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
         </div>
         <ng-container *ngIf="activeTabValue === 'redeploy'">
-          <app-incident-substitution-redeploy></app-incident-substitution-redeploy>
+          <app-incident-substitution-redeploy [duty]="incidentData.duty"></app-incident-substitution-redeploy>
         </ng-container>
         <ng-container *ngIf="activeTabValue === 'assign'">
           <app-incident-substitution-assign></app-incident-substitution-assign>

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

@@ -110,7 +110,48 @@ export class IncidentSubstitutionComponent implements OnInit {
 
   // 表单提交
   submitForm(): void {
-    if(this.activeTabValue === 'assign'){
+    if(this.activeTabValue === 'redeploy'){
+      // 转派
+      for (const i in this.redeploy.validateForm.controls) {
+        this.redeploy.validateForm.controls[i].markAsDirty();
+        this.redeploy.validateForm.controls[i].updateValueAndValidity();
+      }
+      if (this.redeploy.validateForm.invalid) {
+        return;
+      }
+
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+
+      let postData = {
+        incident: this.incidentData,
+      }
+
+      postData.incident.redeployRemark = this.redeploy.validateForm.value.redeployRemark;
+
+      if(this.redeploy.validateForm.value.userId){
+        // 派人
+        postData.incident.assignee = this.redeploy.validateForm.value.userId;
+      } else {
+        // 派组
+        postData.incident.candidateGroups = this.redeploy.validateForm.value.groupId;
+      }
+
+      this.mainService
+      .flowPost("incident/task/redeploy", postData)
+      .subscribe((result) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.confirmModelHs.emit();
+
+        if (result.state == 200) {
+          this.message.success('转派成功');
+        } else {
+          this.message.error('转派失败');
+        }
+      });
+    }else if(this.activeTabValue === 'assign'){
       // 指派
       for (const i in this.assign.validateForm.controls) {
         this.assign.validateForm.controls[i].markAsDirty();

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

@@ -0,0 +1,50 @@
+<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="content">
+      <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-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> 搜索中...
+              </nz-option>
+            </nz-select>
+          </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>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </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-input-group>
+              <textarea formControlName="deferralRemark" nz-input rows="3" placeholder="请输入延期说明"></textarea>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -0,0 +1,125 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,140 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-visit',
+  templateUrl: './incident-visit.component.html',
+  styleUrls: ['./incident-visit.component.less']
+})
+export class IncidentVisitComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  isLoading = false;
+
+  ngOnInit() {
+    this.initForm();
+    this.getDetail();
+    this.getRepairTypeList();
+    this.getDeferralDayList();
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      repairTypeId: [null, [Validators.required]],//延期原因
+      deferralDayId: [null, [Validators.required]],//延期天数
+      deferralRemark: [null, [Validators.required]],//延期说明
+    });
+    console.log(this.validateForm.controls)
+  }
+
+  // 获取延期原因
+  repairTypeList: any = [];
+  getRepairTypeList() {
+    this.mainService
+    .getDictionary('list', 'repair_type')
+    .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,
+		})
+  }
+
+  // 操作权限
+  incidentData:any = {};
+  getDetail(){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("simple/data", "incident", this.id)
+      .subscribe((result) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.incidentData = result.data || {};
+      });
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  maskFlag:any = false;
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData = {
+      incident: this.incidentData,
+    }
+
+    postData.incident.currentLog = {
+      remark: this.validateForm.value.deferralRemark,
+      extra1: this.validateForm.value.repairTypeId,
+      extra2: this.validateForm.value.deferralDayId,
+    }
+
+    this.mainService
+    .flowPost("incident/task/overtime", postData)
+    .subscribe((result) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      this.confirmModelHs.emit();
+
+      if (result.state == 200) {
+        this.message.success('操作成功');
+      } else {
+        this.message.error('操作失败');
+      }
+    });
+  }
+}
+
+
+
+

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

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

src/app/services/main.service.ts

@@ -894,4 +894,21 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+
+  // 返回附件上传url
+  returnUploadUrl(type, id): string {
+    return `${host.host}/common/common/uploadAttachment/${type}/${id}/${id}`;
+  }
+
+  // 返回excel导入url
+  returnImportExcelUrl(type): string {
+    return `${host.host}/user/data/importExcel/${type}`
+  }
+
+  // 设置责任部门
+	changeIncidentDuty(data): any {
+	  return this.http.post(host.host + "/incident/data/changeIncidentDuty", data, {
+	    headers: this.headers,
+	  });
+	}
 }

src/app/services/tool.service.ts

@@ -223,9 +223,6 @@ export class ToolService {
         case "commonFault":
           coopBtns.commonFault = true; //常见故障
           break;
-        case "handle":
-          coopBtns.handle = true; //处理
-          break;
         case "assign":
           coopBtns.assign = true; //指派
           break;
@@ -244,15 +241,15 @@ export class ToolService {
         case "callback":
           coopBtns.callback = true; //待我回访
           break;
-        case "badEvaluate":
-          coopBtns.badEvaluate = true; //异常评价
-          break;
         case "receive":
           coopBtns.receive = true; //接单
           break;
         case "transfer":
           coopBtns.transfer = true; //转派
           break;
+        case "visit":
+          coopBtns.visit = true; //回访
+          break;
       }
     });
     console.log(coopBtns);
@@ -345,4 +342,14 @@ export class ToolService {
     }
     return arr;
   }
+
+  /**
+   * @description 生成连续的数字
+   * @param {number} start 起点数字
+   * @param {number} end 终点数字
+   * @return {array}
+   */
+  generateNumberArray(start, end){
+    return Array.from(new Array(end + 1).keys()).slice(start);
+  }
 }

src/app/share/inspection-execute-assign-prompt-modal/inspection-execute-assign-prompt-modal.component.ts

@@ -65,6 +65,8 @@ export class InspectionExecuteAssignPromptModalComponent implements OnInit {
         name: keyword,
         simpleQuery: true,
         menuId: 414,
+        roleCodes: 'inspectman',
+        engineer: 1,
       },
       idx: 0,
       sum: 20,

src/app/share/wang-editor/wang-editor.component.ts

@@ -3,6 +3,7 @@ import WangEditor from 'wangeditor';
 import { HttpHeaders, HttpRequest, HttpClient  } from "@angular/common/http";
 import host from "../../../assets/js/http";
 import { NzMessageService } from "ng-zorro-antd";
+import { MainService } from 'src/app/services/main.service';
 
 @Component({
   selector: 'app-wang-editor',
@@ -10,16 +11,17 @@ import { NzMessageService } from "ng-zorro-antd";
   styleUrls: ['./wang-editor.component.less']
 })
 export class wangEditorComponent implements OnInit {
-	
+
 	@Output() changeContent = new EventEmitter();
 	@Input() content: string;
 	editor: any;
 	isLoading:boolean=false;
 	constructor(
 		private http: HttpClient,
-		private message: NzMessageService
+		private message: NzMessageService,
+    private mainService: MainService,
 	) { }
-	
+
   ngOnInit() {
 		// if(this.editor){
 		// 	this.editors()
@@ -27,7 +29,7 @@ export class wangEditorComponent implements OnInit {
 		this.editor = new WangEditor('#editorMenu', '#editor');
 		this.setEditorConfig()
   }
-	
+
 	// 编辑器相关配置设置
 	setEditorConfig () {
 		// 使用 base64 保存图片
@@ -41,15 +43,15 @@ export class wangEditorComponent implements OnInit {
 		// 自定义字体
 		this.editor.config.fontNames = this.getFontFamilyConfig();
 
-		// 上传图片大小 20M 
+		// 上传图片大小 20M
 		this.editor.config.uploadImgMaxSize = 20 * 1024 * 1024
 		// // 隐藏插入网络图片的功能
 		this.editor.config.showLinkImg = false
-		
+
 		// 上传视频大小 50M
 		this.editor.config.uploadVideoMaxSize = 50 * 1024 * 1024
 		this.editor.config.showLinkVideo = false
-		
+
 		// // 配置触发 onchange 的时间频率，默认为 200ms
 		this.editor.config.onchangeTimeout = 500 // 修改为 500ms
 		this.editor.config.customUploadImg = (resultFiles, insertImgFn) =>{
@@ -57,7 +59,7 @@ export class wangEditorComponent implements OnInit {
 				this.message.error('图片大小不能超过20M')
 				return
 			}
-			let url = `/service/common/common/uploadAttachment/solutionContent/0/0`
+			let url = this.mainService.returnUploadUrl('solutionContent', 0);
 			const formData = new FormData()
 			formData.append('file', resultFiles[0]);
 			formData.append('filename', resultFiles[0].name);
@@ -76,13 +78,13 @@ export class wangEditorComponent implements OnInit {
 				}
 			});
 		}
-		
+
 		this.editor.config.customUploadVideo = (resultFiles, insertVideoFn) =>{
 			if(resultFiles[0].size > this.editor.config.uploadVideoMaxSize){
 				this.message.error('视频大小不能超过50M')
 				return
 			}
-			let url = `/service/common/common/uploadAttachment/solutionContent/0/0`
+			let url = this.mainService.returnUploadUrl('solutionContent', 0);
 			const formData = new FormData()
 			formData.append('file', resultFiles[0]);
 			formData.append('filename', resultFiles[0].name);
@@ -101,19 +103,19 @@ export class wangEditorComponent implements OnInit {
 				}
 			});
 		}
-		
+
 		// 配置编辑器内容改变触发方法
 		this.editor.config.onchange = this.editorContentChange;
 		// 编辑器获取到焦点触发方法
 		this.editor.config.onfocus = this.editorOnFocus;
 		// 编辑器失去焦点触发方法
 		this.editor.config.onblur = this.editorOnBlur;
-		
+
 		this.editor.create();
 		// 设置内容
 		this.setContent()
 	}
-			
+
 	  // 获取显示菜单项
 	  getMenuConfig (): string[] {
 	    return [
@@ -139,7 +141,7 @@ export class wangEditorComponent implements OnInit {
 	      'redo'  // 重复
 	    ];
 	  }
-	
+
 	  // 获取字体、背景颜色列表配置
 	  getColorConfig(): string[] {
 	    return [
@@ -155,7 +157,7 @@ export class wangEditorComponent implements OnInit {
 	      '#ffffff'
 	    ];
 	  }
-	
+
 	  // 获取表情配置
 	  getEmotionsConfig() {
 	    return [
@@ -186,7 +188,7 @@ export class wangEditorComponent implements OnInit {
 	      }
 	    ];
 	  }
-	
+
 	  // 获取字体列表配置
 	  getFontFamilyConfig(): string[] {
 	    return [
@@ -197,29 +199,29 @@ export class wangEditorComponent implements OnInit {
 	      'Verdana'
 	    ];
 	  }
-		
+
 	  // 富文本编辑器内容变化触发方法
 	  editorContentChange = (html) => {
 			this.changeContent.emit(html)
 	    console.log(222,html);
 	  }
-	
+
 	  // 编辑器获取到焦点触发事件
 	  editorOnFocus = () => {
 	    console.log('on focus');
 	  }
-	
+
 	  // 编辑器失去焦点触发事件
 	  editorOnBlur = (html) => {
 			this.changeContent.emit(html)
 	  }
-	
+
 	  // 设置编辑器显示内容
 	  setContent() {
 			console.log(7777,this.content)
 	    this.editor.txt.html(this.content);
 	  }
-		
+
 		editors(){
 			this.editor.destroy()//销毁组件
 			this.editor = null
@@ -228,7 +230,7 @@ export class wangEditorComponent implements OnInit {
 	//   getContent() {
 	//     this.showMessage = this.editor.txt.html();
 	//   }
-	
+
 	//   // 获取编辑器文字内容
 	//   getContentText() {
 	//     this.showMessage = this.editor.txt.text();

src/app/views/admin-office-prescription/admin-office-prescription.component.ts

@@ -37,7 +37,7 @@ export class AdminOfficePrescriptionComponent implements OnInit{
     private tool: ToolService,
     private http: HttpClient,
   ) {}
-	
+
   ngOnInit() {
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
       // this.getAllParentdepart(v).subscribe((result) => {
@@ -66,7 +66,7 @@ export class AdminOfficePrescriptionComponent implements OnInit{
   validateForm: FormGroup; //新增/编辑表单
   coopId: number; //表格中执行操作的id
   department: ""; //所属科室
-	hosId: number; 
+	hosId: number;
 	dateRange;//时间
   batchNumber; //批次号
   num; //编码
@@ -137,7 +137,7 @@ export class AdminOfficePrescriptionComponent implements OnInit{
     this.maskFlag = this.message.loading("正在导入中..", {
       nzDuration: 0,
     }).messageId;
-    const req = new HttpRequest('Post', host.host + '/user/data/importExcel/department', formData, {
+    const req = new HttpRequest('Post', this.mainService.returnImportExcelUrl('department'), formData, {
       reportProgress: true
     });
     this.http
@@ -306,7 +306,7 @@ export class AdminOfficePrescriptionComponent implements OnInit{
         that.listLength = data.totalNum;
       });
   }
-	
+
 	// 日期选择
 	startDate: string; //发起时间开始
 	endDate: string; //发起时间结束
@@ -318,7 +318,7 @@ export class AdminOfficePrescriptionComponent implements OnInit{
 	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
 	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 获取所有科室
   // snum = 0;
   getDeparts(dept) {
@@ -342,7 +342,7 @@ export class AdminOfficePrescriptionComponent implements OnInit{
 			},500)
 		});
   }
-	
+
   // 获取所有院区
   getAllHospital() {
 		this.getDeparts('')
@@ -360,7 +360,7 @@ export class AdminOfficePrescriptionComponent implements OnInit{
     let hid;
     if (hospitalId || hospitalId == 0) {
       hid = hospitalId - 0;
-    } 
+    }
 		// else {
   //     hid = this.hospital - 0;
   //   }

src/app/views/building-floor/building-floor.component.ts

@@ -121,7 +121,7 @@ export class BuildingFloorComponent implements OnInit {
     this.maskFlag = this.message.loading("正在导入中..", {
       nzDuration: 0,
     }).messageId;
-    const req = new HttpRequest('Post', host.host + '/user/data/importExcel/building', formData, {
+    const req = new HttpRequest('Post', this.mainService.returnImportExcelUrl('building'), formData, {
       reportProgress: true
     });
     this.http

src/app/views/incident-management/incident-management.component.html

@@ -60,11 +60,11 @@
             <th nzWidth="5%">序号</th>
             <th nzWidth="27%">故障信息</th>
             <th nzWidth="14%">详细地址</th>
-            <th nzWidth="14%">联系信息</th>
+            <th nzWidth="12%">联系信息</th>
             <th nzWidth="12%">受理人|处理人/组</th>
             <th nzWidth="10%">延期记录</th>
             <th nzWidth="8%">状态</th>
-            <th nzWidth="10%">操作</th>
+            <th nzWidth="12%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -90,20 +90,20 @@
             <td>
               {{ data.acceptUser?.name || '无' }}<br>
               {{ transferSynergetic(data) }}<br>
-              <span [ngStyle]="{ color: data.handleColourInfo.value }">{{ data.overdueTime | date: 'MM-dd HH:mm' }}</span>前接单
+              <span [ngStyle]="{ color: data.handleColourInfo ? data.handleColourInfo.value : '' }">{{ data.overdueTime | date: 'MM-dd HH:mm' }}</span>前接单
             </td>
             <td [innerHTML]="transferHandlerLog(data.currentLog)"></td>
             <td>{{ data.state?.name }}</td>
             <td>
               <div class="coop">
-                <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看</span>
-                <!-- <span *ngIf="coopBtns.edit" (click)="detail($event,data.id)">编辑</span> -->
+                <span *ngIf="coopBtns.look" (click)="detail($event,data)">查看</span>
+                <span *ngIf="computedVisit(data)" (click)="visit($event,data)">回访</span>
                 <span *ngIf="computedReceive(data)" (click)="showDelModal($event, data,'您确认要接单吗？','接单','receive')">接单</span>
                 <span *ngIf="computedHandle(data)" (click)="handle($event,data)">处理</span>
                 <span *ngIf="computedSubstitution(data)" (click)="substitution($event,data)">换人处理</span>
-                <span *ngIf="coopBtns.postpone" (click)="detail($event,data.id)">延期处理</span>
-                <span *ngIf="coopBtns.settings" (click)="detail($event,data.id)">设置责任科室</span>
-                <span *ngIf="coopBtns.del" (click)="showDelModal($event, data,'您确认要删除吗？','删除','del')">删除</span>
+                <span *ngIf="computedPostpone(data)" (click)="postpone($event,data)">延期处理</span>
+                <span *ngIf="computedSetDuty(data)" (click)="setDuty($event,data)">设置责任部门</span>
+                <span *ngIf="coopBtns.del && data.deleteFlag !== 1" (click)="showDelModal($event, data,'您确认要删除吗？','删除','del')">删除</span>
               </div>
             </td>
           </tr>
@@ -181,3 +181,15 @@
 
 <!-- 换人处理 -->
 <app-incident-substitution [id]="coopData.id" *ngIf="substitutionModalShow" (closeModelHs)="closeSubstitutionModelOrder($event)" (confirmModelHs)="confirmSubstitutionModelOrder($event)"></app-incident-substitution>
+
+<!-- 设置责任部门 -->
+<app-incident-setduty [id]="coopData.id" *ngIf="setdutyModalShow" (closeModelHs)="closeSetdutyModelOrder($event)" (confirmModelHs)="confirmSetdutyModelOrder($event)"></app-incident-setduty>
+
+<!-- 延期处理 -->
+<app-incident-postpone [id]="coopData.id" *ngIf="postponeModalShow" (closeModelHs)="closePostponeModelOrder($event)" (confirmModelHs)="confirmPostponeModelOrder($event)"></app-incident-postpone>
+
+<!-- 回访 -->
+<app-incident-visit [id]="coopData.id" *ngIf="visitModalShow" (closeModelHs)="closeVisitModelOrder($event)" (confirmModelHs)="confirmVisitModelOrder($event)"></app-incident-visit>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

src/app/views/incident-management/incident-management.component.ts

@@ -214,9 +214,9 @@ export class IncidentManagementComponent implements OnInit {
     if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
         if(currentLog.extra2==0.5){
           currentLog.extra2 = 4;
-          return currentLog.extra1DTO.name+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "MM月dd日")+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
+          return currentLog.extra1DTO.name+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日")+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
         }else{
-          return currentLog.extra1DTO.name+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
+          return currentLog.extra1DTO.name+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
         }
     }else{
         return '无';
@@ -253,6 +253,21 @@ export class IncidentManagementComponent implements OnInit {
     return data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign) && data.deleteFlag !== 1;
   }
 
+  // 是否显示延期处理按钮
+  computedPostpone(data){
+    return this.coopBtns.postpone && data.state.value == 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
+  }
+
+  // 是否显示设置责任部门按钮
+  computedSetDuty(data){
+    return this.coopBtns.settings && (data.state.value == 'resolved' || data.state.value == 'close') && data.deleteFlag !== 1;
+  }
+
+  // 是否显示回访按钮
+  computedVisit(data){
+    return this.coopBtns.visit && data.state.value == 'close' && data.deleteFlag !== 1;
+  }
+
   // 表格数据
   loading1 = false;
   getList(isInit = false) {
@@ -401,9 +416,76 @@ export class IncidentManagementComponent implements OnInit {
     this.debounceSubject.next(false);
   }
 
-  // 查看
-  detail(e, id) {
+  // 设置责任部门-弹窗
+  setdutyModalShow = false; //弹窗开关
+  setDuty(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.setdutyModalShow = true;
+  }
+  // 关闭弹窗
+  closeSetdutyModelOrder(e) {
+    this.setdutyModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmSetdutyModelOrder(e){
+    console.log(e);
+    this.setdutyModalShow = false;
+    this.getList(true);
+  }
+
+  // 回访-弹窗
+  visitModalShow = false; //弹窗开关
+  visit(e, data) {
     e.stopPropagation();
+    this.coopData = data;
+    this.visitModalShow = true;
+  }
+  // 关闭弹窗
+  closeVisitModelOrder(e) {
+    this.visitModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmVisitModelOrder(e){
+    console.log(e);
+    this.visitModalShow = false;
+    this.getList(true);
+  }
+
+  // 详情-弹窗
+  detailModalShow = false; //弹窗开关
+  detail(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+    this.getList(true);
+  }
+
+  // 延期处理-弹窗
+  postponeModalShow = false; //弹窗开关
+  postpone(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.postponeModalShow = true;
+  }
+  // 关闭弹窗
+  closePostponeModelOrder(e) {
+    this.postponeModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmPostponeModelOrder(e){
+    console.log(e);
+    this.postponeModalShow = false;
+    this.getList(true);
   }
 
   delModal: boolean = false; //删除模态框

src/app/views/incident-management/incident-management.module.ts

@@ -6,6 +6,10 @@ import { IncidentManagementComponent } from './incident-management.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { IncidentHandleModule } from 'src/app/components/incidentManagement/incident-handle/incident-handle.module';
 import { IncidentSubstitutionModule } from 'src/app/components/incidentManagement/incident-substitution/incident-substitution.module';
+import { IncidentSetdutyModule } from 'src/app/components/incidentManagement/incident-setduty/incident-setduty.module';
+import { IncidentPostponeModule } from 'src/app/components/incidentManagement/incident-postpone/incident-postpone.module';
+import { IncidentVisitModule } from 'src/app/components/incidentManagement/incident-visit/incident-visit.module';
+import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
 
 
 @NgModule({
@@ -18,6 +22,10 @@ import { IncidentSubstitutionModule } from 'src/app/components/incidentManagemen
     ShareModule,
     IncidentHandleModule,
     IncidentSubstitutionModule,
+    IncidentSetdutyModule,
+    IncidentPostponeModule,
+    IncidentVisitModule,
+    IncidentDetailModule,
   ]
 })
 export class IncidentManagementModule { }

src/app/views/inspection-plan-config/inspection-plan-config.component.ts

@@ -186,6 +186,8 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
         name: keyword,
         simpleQuery: true,
         menuId: 414,
+        roleCodes: 'inspectman',
+        engineer: 1,
       },
       idx: 0,
       sum: 10,

src/app/views/office-management/office-management.component.ts

@@ -131,7 +131,7 @@ export class OfficeManagementComponent implements OnInit {
     this.maskFlag = this.message.loading("正在导入中..", {
       nzDuration: 0,
     }).messageId;
-    const req = new HttpRequest('Post', host.host + '/user/data/importExcel/department', formData, {
+    const req = new HttpRequest('Post', this.mainService.returnImportExcelUrl('department'), formData, {
       reportProgress: true
     });
     this.http

src/app/views/repository-manage-add/repository-manage-add.component.ts

@@ -398,7 +398,7 @@ export class RepositoryManageAddComponent implements OnInit {
 
 	// 上传图片
 	uploadFile(id){
-		let url = `/service/common/common/uploadAttachment/solution/${id}/${id}`
+		let url = this.mainService.returnUploadUrl('solution', id);
 		for(let i of this.fileData){//新上传的附件
 			const formData = new FormData()
 			let item = this.fileAllData.find(t=>t.id == i.uid) //之前的附件

src/app/views/sys-config/sys-config.component.html

@@ -21,7 +21,7 @@
           <nz-form-control [nzSpan]="24" nzErrorTip="请选择系统logo!">
             <nz-upload nzFor="logo"
               class="avatar-uploader"
-              nzAction="/service/common/common/uploadAttachment/sysLogo/777/777"
+              [nzAction]="sysLogoUrl"
               [nzCustomRequest]="customReq"
               nzName="file"
               nzListType="picture-card"
@@ -42,7 +42,7 @@
           <nz-form-control [nzSpan]="24" nzErrorTip="请选择系统favicon图标!">
             <nz-upload nzFor="favicon"
               class="avatar-uploader"
-              nzAction="/service/common/common/uploadAttachment/faviconLogo/777/777"
+              [nzAction]="faviconLogoUrl"
               [nzCustomRequest]="customReq"
               nzName="file"
               nzListType="picture-card"

src/app/views/sys-config/sys-config.component.ts

@@ -29,6 +29,9 @@ export class SysConfigComponent implements OnInit {
   formatterSecond = (value: number) => `${value} 秒`;
   parserSecond = (value: string) => value.replace(' 秒', '');
   menu = JSON.parse(localStorage.getItem("menu")) || []; //菜单
+
+  sysLogoUrl:string =  this.mainService.returnUploadUrl('sysLogo', 777);
+  faviconLogoUrl:string =  this.mainService.returnUploadUrl('faviconLogo', 777);
   constructor(
     private mainService: MainService,
     private fb: FormBuilder,

src/app/views/users-management/users-management.component.ts

@@ -134,7 +134,7 @@ export class UsersManagementComponent implements OnInit {
     this.maskFlag = this.message.loading("正在导入中..", {
       nzDuration: 0,
     }).messageId;
-    const req = new HttpRequest('Post', host.host + '/user/data/importExcel/user', formData, {
+    const req = new HttpRequest('Post', this.mainService.returnImportExcelUrl('user'), formData, {
       reportProgress: true
     });
     this.http