故障工单

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

@@ -210,3 +210,7 @@
 <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/configurationCenter/configuration-category/configuration-category.component.ts

@@ -70,7 +70,8 @@ export class ConfigurationCategoryComponent implements OnInit {
     setTimeout(() => {
       this.tableCategoryHeight = document.querySelector('#categoryTable').clientHeight - 8 - document.querySelector('#categoryTable .thead').clientHeight;
     }, 0)
-    if(this.currentHospital.type && this.currentHospital.type.value === '6'){
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+    if(type === 'duty'){
       // 是责任部门
       let flag = this.hospitalConfigList.some(v => v.id === 1);
       !flag && this.hospitalConfigList.unshift({ id: 1, name: '部门设置',});

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

@@ -34,7 +34,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
 	malfunctionData:any = [];
 	allUserGroup:any = [];
 	userData:any = [];
-	
+
   formatterMinute = (value: number) => `${value} 分钟`;
   parserMinute = (value: string) => value.replace(' 分钟', '');
 
@@ -47,7 +47,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			// this.isDeptLoading = true;
 			// this.getUser(e);
 		});
-		
+
     // 优先级
     setTimeout(() => {
       this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
@@ -75,15 +75,15 @@ export class ConfigurationDeptUserComponent implements OnInit {
   hidePriorityModal() {
     this.modalPriority = false;
   }
-	
+
 	changeInp(e) {
 	  this.searchParentDeptSubject.next(e);
 	}
-	
+
 	changeInp3(e){
 		this.searchParentUserSubject.next(e);
 	}
-	
+
 	// 获取所有科室
 	getDeparts(dept) {
 	  var that = this;
@@ -104,17 +104,18 @@ export class ConfigurationDeptUserComponent implements OnInit {
 				},100)
 		  });
 	}
-	
+
 	// 获取故障现象数据
 	getMalfunction(){
-		if(!this.currentHospital.type || (this.currentHospital.type && this.currentHospital.type.value !== '6')){
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+		if(type === 'hospital' || type === 'department'){
 		  this.malfunctionData = [];
 		  return;
 		};
 		let postData = {
 			hasThird: 'true',
 		  category: {
-		    dutyIds: this.currentHospital.type.value === '6' ? this.currentHospital.id.toString()  : undefined,
+		    dutyIds: type === 'duty' ? hospital.id.toString()  : undefined,
 		  },
 		};
 		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
@@ -133,13 +134,13 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			}
 		})
 	}
-	
+
 	// 选择处理组
 	changeGroup(e){
 		this.validatePriorityForm.controls.handleUser.setValue(null)
 		this.getUser(e)
 	}
-	
+
 	// 获取处理组
 	getGrop(){
 		let groupData = {
@@ -156,7 +157,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
 		    this.allUserGroup = data.list;
 		  });
 	}
-	
+
 	// 获取处理人
 	getUser(groupId){
 		let data = {
@@ -177,7 +178,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
 				},100)
 			});
 	}
-	
+
   // 编辑
   editPriority(data) {
     console.log(data);
@@ -262,7 +263,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
         }
       });
   }
-	
+
 	changeRadio(e){
 		if(this.validatePriorityForm.value.binding=='1'){
 			this.validatePriorityForm = this.fb.group({
@@ -282,7 +283,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			});
 		}
 	}
-	
+
   // 初始化新增form表单
   validatePriorityForm: FormGroup; //新增/编辑表单
   initPriorityForm() {

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

@@ -71,9 +71,21 @@
             <span>通知内容：</span><textarea class="wd" rows="10" nz-input placeholder="请输入通知内容" [(ngModel)]="item.processContent" [disabled]="item.disable"></textarea>
           </div>
           <div class="message_body_list_configure">
-            <span style="visibility: hidden">变量名称：</span>
+            <span style="visibility: hidden">变量名称{{currentIndex}}：</span>
             <p>备注：[$变量名称$]可添加<em *ngFor="let v of varArr;let first = first;let last = last;"><span (click)="writeIn(item, v, $event, 'processContent')">{{v}}</span><i *ngIf="!last">、</i><i *ngIf="last">。</i></em></p>
           </div>
+          <div class="message_body_list_wechatConfig" *ngIf="currentIndex == 2">
+            <span><i class="icon_transport transport-required red"></i>配置类型：</span>
+            <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="editData.wechatConfigTypeId"
+              nzPlaceHolder="请选择微信配置类型" nzServerSearch>
+              <ng-container *ngFor="let data of wechatConfigTypeList">
+                <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>
+          </div>
           <div class="message_body_list_title">
             <span><i class="icon_transport transport-required red"></i>是否开启：</span>
             <nz-radio-group [(ngModel)]="editData.flag">

src/app/components/configurationCenter/configuration-message/configuration-message.component.less

@@ -313,6 +313,14 @@
                   cursor: pointer;
                 }
               }
+              .message_body_list_wechatConfig{
+                display: flex;
+                align-items: center;
+                margin-bottom: 8px;
+                span{
+                  flex-shrink: 0;
+                }
+              }
             }
           }
         }

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

@@ -25,6 +25,7 @@ export class ConfigurationMessageComponent implements OnInit {
     setTimeout(() => {
       this.tableHeight = document.querySelector('#wechatTable').clientHeight - 8 - document.querySelector('#wechatTable .thead').clientHeight;
     }, 0)
+    this.getWechatConfigTypeList();
     this.getList();
   }
 
@@ -119,7 +120,8 @@ export class ConfigurationMessageComponent implements OnInit {
         wechatMessageFlag: data.wechatMessageFlag == 1 ? true : false,//微信是否开启
         messageStationTitle: data.messageStationTitle,//站内消息标题
         wechatMessageTitle: data.wechatMessageTitle,//微信标题
-        flag: data.flag == 1 ? true : false//总开关是否开启,0为关闭，1为开启
+        flag: data.flag == 1 ? true : false,//总开关是否开启,0为关闭，1为开启
+        wechatConfigTypeId: data.wechatConfigType ? data.wechatConfigType.id : null,//微信配置类型
     };
 
     this.tabs = [
@@ -128,21 +130,21 @@ export class ConfigurationMessageComponent implements OnInit {
         processTitle: this.editData.messageStationTitle,
         processContent: this.editData.messageStationContent,
         checkboxFlag: this.editData.messageStationFlag,
-        disable: !this.editData.messageStationFlag
+        disable: !this.editData.messageStationFlag,
       },
       {
-          tabName: "短信",
-          processTitle: '',
-          processContent: this.editData.shortMessageContent,
-          checkboxFlag: this.editData.shortMessageFlag,
-          disable: !this.editData.shortMessageFlag
+        tabName: "短信",
+        processTitle: '',
+        processContent: this.editData.shortMessageContent,
+        checkboxFlag: this.editData.shortMessageFlag,
+        disable: !this.editData.shortMessageFlag,
       },
       {
-          tabName: "微信",
-          processTitle: this.editData.wechatMessageTitle,
-          processContent: this.editData.wechatMessageContent,
-          checkboxFlag: this.editData.wechatMessageFlag,
-          disable: !this.editData.wechatMessageFlag
+        tabName: "微信",
+        processTitle: this.editData.wechatMessageTitle,
+        processContent: this.editData.wechatMessageContent,
+        checkboxFlag: this.editData.wechatMessageFlag,
+        disable: !this.editData.wechatMessageFlag,
       }
     ];
 
@@ -167,55 +169,62 @@ export class ConfigurationMessageComponent implements OnInit {
   // 新增/编辑表单提交
   btnLoading: boolean = false; //提交按钮loading状态
   submitMessageForm(): void {
-    this.btnLoading = true;
+    // 微信-微信配置类型
+    if(this.tabs[2].checkboxFlag && !this.editData.wechatConfigTypeId) {
+      this.showPromptModal('保存', false, "请选择微信配置类型");
+      return;
+    }
     var filterArr = this.tabs.filter(item => {
       return item.checkboxFlag;
     });
     for (var i = 0; i < filterArr.length; i++) {
-        if (filterArr[i].processContent == '') {
-            alert("通知内容【" + filterArr[i].tabName + "】不能为空！");
-            return;
-        } else {
-            var nowArr = [...new Set([...(filterArr[i].processContent.match(/\[\$[^\$\[\]]*?\$\]/g) || []), ...this.varArr])];
-            if (nowArr.length !== this.varArr.length) {
-                alert("【" + filterArr[i].tabName + "】请填写有效的变量名称！");
-                return;
-            }
+      if (filterArr[i].processContent == '') {
+        this.showPromptModal('保存', false, "通知内容【" + filterArr[i].tabName + "】不能为空！");
+        return;
+      } else {
+        var nowArr = [...new Set([...(filterArr[i].processContent.match(/\[\$[^\$\[\]]*?\$\]/g) || []), ...this.varArr])];
+        if (nowArr.length !== this.varArr.length) {
+          this.showPromptModal('保存', false, "【" + filterArr[i].tabName + "】请填写有效的变量名称！");
+          return;
         }
+      }
     }
+    this.btnLoading = true;
     let postData:any = {};
     //请求参数处理(是否有输入数字控件)
     if (this.editData.noticeRule !== 'no') {
-        postData = {
-            // "messageManager": {
-                "id": this.editData.id,
-                "noticeRule": this.editData.noticeRule,
-                "messageStationFlag": this.tabs[0].checkboxFlag ? 1 : 0,
-                "messageStationTitle": this.tabs[0].processTitle,
-                "messageStationContent": this.tabs[0].processContent,
-                "shortMessageFlag": this.tabs[1].checkboxFlag ? 1 : 0,
-                "shortMessageContent": this.tabs[1].processContent,
-                "wechatMessageFlag": this.tabs[2].checkboxFlag ? 1 : 0,
-                "wechatMessageTitle": this.tabs[2].processTitle,
-                "wechatMessageContent": this.tabs[2].processContent,
-                "flag": this.editData.flag ? 1 : 0
-            // }
-        };
+      postData = {
+        // "messageManager": {
+          "id": this.editData.id,
+          "noticeRule": this.editData.noticeRule,
+          "messageStationFlag": this.tabs[0].checkboxFlag ? 1 : 0,
+          "messageStationTitle": this.tabs[0].processTitle,
+          "messageStationContent": this.tabs[0].processContent,
+          "shortMessageFlag": this.tabs[1].checkboxFlag ? 1 : 0,
+          "shortMessageContent": this.tabs[1].processContent,
+          "wechatMessageFlag": this.tabs[2].checkboxFlag ? 1 : 0,
+          "wechatMessageTitle": this.tabs[2].processTitle,
+          "wechatMessageContent": this.tabs[2].processContent,
+          "flag": this.editData.flag ? 1 : 0,
+          "wechatConfigType": this.editData.wechatConfigTypeId ? { id: this.editData.wechatConfigTypeId } : undefined,
+        // }
+      };
     } else {
-        postData = {
-            // "messageManager": {
-                "id": this.editData.id,
-                "messageStationFlag": this.tabs[0].checkboxFlag ? 1 : 0,
-                "messageStationTitle": this.tabs[0].processTitle,
-                "messageStationContent": this.tabs[0].processContent,
-                "shortMessageFlag": this.tabs[1].checkboxFlag ? 1 : 0,
-                "shortMessageContent": this.tabs[1].processContent,
-                "wechatMessageFlag": this.tabs[2].checkboxFlag ? 1 : 0,
-                "wechatMessageTitle": this.tabs[2].processTitle,
-                "wechatMessageContent": this.tabs[2].processContent,
-                "flag": this.editData.flag ? 1 : 0
-            // }
-        };
+      postData = {
+        // "messageManager": {
+          "id": this.editData.id,
+          "messageStationFlag": this.tabs[0].checkboxFlag ? 1 : 0,
+          "messageStationTitle": this.tabs[0].processTitle,
+          "messageStationContent": this.tabs[0].processContent,
+          "shortMessageFlag": this.tabs[1].checkboxFlag ? 1 : 0,
+          "shortMessageContent": this.tabs[1].processContent,
+          "wechatMessageFlag": this.tabs[2].checkboxFlag ? 1 : 0,
+          "wechatMessageTitle": this.tabs[2].processTitle,
+          "wechatMessageContent": this.tabs[2].processContent,
+          "flag": this.editData.flag ? 1 : 0,
+          "wechatConfigType": this.editData.wechatConfigTypeId ? { id: this.editData.wechatConfigTypeId } : undefined,
+        // }
+      };
     }
     // 关闭模态窗口并传递一个结果
     postData = Object.assign({}, this.coopData, postData);
@@ -238,6 +247,16 @@ export class ConfigurationMessageComponent implements OnInit {
       });
   }
 
+  //获取微信配置类型
+  wechatConfigTypeList:any[] = [];
+  getWechatConfigTypeList() {
+    this.mainService
+    .getDictionary('list', 'wechat_config_type')
+    .subscribe((data) => {
+      this.wechatConfigTypeList = data || [];
+    });
+  }
+
   // 获取列表
   loading1:boolean = false;
   messageList: any[] = []; //表格数据

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

@@ -5,7 +5,7 @@
         <div class="list-template__bottom">
           <div class="list-template__top" nz-row>
             <div nz-col nzLg="24" class="list-template__btns">
-              <button nz-button class="btn default" (click)="addPriorityModal()">新增</button>
+              <!-- <button nz-button class="btn default" (click)="addPriorityModal()">新增</button> -->
             </div>
           </div>
           <nz-table class="list-template__nzTable" [nzData]="priorityList" nzSize="middle" [nzShowPagination]="false"
@@ -31,7 +31,7 @@
                 <td>{{data.workdayClassDTO?.name}}</td>
                 <td>
                   <div class="coop">
-                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
+                    <!-- <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span> -->
                     <span (click)="editPriority(data)">编辑</span>
                   </div>
                 </td>

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

@@ -0,0 +1,59 @@
+<div class="incident_handle_info">
+  <div class="row">
+    <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>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <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>
+      </div>
+    </div>
+  </div>
+
+  <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>
+    </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>
+      <div class="tips">只支持jpg,png 格式</div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,54 @@
+@import "../../../../../src/theme.less";
+:host{
+  display: inline-block;
+  width: 100%;
+  .incident_handle_info{
+    padding: 16px;
+    .row{
+      display: flex;
+      gap: 16px;
+      .formItem{
+        flex: 1;
+      }
+    }
+    .upload-icon{
+      font-size: 30px;
+      color: #898989;
+      margin-bottom: 8px;
+    }
+    .ant-upload-text{
+      color: #898989;
+    }
+    .formItem{
+      margin-bottom: 16px;
+      position: relative;
+      display: flex;
+      &.column{
+        flex-direction: column;
+        .name{
+          margin-bottom: 8px;
+        }
+      }
+      .name{
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+        .transport-required{
+          font-size: 10px;
+          margin-right: 2px;
+        }
+      }
+      .value{
+        display: flex;
+        align-items: center;
+        &.upload{
+          flex-direction: column;
+          align-items: flex-start;
+          .tips{
+            color: rgba(0,0,0,0.45);
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,60 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } 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';
+
+@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 {
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    public tool: ToolService,
+  ) { }
+
+  isLoading = false;
+  formDTO:any =  {};
+
+  ngOnInit() {
+    this.getOrders();
+  }
+  // 关闭弹窗
+  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;
+    // })
+  }
+
+  // 表单提交
+  submitForm(): void {
+    this.confirmModelHs.emit();
+  }
+}
+
+
+
+

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

@@ -0,0 +1,109 @@
+<div class="incident_handle_info">
+  <div class="formItem column">
+    <div class="name"><i class="icon_transport transport-required red"></i>解决方案：</div>
+    <div class="value">
+      <textarea rows="4" nz-input [(ngModel)]="formDTO.description" placeholder="请输入解决方案"></textarea>
+    </div>
+  </div>
+
+  <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>
+    </div>
+  </div>
+
+  <div class="row">
+    <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>
+      </div>
+    </div>
+
+    <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>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <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>
+      </div>
+    </div>
+
+    <div class="formItem">
+      <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>是否转换知识库：</div>
+      <div class="value w100">
+        <nz-radio-group [(ngModel)]="radioValue">
+          <label nz-radio [nzValue]="1">是</label>
+          <label nz-radio [nzValue]="0">否</label>
+        </nz-radio-group>
+      </div>
+    </div>
+  </div>
+
+  <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>
+    </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>
+      <div class="tips">只支持jpg,png 格式</div>
+    </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 class="w100" nzAction="https://jsonplaceholder.typicode.com/posts/" [nzFileType]="tool.attachmentsTypes">
+        <button nz-button><i nz-icon nzType="upload"></i><span>上传文件</span></button>
+      </nz-upload>
+      <div class="tips mt8">只支持word，excel，pdf，txt，ppt 格式</div>
+    </div>
+  </div>
+
+</div>

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

@@ -0,0 +1,54 @@
+@import "../../../../../src/theme.less";
+:host{
+  display: inline-block;
+  width: 100%;
+  .incident_handle_info{
+    padding: 16px;
+    .row{
+      display: flex;
+      gap: 16px;
+      .formItem{
+        flex: 1;
+      }
+    }
+    .upload-icon{
+      font-size: 30px;
+      color: #898989;
+      margin-bottom: 8px;
+    }
+    .ant-upload-text{
+      color: #898989;
+    }
+    .formItem{
+      margin-bottom: 16px;
+      position: relative;
+      display: flex;
+      &.column{
+        flex-direction: column;
+        .name{
+          margin-bottom: 8px;
+        }
+      }
+      .name{
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+        .transport-required{
+          font-size: 10px;
+          margin-right: 2px;
+        }
+      }
+      .value{
+        display: flex;
+        align-items: center;
+        &.upload{
+          flex-direction: column;
+          align-items: flex-start;
+          .tips{
+            color: rgba(0,0,0,0.45);
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,60 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } 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';
+
+@Component({
+  selector: 'app-incident-handle-info',
+  templateUrl: './incident-handle-info.component.html',
+  styleUrls: ['./incident-handle-info.component.less']
+})
+export class IncidentHandleInfoComponent implements OnInit {
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    public tool: ToolService,
+  ) { }
+
+  isLoading = false;
+  formDTO:any =  {};
+
+  ngOnInit() {
+    this.getOrders();
+  }
+  // 关闭弹窗
+  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;
+    // })
+  }
+
+  // 表单提交
+  submitForm(): void {
+    this.confirmModelHs.emit();
+  }
+}
+
+
+
+

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

@@ -0,0 +1,105 @@
+<div class="incident_handle_order" [hidden]="summaryLoading">
+  <!-- 耗材 -->
+  <div class="orderList consumable">
+    <div class="title">耗材清单</div>
+    <ng-container *ngIf="summaryObj.consumableList.length">
+      <div class="orderItem" *ngFor="let item of summaryObj.consumableList">
+        <div class="row">
+          <div class="name">{{ item.consumableName }}<ng-container v-if="item.consumableBrandModel">({{ item.consumableBrandModel }})</ng-container></div>
+          <div class="value">
+            <span class="unitPrice">单价：{{ item.consumableEndPrice }}元</span>
+            <button nz-button class="btn default ml8" (click)="editConsumable(item)">编辑</button>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="name"></div>
+          <div class="value">
+            <div class="num">
+              <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>
+          </div>
+        </div>
+      </div>
+    </ng-container>
+
+
+    <div class="totalPrice">耗材总价：{{summaryObj.consumablePrice}}元</div>
+    <div class="add" (click)="addConsumable()"><i class="icon_transport transport-tag27fuben"></i></div>
+  </div>
+  <!-- 工时 -->
+  <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="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>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="name"></div>
+          <div class="value">
+            <div class="num">
+              <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>
+          </div>
+        </div>
+      </div>
+    </ng-container>
+    <div class="totalPrice">工时总价：{{summaryObj.workHourPrice}}元</div>
+    <div class="add" (click)="addWorkHourManagement()"><i class="icon_transport transport-tag27fuben"></i></div>
+  </div>
+
+  <div class="allTotalPrice">维修单总价：{{summaryObj.totalMaintenancePrice}}元</div>
+</div>
+<nz-spin nzSimple [nzSpinning]="summaryLoading" class="mt8 text_align_center"></nz-spin>
+
+<!-- 新增/编辑耗材模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalConsumable">
+  <div class="modalBody">
+    <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="请选择耗材">
+              <ng-container *ngFor="let option of consumableList">
+                <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>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="consumablesNum">数&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="consumablesNum" 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)="submitConsumableForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideConsumableModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

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

@@ -0,0 +1,338 @@
+@import "../../../../../src/theme.less";
+:host{
+  display: inline-block;
+  width: 100%;
+  color: #333;
+  .incident_handle_order{
+    .orderList{
+      .title{
+        color: @primary-color;
+        padding: 8px 16px;
+        border-bottom: 1px solid #E9E9E9;
+      }
+      .orderItem{
+        padding: 8px 8px 16px 24px;
+        border-bottom: 1px solid #E9E9E9;
+        .row{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-top: 8px;
+          &:first-of-type{
+            margin-top: 0;
+          }
+          .value{
+            display: flex;
+            align-items: center;
+          }
+          .num{
+            width: 162px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          }
+          .btn{
+            min-width: 65px;
+            width: 65px;
+            height: 30px;
+            line-height: 30px;
+          }
+        }
+      }
+
+      .totalPrice{
+        padding: 8px;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+
+      .add{
+        text-align: center;
+        background: #FAFAFA;
+        border: 1px dashed rgba(0,0,0,0.25);
+        cursor: pointer;
+      }
+    }
+
+    .allTotalPrice{
+      font-size: 20px;
+      color: @primary-color;
+      font-weight: bold;
+      padding: 16px;
+      text-align: center;
+    }
+  }
+
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 24px 118px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 206px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .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: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > 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: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,218 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild, ViewEncapsulation } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router } from '@angular/router';
+import { NzMessageService } from 'ng-zorro-antd';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-incident-handle-order',
+  templateUrl: './incident-handle-order.component.html',
+  styleUrls: ['./incident-handle-order.component.less'],
+})
+export class IncidentHandleOrderComponent implements OnInit {
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  hosId:any;
+  changeInpSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'consumable'){
+        this.getConsumableList(v[1]);
+      }
+    });
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getSummaryList();
+    this.getConsumableList();
+  }
+
+  // 新增耗材/工时弹框
+  modelName = ""; //模态框名称
+  modalConsumable: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addConsumable() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalConsumable = true;
+    this.initConsumableForm();
+  }
+  //关闭新增/编辑弹框
+  hideConsumableModal() {
+    this.modalConsumable = false;
+  }
+
+  // 编辑
+  coopData: any = {}; //当前操作列
+  editConsumable(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalConsumable = true;
+    this.initConsumableForm();
+    this.coopData = data;
+    this.validateConsumableForm.controls.orders.setValue(data.orders);
+    this.validateConsumableForm.controls.workdayClassId.setValue(data.workdayClassId);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitConsumableForm(): void {
+    for (const i in this.validateConsumableForm.controls) {
+      this.validateConsumableForm.controls[i].markAsDirty();
+      this.validateConsumableForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateConsumableForm.invalid) {
+      return;
+    }
+    console.log(this.validateConsumableForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        "consumableList": [
+          {
+            "consumablesId": this.validateConsumableForm.value.consumablesId,
+            "consumablesNum": this.validateConsumableForm.value.consumablesNum,
+          }
+        ],
+        "summaryId": this.summaryId,
+      };
+    } 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,
+          }
+        // }
+      };
+    }
+    this.mainService
+      .addSummaryDoc(postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideConsumableModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validateConsumableForm: FormGroup; //新增/编辑表单
+  initConsumableForm() {
+    this.validateConsumableForm = this.fb.group({
+      consumablesId: [null, [Validators.required]],
+      consumablesNum: [1, [Validators.required]],
+    });
+    console.log(this.validateConsumableForm.controls)
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(model, e) {
+    this.isLoading = true;
+    this.changeInpSubject.next([model, e]);
+  }
+
+  // 获取耗材
+  consumableList: any = [];
+  getConsumableList(keyword = '', isShowValue = false) {
+    let postData = {
+      consumable: {
+        name: keyword,
+        hosId: this.hosId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "consumable", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        let consumableList = data.list || [];
+        if(isShowValue && this.coopData && this.coopData.groupId){
+          consumableList = consumableList.filter(v => v.id !== this.coopData.id)
+          consumableList.unshift(this.coopData);
+        }
+        this.consumableList = consumableList;
+      });
+  }
+
+  // 获取汇总单信息
+  summaryObj:any = {
+    consumableList: [],//耗材列表
+    workHourManagementList: [],//工时列表
+  };
+  summaryId = undefined;//汇总单Id
+  summaryLoading:boolean = false;
+  getSummaryList() {
+    this.summaryLoading = true;
+    let postData = {
+      "incidentId": this.id,
+    };
+    this.mainService
+      .querySummaryDocNew(postData)
+      .subscribe((res:any) => {
+        this.summaryLoading = false;
+        if(res.status == 200){
+          this.summaryObj = {...{consumableList:[], workHourManagementList: []}, ...res };
+          console.log(this.summaryObj)
+          this.summaryId = res.summaryId;
+        }else if(res.status == 201){
+          // 事件第一次绑定汇总单
+          this.summaryId = res.summaryId;
+        }else{
+          this.message.error(res.msg || '请求数据失败！');
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getSummaryList();
+  }
+}
+
+
+
+

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

@@ -0,0 +1,91 @@
+<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">
+      <overlay-scrollbars #osComponentRef1 class="detail">
+        <div class="detailItem">
+          <div class="name">申请时间：</div>
+          <div class="value">{{incidentData.startDate | date:'yyyy-MM-dd HH:mm'}}</div>
+        </div>
+        <div class="detailItem">
+          <div class="name">登记时间：</div>
+          <div class="value">{{incidentData.acceptDate | date:'yyyy-MM-dd HH:mm'}}</div>
+        </div>
+        <div class="detailItem">
+          <div class="name">故障描述：</div>
+          <div class="value">{{incidentData.description}}</div>
+        </div>
+        <div class="detailItem">
+          <div class="name">报修科室：</div>
+          <div class="value">{{incidentData.department?.dept}}</div>
+        </div>
+        <div class="detailItem">
+          <div class="name">详细地址：</div>
+          <div class="value">{{ incidentData.place ? incidentData.place.building.buildingName : '' }}{{ incidentData.place ? incidentData.place.floorName : '' }}{{ incidentData.houseNumber }}</div>
+        </div>
+        <div class="detailItem">
+          <div class="name">报修图片：</div>
+          <div class="value thumbs">
+            <div class="thumb" *ngFor="let item of repairImgs;let index = index;" (click)="previewImageHandler(repairImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+          </div>
+        </div>
+        <div class="detailItem">
+          <div class="name">联系人：</div>
+          <div class="value">{{incidentData.contacts}}</div>
+        </div>
+        <div class="detailItem">
+          <div class="name">联系电话：</div>
+          <div class="value">{{incidentData.contactsInformation}}</div>
+        </div>
+        <div class="detailItem">
+          <div class="name">来电电话：</div>
+          <div class="value">{{incidentData.incomingPhone}}</div>
+        </div>
+        <div class="detailItem">
+          <div class="name">电话录音：</div>
+          <div class="value">
+            <audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID">
+              <source [src]="audioSrc">
+            </audio>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <overlay-scrollbars #osComponentRef2 class="workingArea">
+        <div class="tabs">
+          <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
+        </div>
+        <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> -->
+        </ng-container>
+        <ng-container *ngIf="activeTabValue === 2">
+          <app-incident-handle-order [id]="id"></app-incident-handle-order>
+        </ng-container>
+      </overlay-scrollbars>
+      <overlay-scrollbars #osComponentRef3 class="knowage">
+        <div [hidden]="knowageLoading" class="knowageItem" *ngFor="let item of knowageList">
+          <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 class="ml8" nz-button nzType="primary" (click)="showKnowledgeModal(item)">查看</button>
+          </div>
+        </div>
+        <nz-spin nzSimple [nzSpinning]="knowageLoading" class="mt8 text_align_center"></nz-spin>
+      </overlay-scrollbars>
+    </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-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>
+
+<!-- 知识库查看 -->
+<app-knowledge-look (cancelKnowledgeModal)="cancelKnowledgeModal()" *ngIf="isShowKnowledge" [knowledgeData]="coopData"></app-knowledge-look>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -0,0 +1,183 @@
+@import "../../../../../src/theme.less";
+:host{
+  ::ng-deep .os-padding{
+    z-index: auto!important;
+  }
+}
+.coop span {
+  display: inline-block;
+  padding: 0 8px;
+  cursor: pointer;
+  position: relative;
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 8;
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 1320px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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 {
+      height: 655px;
+      min-height: 117px;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      .detail{
+        width: 366px;
+        height: 100%;
+        padding: 16px;
+        border-right: 1px solid #E9E9E9;
+        .detailItem{
+          display: flex;
+          margin-bottom: 16px;
+          .name{
+            width: 5em;
+            flex-shrink: 0;
+          }
+          .value{
+            flex: 1;
+            text-align: justify;
+          }
+          .thumbs{
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+            gap: 8px;
+            .thumb{
+              width: 64px;
+              height: 64px;
+              padding: 4px;
+              border-radius: 4px;
+              border: 1px solid rgba(0,0,0,0.15);
+              img{
+                width: 100%;
+                height: 100%;
+                object-fit: cover;
+                object-position: center;
+                cursor: pointer;
+              }
+            }
+          }
+
+          .audio{
+            width: 264px;
+            height: 1.5em;
+          }
+        }
+      }
+      .workingArea{
+        flex: 1;
+        height: 100%;
+        .tabs{
+          height: 60px;
+          border-bottom: 1px solid #D9D9D9;
+          display: flex;
+          align-items: center;
+          .tab{
+            flex: 1;
+            display: flex;
+            height: 100%;
+            justify-content: center;
+            align-items: center;
+            border-right: 1px solid #D9D9D9;
+            font-size: #333;
+            cursor: pointer;
+            &:last-of-type{
+              border-right: none;
+            }
+            &.active{
+              background-color: #F0F6ED;
+            }
+          }
+        }
+      }
+      .knowage{
+        width: 354px;
+        height: 100%;
+        border-left: 1px solid #E9E9E9;
+        .knowageItem{
+          padding: 16px 16px 0;
+          &:last-of-type{
+            padding-bottom: 16px;
+          }
+        }
+        .knowageTitle{
+          font-size: 16px;
+        }
+        .knowageDescription{
+          font-size: 12px;
+          margin-top: 8px;
+          line-height: 22px;
+          color: #555555;
+        }
+        .knowageBtns{
+          text-align: right;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+}

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

@@ -0,0 +1,234 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router } from '@angular/router';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { forkJoin } from 'rxjs';
+
+@Component({
+  selector: 'app-incident-handle',
+  templateUrl: './incident-handle.component.html',
+  styleUrls: ['./incident-handle.component.less']
+})
+export class IncidentHandleComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef3: 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 message: NzMessageService,
+    private tool: ToolService,
+  ) { }
+
+  isLoading = false;
+  hosId:any;
+
+  tabs:any[] = [
+    { name: '处理信息', value: 1 },
+    // { name: '汇总单', value: 2 },
+  ]
+
+  // 点击tab
+  activeTabValue:any = 1;
+  clickTbab(item){
+    this.activeTabValue = item.value;
+  }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getDetail();
+    this.getHospitalConfig();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+  // 是否进入汇总单
+  get isInSummaryOrder(){
+    return this.incidentData.duty && this.itsmSummarySheet.value == 1 && (this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId());
+  }
+
+  // 获取院区配置信息
+  itsmSummarySheet:any = {};
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
+        if(this.isInSummaryOrder){
+          let summary = this.tabs.some(v => v.value == 2);
+          !summary && this.tabs.push({ name: '汇总单', value: 2 });
+        }
+      });
+  }
+
+  // 获取详情数据
+  incidentData:any = {};
+  maskFlag:any = false;
+  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 || {};
+        this.incidentData.callID && this.getCallrecord();
+        this.incidentData.reqAttachment && this.getRepairImgs();
+
+        this.getDictionaryList();
+      });
+  }
+
+  // 获取通话音频
+  audioSrc =  '';//音频
+  getCallrecord() {
+    let postData = {
+      idx: 0,
+      sum: 1,
+      callrecord: {callAccept: this.incidentData.callID},
+    };
+    this.mainService
+      .getFetchDataList('simple/data', 'callrecord', postData)
+      .subscribe((result) => {
+        if(result.status == 200){
+          result.list = result.list || [];
+          if(result.list.length){
+            this.audioSrc = location.origin + result.list[0].recordingFileName;
+          }else{
+            this.audioSrc = '';
+          }
+        }else{
+          this.message.error(result.msg || '请求数据失败！');
+        }
+      });
+  }
+
+  //获取知识库状态/类型
+  knowageLoading:boolean = false;
+  getDictionaryList() {
+    this.knowageLoading = true;
+    let solutionStatus$ = this.mainService.getDictionary('list', 'solution_status', true);
+    let solutionType$ = this.mainService.getDictionary('list', 'solution_type', true);
+    forkJoin(solutionStatus$, solutionType$).subscribe((data:any[]) => {
+      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);
+      }
+    })
+  }
+
+  // 获取知识库
+  knowageList:any[] =  [];
+  getKnowledgeList(solutionStatus, solutionType) {
+    let postData:any = {
+      idx: 0,
+      sum: 9999,
+      solution: {
+        category: this.incidentData.category,
+				status: solutionStatus,
+				type: solutionType,
+      },
+    };
+
+    this.mainService
+      .getFetchDataList('simple/data', 'solution', postData)
+      .subscribe((result) => {
+        this.knowageLoading = false;
+        if(result.status == 200){
+          this.knowageList = result.list || [];
+        }else{
+          this.message.error(result.msg || '请求数据失败！');
+        }
+      });
+  }
+
+  // 知识库查看-知道了
+  coopData:any = {};
+  isShowKnowledge:boolean = false;
+  showKnowledgeModal(data) {
+    this.coopData = data || {};
+    this.isShowKnowledge = true;
+  }
+
+  cancelKnowledgeModal(flag) {
+    this.isShowKnowledge = false;
+  }
+
+  // 获取报修图片
+  repairImgs:any[] = [];//报修图片
+  getRepairImgs() {
+    this.mainService
+      .getPreviewImage('wechatRequesterIncident', this.id)
+      .subscribe((res:any) => {
+        res.data = res.data || [];
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+        })
+        this.repairImgs = res.data;
+      });
+  }
+
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  initialViewIndex:number = 0;
+  previewImageHandler(data = [], index = 0) {
+    this.initialViewIndex = index;
+    console.log(index)
+    this.isPreview = false;
+    data = data || [];
+    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+    setTimeout(() => {
+      this.isPreview = true;
+    }, 0)
+  }
+
+  // 表单提交
+  submitForm(): void {
+    this.confirmModelHs.emit();
+  }
+}
+
+
+
+

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

@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentHandleComponent } from './incident-handle.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentHandleInfoComponent } from '../incident-handle-info/incident-handle-info.component';
+import { IncidentHandleInfoSimpleComponent } from '../incident-handle-info-simple/incident-handle-info-simple.component';
+import { IncidentHandleOrderComponent } from '../incident-handle-order/incident-handle-order.component';
+import { KnowledgeLookModule } from '../../knowledge-look/knowledge-look.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentHandleComponent,
+    IncidentHandleInfoComponent,
+    IncidentHandleInfoSimpleComponent,
+    IncidentHandleOrderComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    KnowledgeLookModule,
+  ],
+  exports: [
+    IncidentHandleComponent,
+    IncidentHandleInfoComponent,
+    IncidentHandleInfoSimpleComponent,
+    IncidentHandleOrderComponent,
+  ]
+})
+export class IncidentHandleModule { }

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

@@ -0,0 +1,65 @@
+<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)">
+        <ng-container *ngFor="let option of groupList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [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>
+    </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-radio-group formControlName="userGroup" (ngModelChange)="changeUserGroup($event)">
+        <label nz-radio [nzValue]="1">是</label>
+        <label nz-radio [nzValue]="0">否</label>
+      </nz-radio-group>
+    </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="请选择指派对象">
+        <ng-container *ngFor="let option of userList">
+          <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>
+    </nz-form-control>
+  </nz-form-item>
+</form>

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

@@ -0,0 +1,303 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  ::ng-deep .ant-form-item{
+    margin-top: 8px;
+    margin-bottom: 0!important;
+  }
+  ::ng-deep .ant-form-item-label{
+    text-align: left!important;
+  }
+  .addForm{
+    padding: 0 24px 8px;
+  }
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+
+  .hospitalConfig{
+    height: 60px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 72px;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 24px 118px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 206px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .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: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > 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: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,189 @@
+import { Component, OnInit } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { ToolService } from 'src/app/services/tool.service';
+
+@Component({
+  selector: 'app-incident-substitution-assign',
+  templateUrl: './incident-substitution-assign.component.html',
+  styleUrls: ['./incident-substitution-assign.component.less']
+})
+export class IncidentSubstitutionAssignComponent implements OnInit {
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+  ) { }
+
+  changeInpSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'user'){
+        this.getUsers(v[1]);
+      } else if(v[0] === 'group'){
+        this.getGroups(v[1]);
+      }
+    });
+    this.initForm();
+    this.getHospitals(1);
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      hosId: [null, [Validators.required]],//院区
+      dutyId: [null, [Validators.required]],//责任部门
+      userGroup: [0, [Validators.required]],//分配方式
+      userId: [null],//人
+      groupId: [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);
+    this.getUsers();
+  }
+
+  // 选择人|组
+  changeUserGroup(id){
+    this.validateForm.controls.userId.setValue(null);
+    if(id === 1){
+      // 人
+      this.requiredConfigChange('userId', true);
+    }else if(id === 2){
+      // 组
+      this.requiredConfigChange('userId', false);
+    }
+  }
+
+  requiredConfigChange(name: string, required: boolean): void {
+    if (!required) {
+      this.validateForm.get(name)!.clearValidators();
+      this.validateForm.get(name)!.markAsPristine();
+    } else {
+      this.validateForm.get(name)!.setValidators(Validators.required);
+      this.validateForm.get(name)!.markAsDirty();
+    }
+    this.validateForm.get(name)!.updateValueAndValidity();
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(model, e) {
+    this.isLoading = true;
+    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 = [];
+  getUsers(keyword = '') {
+    if(!this.validateForm.value.groupId){
+      this.userList = [];
+      return;
+    }
+    let postData = {
+      user: {
+        hospital: { id: this.validateForm.value.dutyId },
+        name: keyword,
+        simpleQuery: true,
+        groupdata: { id: this.validateForm.value.groupId },
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        let userList = data.list || [];
+        this.userList = userList;
+      });
+  }
+
+  // 获取组
+  groupList: any = []; //所有所属科室(搜索)
+  getGroups(keyword = '') {
+    if(!this.validateForm.value.dutyId){
+      this.groupList = [];
+      return;
+    }
+    let postData = {
+      group2: {
+        groupName: keyword,
+        hospitals: this.validateForm.value.dutyId,
+        type: 1,
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "group2", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        let groupList = data.list || [];
+        this.groupList = groupList;
+      });
+  }
+}
+
+
+
+

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

@@ -0,0 +1,11 @@
+<form nz-form [formGroup]="validateForm" class="addForm">
+  <nz-form-item>
+    <nz-form-label [nzSpan]="6" nzRequired nzFor="reassignRemark">退回原因</nz-form-label>
+    <nz-form-control [nzSpan]="18" nzErrorTip="请输入退回原因!">
+      <nz-input-group>
+        <textarea formControlName="reassignRemark" nz-input rows="3" placeholder="请输入退回原因"></textarea>
+      </nz-input-group>
+    </nz-form-control>
+  </nz-form-item>
+  <div class="tips">注：退回后，由调度台重新指派。</div>
+</form>

src/app/components/incidentManagement/incident-substitutio-reassign/incident-substitution-reassign.component.less

@@ -0,0 +1,309 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  ::ng-deep .ant-form-item{
+    margin-top: 16px;
+    margin-bottom: 0!important;
+  }
+  ::ng-deep .ant-form-item-label{
+    text-align: left!important;
+  }
+  .addForm{
+    padding: 0 24px 16px;
+  }
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+
+  .tips{
+    color: rgba(0,0,0,0.25);
+    text-align: center;
+    margin-top: 8px;
+  }
+
+  .hospitalConfig{
+    height: 60px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 72px;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 24px 118px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 206px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .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: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > 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: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,30 @@
+import { Component, OnInit } from '@angular/core';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-substitution-reassign',
+  templateUrl: './incident-substitution-reassign.component.html',
+  styleUrls: ['./incident-substitution-reassign.component.less']
+})
+export class IncidentSubstitutionReassignComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+  ) { }
+
+  ngOnInit() {
+    this.initForm();
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      reassignRemark: [null, [Validators.required]],//院区
+    });
+    console.log(this.validateForm.controls)
+  }
+}
+
+
+
+

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

@@ -0,0 +1,65 @@
+<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)">
+        <ng-container *ngFor="let option of groupList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [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>
+    </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-radio-group formControlName="userGroup" (ngModelChange)="changeUserGroup($event)">
+        <label nz-radio [nzValue]="1">是</label>
+        <label nz-radio [nzValue]="0">否</label>
+      </nz-radio-group>
+    </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="请选择指派对象">
+        <ng-container *ngFor="let option of userList">
+          <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>
+    </nz-form-control>
+  </nz-form-item>
+</form>

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

@@ -0,0 +1,303 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  ::ng-deep .ant-form-item{
+    margin-top: 8px;
+    margin-bottom: 0!important;
+  }
+  ::ng-deep .ant-form-item-label{
+    text-align: left!important;
+  }
+  .addForm{
+    padding: 0 24px 8px;
+  }
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+
+  .hospitalConfig{
+    height: 60px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 72px;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 24px 118px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 206px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .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: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > 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: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,190 @@
+import { Component, OnInit } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { ToolService } from 'src/app/services/tool.service';
+
+@Component({
+  selector: 'app-incident-substitution-redeploy',
+  templateUrl: './incident-substitution-redeploy.component.html',
+  styleUrls: ['./incident-substitution-redeploy.component.less']
+})
+export class IncidentSubstitutionRedeployComponent implements OnInit {
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+  ) { }
+
+  changeInpSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'user'){
+        this.getUsers(v[1]);
+      } else if(v[0] === 'group'){
+        this.getGroups(v[1]);
+      }
+    });
+    this.initForm();
+    this.getHospitals(1);
+  }
+
+  // 初始化新增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]],//组
+    });
+    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);
+    this.getUsers();
+  }
+
+  // 选择人|组
+  changeUserGroup(id){
+    this.validateForm.controls.userId.setValue(null);
+    this.userList = [];
+    if(id === 1){
+      // 人
+      this.requiredConfigChange('userId', true);
+    }else if(id === 2){
+      // 组
+      this.requiredConfigChange('userId', false);
+    }
+  }
+
+  requiredConfigChange(name: string, required: boolean): void {
+    if (!required) {
+      this.validateForm.get(name)!.clearValidators();
+      this.validateForm.get(name)!.markAsPristine();
+    } else {
+      this.validateForm.get(name)!.setValidators(Validators.required);
+      this.validateForm.get(name)!.markAsDirty();
+    }
+    this.validateForm.get(name)!.updateValueAndValidity();
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(model, e) {
+    this.isLoading = true;
+    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 = [];
+  getUsers(keyword = '') {
+    if((!this.validateForm.value.groupId && this.validateForm.value.userGroup === 1) || this.validateForm.value.userGroup === 0){
+      this.userList = [];
+      return;
+    }
+    let postData = {
+      user: {
+        hospital: { id: this.validateForm.value.dutyId },
+        name: keyword,
+        simpleQuery: true,
+        groupdata: { id: this.validateForm.value.groupId },
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        let userList = data.list || [];
+        this.userList = userList;
+      });
+  }
+
+  // 获取组
+  groupList: any = []; //所有所属科室(搜索)
+  getGroups(keyword = '') {
+    if(!this.validateForm.value.dutyId){
+      this.groupList = [];
+      return;
+    }
+    let postData = {
+      group2: {
+        groupName: keyword,
+        hospitals: this.validateForm.value.dutyId,
+        type: 1,
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "group2", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        let groupList = data.list || [];
+        this.groupList = groupList;
+      });
+  }
+}
+
+
+
+

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

@@ -0,0 +1 @@
+升级

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

@@ -0,0 +1,24 @@
+import { Component, OnInit } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+
+@Component({
+  selector: 'app-incident-substitution-upgrade',
+  templateUrl: './incident-substitution-upgrade.component.html',
+  styleUrls: ['./incident-substitution-upgrade.component.less']
+})
+export class IncidentSubstitutionUpgradeComponent implements OnInit {
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+  ) { }
+
+
+  ngOnInit() {}
+}
+
+
+
+

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

@@ -0,0 +1,31 @@
+<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">
+      <overlay-scrollbars #osComponentRef1 class="workingArea" *ngIf="tabs.length">
+        <div class="tabs">
+          <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>
+        </ng-container>
+        <ng-container *ngIf="activeTabValue === 'assign'">
+          <app-incident-substitution-assign></app-incident-substitution-assign>
+        </ng-container>
+        <ng-container *ngIf="activeTabValue === 'upgrade'">
+          <app-incident-substitution-upgrade></app-incident-substitution-upgrade>
+        </ng-container>
+        <ng-container *ngIf="activeTabValue === 'reassign'">
+          <app-incident-substitution-reassign></app-incident-substitution-reassign>
+        </ng-container>
+      </overlay-scrollbars>
+    </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-substitution/incident-substitution.component.less

@@ -0,0 +1,161 @@
+@import "../../../../../src/theme.less";
+.coop span {
+  display: inline-block;
+  padding: 0 8px;
+  cursor: pointer;
+  position: relative;
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 8;
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 442px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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 {
+      min-height: 117px;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      .detail{
+        width: 366px;
+        height: 100%;
+        padding: 16px;
+        border-right: 1px solid #E9E9E9;
+        .detailItem{
+          display: flex;
+          margin-bottom: 16px;
+          .name{
+            width: 5em;
+            flex-shrink: 0;
+          }
+          .value{
+            flex: 1;
+            text-align: justify;
+          }
+          .thumbs{
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+            gap: 8px;
+            .thumb{
+              width: 64px;
+              height: 64px;
+              padding: 4px;
+              border-radius: 4px;
+              border: 1px solid rgba(0,0,0,0.15);
+              img{
+                max-width: 100%;
+                height: 100%;
+              }
+            }
+          }
+
+          .audio{
+            width: 264px;
+            height: 1.5em;
+          }
+        }
+      }
+      .workingArea{
+        flex: 1;
+        height: 100%;
+        background: #F9FAFB;
+        .tabs{
+          height: 44px;
+          border-bottom: 1px solid #D9D9D9;
+          display: flex;
+          align-items: center;
+          .tab{
+            flex: 1;
+            display: flex;
+            height: 100%;
+            justify-content: center;
+            align-items: center;
+            font-size: #333;
+            cursor: pointer;
+            &.active{
+              color: @primary-color;
+              border-bottom: 2px solid @primary-color;
+            }
+          }
+        }
+      }
+      .knowage{
+        width: 354px;
+        height: 100%;
+        padding: 16px;
+        border-left: 1px solid #E9E9E9;
+        .knowageItem{
+          padding: 16px;
+        }
+        .knowageBtns{
+          text-align: right;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+}

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

@@ -0,0 +1,193 @@
+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 { IncidentSubstitutionRedeployComponent } from '../incident-substitutio-redeploy/incident-substitution-redeploy.component';
+import { IncidentSubstitutionAssignComponent } from '../incident-substitutio-assign/incident-substitution-assign.component';
+import { IncidentSubstitutionUpgradeComponent } from '../incident-substitutio-upgrade/incident-substitution-upgrade.component';
+import { IncidentSubstitutionReassignComponent } from '../incident-substitutio-reassign/incident-substitution-reassign.component';
+
+@Component({
+  selector: 'app-incident-substitution',
+  templateUrl: './incident-substitution.component.html',
+  styleUrls: ['./incident-substitution.component.less']
+})
+export class IncidentSubstitutionComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild(IncidentSubstitutionRedeployComponent, { static: false }) redeploy!: IncidentSubstitutionRedeployComponent;
+  @ViewChild(IncidentSubstitutionAssignComponent, { static: false }) assign!: IncidentSubstitutionAssignComponent;
+  @ViewChild(IncidentSubstitutionUpgradeComponent, { static: false }) upgrade!: IncidentSubstitutionUpgradeComponent;
+  @ViewChild(IncidentSubstitutionReassignComponent, { static: false }) reassign!: IncidentSubstitutionReassignComponent;
+  @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,
+  ) { }
+
+  isLoading = false;
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  tabs:any[] = [
+    // {id: 1, name: '转派', value: 'redeploy', num: ''},
+    // {id: 2, name: '指派', value: 'assign', num: ''},
+    // {id: 3, name: '升级', value: 'upgrade', num: ''},
+    // {id: 4, name: '退回', value: 'reassign', num: ''},
+  ]
+
+  ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    console.log(this.coopBtns)
+    this.operationAuthority();
+  }
+
+  // 点击tab
+  activeTabValue:any;
+  clickTbab(item){
+    this.activeTabValue = item.value;
+  }
+
+  // 操作权限
+  incidentData:any = {};
+  maskFlag:any = false;
+  operationAuthority(){
+    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 || {};
+
+        // 转派
+        if(this.incidentData.state.value == 'handler' && this.incidentData.handlingPersonnelUser && this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId() && !this.coopBtns.assign && this.coopBtns.transfer){
+          this.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
+        }
+
+        // 指派
+        if((this.incidentData.state.value == 'pending' || this.incidentData.state.value == 'handler' || this.incidentData.state.value == 'reassign') && this.coopBtns.assign){
+          let index = this.tabs.findIndex(v => v.value === 'reassign');
+          if(index < 0){
+            this.tabs = [{id: 2, name: '指派', value: 'assign', num: ''}];
+          }else{
+            this.tabs.splice(index, 0, {id: 2, name: '指派', value: 'assign', num: ''});
+          }
+        }
+
+        // 退回
+        if(this.incidentData.state.value == 'pending' || this.incidentData.state.value == 'handler'){
+          if(this.tabs.length){
+            this.tabs.splice(this.tabs.length, 0, {id: 4, name: '退回', value: 'reassign', num: ''});
+          }else{
+            this.tabs = [{id: 4, name: '退回', value: 'reassign', num: ''}];
+          }
+        }
+
+        this.clickTbab(this.tabs[0]);
+      });
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  submitForm(): void {
+    if(this.activeTabValue === 'assign'){
+      // 指派
+      for (const i in this.assign.validateForm.controls) {
+        this.assign.validateForm.controls[i].markAsDirty();
+        this.assign.validateForm.controls[i].updateValueAndValidity();
+      }
+      if (this.assign.validateForm.invalid) {
+        return;
+      }
+
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+
+      let postData = {
+        incident: this.incidentData,
+      }
+
+      if(this.assign.validateForm.value.userId){
+        // 派人
+        postData.incident.assignee = this.assign.validateForm.value.userId;
+      } else {
+        // 派组
+        postData.incident.candidateGroups = this.assign.validateForm.value.groupId;
+      }
+
+      postData.incident.duty = { id: this.assign.validateForm.value.dutyId };
+
+      this.mainService
+      .flowPost("incident/task/assign", 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 === 'reassign'){
+      // 退回
+      for (const i in this.reassign.validateForm.controls) {
+        this.reassign.validateForm.controls[i].markAsDirty();
+        this.reassign.validateForm.controls[i].updateValueAndValidity();
+      }
+      if (this.reassign.validateForm.invalid) {
+        return;
+      }
+
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+
+      let postData = {
+        incident: this.incidentData,
+      }
+
+      postData.incident.reassignRemark = this.reassign.validateForm.value.reassignRemark;
+
+      this.mainService
+      .flowPost("incident/task/reassign", 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-substitution/incident-substitution.module.ts

@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentSubstitutionComponent } from './incident-substitution.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentSubstitutionRedeployComponent } from '../incident-substitutio-redeploy/incident-substitution-redeploy.component';
+import { IncidentSubstitutionAssignComponent } from '../incident-substitutio-assign/incident-substitution-assign.component';
+import { IncidentSubstitutionUpgradeComponent } from '../incident-substitutio-upgrade/incident-substitution-upgrade.component';
+import { IncidentSubstitutionReassignComponent } from '../incident-substitutio-reassign/incident-substitution-reassign.component';
+
+
+@NgModule({
+  declarations: [
+    IncidentSubstitutionComponent,
+    IncidentSubstitutionRedeployComponent,
+    IncidentSubstitutionAssignComponent,
+    IncidentSubstitutionUpgradeComponent,
+    IncidentSubstitutionReassignComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    IncidentSubstitutionComponent,
+  ]
+})
+export class IncidentSubstitutionModule { }

src/app/components/knowledge-look/knowledge-look.component.html

@@ -0,0 +1,73 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">查看</div>
+    <!-- <overlay-scrollbars #osComponentRef1 class="content"> -->
+     <div class="view-box">
+       <div class="view-item left-box">
+         <div class="item-left-list"
+         [ngClass]="{'activeClass': index == vIndex}"
+         *ngFor="let item of detailData let index=index;" (click)="versionsClick(item, index)">V{{item.versionNumber}}</div>
+       </div>
+       <div class="view-item center-box" *ngIf="lookData&&lookData.title">
+         <div class="title">{{lookData.title}}</div>
+         <div class="title-sign">
+           <div class="width-180">知识分类：{{lookData.type.name}}</div>
+           <div>报修可见：{{lookData.repairVisible=='1'?'是':'否'}}</div>
+           <div>版本号：V{{lookData.versionNumber || ''}}</div>
+         </div>
+         <div class="title-sign">
+           <div class="width-180" *ngIf="lookData.type.value=='1'">关联故障：{{lookData.incidentCategory?lookData.incidentCategory.mutiCategory: ''}}</div>
+           <div class="width-180" *ngIf="lookData.type.value=='2'">关联巡检：{{lookData.inspectionForm?lookData.inspectionForm.name: ''}}</div>
+           <div>关联产品：{{lookData.assetProduct?lookData.assetProduct.name:''}}</div>
+         </div>
+         <div class="content-class" *ngIf="richText" [innerHTML]="richText"></div>
+         <div class="file-box" *ngIf="fileData.length>0">
+           <div>附件列表：</div>
+           <div>
+             <div class="file-class" *ngFor="let item of fileData" (click)="fileClick(item)">
+               {{item.name}}
+              <span nz-icon nzType="download" nzTheme="outline" class="download-icon"></span>
+             </div>
+           </div>
+         </div>
+       </div>
+       <div class="view-item right-box" *ngIf="solutionLogs">
+         <nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+          <ng-container *ngFor="let item of solutionLogs; let index = index">
+              <nz-step
+                [nzDescription]="tpl"
+              >
+              </nz-step>
+              <ng-template #tpl>
+                <div *ngIf="index==solutionLogs.length-1" class="step-size">
+                  <div>
+                    <span style="color: #49B856;">{{item.operationStatus.name}}</span>
+                    &nbsp;&nbsp;&nbsp;
+                    <span style="color:#333;">{{item.operationUser.name}}</span>
+                  </div>
+                  <div style="color:#333;">{{ item.time }}</div>
+                  <div class="back-class" nz-tooltip [nzTooltipTitle]="item.rejectedReason" *ngIf="item.operationStatus.value=='3'">(驳回原因)</div>
+                </div>
+                <div *ngIf="index!=solutionLogs.length-1" class="step-size">
+                  <div>
+                    <span>{{item.operationStatus.name}}</span>
+                    &nbsp;&nbsp;&nbsp;
+                    <span>{{item.operationUser.name}}</span>
+                  </div>
+                  <div>{{ item.time }}</div>
+                  <div class="back-class" nz-tooltip [nzTooltipTitle]="item.rejectedReason" *ngIf="item.operationStatus.value=='3'">(驳回原因)</div>
+                </div>
+              </ng-template>
+            </ng-container>
+         </nz-steps>
+       </div>
+     </div>
+    <!-- </overlay-scrollbars> -->
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+    </div>
+    <div class="mask-style" *ngIf="isSpinning">
+      <nz-spin nzSimple class="spin-style"></nz-spin>
+    </div>
+  </div>
+</div>

src/app/components/knowledge-look/knowledge-look.component.less

@@ -0,0 +1,343 @@
+@import "../../../../src/theme.less";
+:host {
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 70%;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+			margin-bottom: 10px;
+      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: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 查看/审核
+  &.add {
+    .modalBody {
+      width: 70%;
+      height: auto;
+				.mask-style{
+					width: 100%;
+					height: 100%;
+					position: fixed;
+					top: 0;
+					left: 0;
+					z-index: 999;
+					display: flex;
+					background: rgba(0,0,0,0.2);
+					align-items: center;
+					justify-content: center;
+				}
+				.spin-style{
+					z-index:9999;
+				}
+			.view-box{
+				height: 400px;
+				display: flex;
+				border: 1px solid #eee;
+				.left-box{
+					flex: 1;
+					font-size: 14px;
+					border-right: 1px solid #E9E9E9;
+					overflow-y: auto;
+					.item-left-list{
+						display: flex;
+						align-items: center;
+						height: 35px;
+						padding-left: 10px;
+						cursor: pointer;
+					}
+				}
+				.center-box{
+					flex: 6;
+					padding: 0 20px 20px 20px;
+					border-right: 1px solid #E9E9E9;
+					height: auto;
+					overflow-y: auto;
+					.title{
+						margin: 10px 0 10px 0;
+						font-weight: bold;
+						font-size: 20px;
+						color: #000000;
+						font-style: normal;
+						text-transform: none;
+					}
+					.title-sign{
+						display: flex;
+						font-weight: 400;
+						font-size: 12px;
+						color: #555555;
+						margin-bottom: 5px;
+						.width-180{
+							width: 160px;
+						}
+						div{
+							margin-right: 60px;
+						}
+					}
+					.content-class{
+						margin-top: 20px;
+					}
+					.file-box{
+						margin-top: 30px;
+						font-size: 14px;
+						.file-class{
+							color: #1890FF;
+							text-decoration: underline;
+							margin-left: 10px;
+							cursor: pointer;
+						}
+						.download-icon{
+							margin-left: 8px;
+						}
+					}
+				}
+				.right-box{
+					flex: 1.6;
+					padding: 10px;
+					font-size: 14px;
+					overflow-y: auto;
+					.back-class{
+						color: red;
+						cursor: pointer;
+					}
+				}
+			}
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+				.ant-select{
+					width: 100%;
+				}
+				.ant-calendar-picker{
+					width: 100% !important;
+				}
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+
+				        td {
+				          border: none;
+
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.activeClass{
+	background: #F0F6ED;
+}
+
+.monad{
+	margin-top: 20px;
+	.monad-list{
+		border: 1px solid #e7e7e7;
+		border-radius: 5px;
+		margin-bottom: 40px;
+		padding: 20px;
+	}
+	.monad-title{
+		text-align: center;
+		font-weight: 700;
+		font-size: 16px;
+	}
+	.monad-sign{
+		display: flex;
+		line-height: 30px;
+		div{
+			margin-right: 15px;
+		}
+	}
+}

src/app/components/knowledge-look/knowledge-look.component.ts

@@ -0,0 +1,118 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
+import { DomSanitizer } from '@angular/platform-browser';
+import { ToolService } from 'src/app/services/tool.service';
+import { format } from 'date-fns';
+
+@Component({
+  selector: 'app-knowledge-look',
+  templateUrl: './knowledge-look.component.html',
+  styleUrls: ['./knowledge-look.component.less']
+})
+export class KnowledgeLookComponent implements OnInit {
+  @Output() cancelKnowledgeModal = new EventEmitter();
+  @Input() knowledgeData: any = {};
+  constructor(
+    private mainService: MainService,
+    private sanitizer: DomSanitizer,
+    private tool: ToolService,
+  ) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getDetail(this.knowledgeData);
+  }
+
+  // 获取知识库详情
+  isSpinning: boolean = false; //页面loading状态
+  vIndex:number = 0;//版本号下标
+  hosId: number;
+  rowId=null;
+  detailData:any;
+  richText:any;
+  lookData:any;
+  solutionLogs:any;
+  stepLength: number = 0; //步骤条
+  getDetail(data){
+    this.rowId = data.id
+		this.vIndex = 0
+    let query = {
+			idx: 0,
+			sum: 9999,
+			solution: {
+				hosId: this.hosId,
+				operationType:'lookOver',
+				solutionNumber:data.solutionNumber
+			}
+		};
+		this.isSpinning = true
+		this.mainService
+			.getFetchDataList("data", "solution", query)
+			.subscribe((res) => {
+				this.getFile()
+				let data = res.list
+				this.detailData = data
+				let content = data[0].content
+				if(content){
+					this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
+				}else{
+					this.richText = ''
+				}
+				for(let i of data){
+					if(i.solutionLogs.length>0){
+						for(let t of i.solutionLogs){
+							t.time = format(t.operationTime, 'yyyy-MM-dd HH:mm')
+						}
+					}
+				}
+				this.lookData = data[0]
+				this.solutionLogs = data[0].solutionLogs
+				this.stepLength = this.solutionLogs.length
+				this.isSpinning = false
+			});
+  }
+
+  fileData: any = []; //上传的附件数据
+  getFile(){
+		this.mainService
+			.getPreviewImage('solution', this.rowId)
+			.subscribe((res:any)=> {
+				this.fileData = res.data.map((v) =>{
+					return{
+						name: v.name,
+						url: location.origin + '/file' + v.relativeFilePath
+					}
+				});
+			});
+	}
+
+  // 版本号点击
+	versionsClick(data, index){
+		this.vIndex = index
+		this.lookData = data
+		let content = data.content
+		if(content){
+			this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
+		}else{
+			this.richText = ''
+		}
+	}
+
+  // 点击附件
+	fileClick(data){
+		console.log(222,data)
+		let a: any = document.createElement('a') // 创建一个元素
+		a.style = 'display: none' // 不能在页面中被看到，把他隐藏起来
+		a.style.height = '0px' // 给个0高度，避免影响页面布局
+		a.download = data.name;
+		a.href = data.url // 文件url地址
+		document.body.appendChild(a)  //  将其绑定在body上才能发挥作用
+		a.click() // 触发a标签的click事件
+		document.body.removeChild(a) // 删除该元素
+	}
+  // 隐藏模态框
+  hideModal() {
+    this.cancelKnowledgeModal.emit(false)
+  }
+}

src/app/components/knowledge-look/knowledge-look.module.ts

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

src/app/pipes/strip-html.pipe..ts

@@ -0,0 +1,15 @@
+import { Pipe, PipeTransform } from "@angular/core";
+
+@Pipe({
+  name: "stripHtml",
+})
+export class StripHtmlPipe implements PipeTransform {
+  transform(value: any, ...args: any[]): any {
+    // 过滤html标签和实体
+    if(value){
+      return value.replace(/<[^>]*>|&[a-z0-9]+;/g, '');
+    }else{
+      return '';
+    }
+  }
+}

src/app/services/main.service.ts

@@ -648,7 +648,7 @@ export class MainService {
       }
     );
   }
-  //获取核酸图片
+  //获取附件-通用
   getPreviewImage(type, id) {
     return this.http.get(host.host + "/common/common/listAttachment/"+ type +"/" + id, {
       headers: this.headers,
@@ -851,11 +851,47 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-	
+
 	// wechat相关-重置token
 	refreshToken(type, data): any {
 	  return this.http.post(host.host + "/wechat/" + type, data, {
 	    headers: this.headers,
 	  });
 	}
+
+  // 故障工单-获取数量
+	getCount(data): any {
+	  return this.http.post(host.host + "/flow/incident/list/count", data, {
+	    headers: this.headers,
+	  });
+	}
+
+  // 故障工单-导出
+	downDataModel(data): any {
+	  return this.http.post(host.host + "/incident/data/downDataModel/incident/3", data, {
+	    headers: this.exportHeader,
+      responseType: "arraybuffer",
+	  });
+	}
+
+  // 故障工单-流程操作
+	flowPost(type, data): any {
+	  return this.http.post(host.host + "/flow/" + type, data, {
+	    headers: this.headers,
+	  });
+	}
+
+  // 查询汇总单
+	querySummaryDocNew(data): any {
+	  return this.http.post(host.host + "/incident/data/querySummaryDoc", data, {
+	    headers: this.headers,
+	  });
+	}
+
+  // 新增汇总单
+	addSummaryDoc(data): any {
+	  return this.http.post(host.host + "/incident/data/addSummaryDoc", data, {
+	    headers: this.headers,
+	  });
+	}
 }

src/app/services/tool.service.ts

@@ -9,6 +9,10 @@ export class ToolService {
   logoTitle = '';
   faviconUrl = '';
 
+  // 附件类型
+  // word，excel，pdf，txt，ppt
+  attachmentsTypes:string = 'text/plain,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/pdf,application/vnd.ms-excel,application/msword,application/vnd.openxmlformats-officedocument.presentationml.presentation';
+
   constructor(private mainService: MainService) {}
 
   // 获取logoUrl和logoTitle
@@ -51,6 +55,34 @@ export class ToolService {
   getCurrentUserDept() {
     return JSON.parse(localStorage.getItem("user")).user.dept;
   }
+  //获取当前用户id
+  getCurrentUserId() {
+    return JSON.parse(localStorage.getItem("user")).user.id;
+  }
+  //返回院区或责任部门
+  getHospitalOrDuty() {
+    let hospital = this.getCurrentHospital();
+    let type = 'hospital';//默认是院区
+    if(hospital.type && hospital.type.value == 6){
+      // 当前是责任部门
+      type = 'duty';
+    }
+
+    if(hospital.type && hospital.type.value != 6){
+      // 当前是普通部门
+      type = 'department';
+    }
+
+    return {
+      hospital,
+      type,
+    }
+  }
+
+  // 返回当前用户的组
+  getCurrentGroupList(){
+    return JSON.parse(localStorage.getItem("user")).user.group || [];
+  }
   //获取当前菜单的权限
   initCoopBtns(route) {
     let link;
@@ -194,8 +226,8 @@ export class ToolService {
         case "handle":
           coopBtns.handle = true; //处理
           break;
-        case "substitution":
-          coopBtns.substitution = true; //换人处理
+        case "assign":
+          coopBtns.assign = true; //指派
           break;
         case "postpone":
           coopBtns.postpone = true; //延期处理
@@ -215,6 +247,12 @@ export class ToolService {
         case "badEvaluate":
           coopBtns.badEvaluate = true; //异常评价
           break;
+        case "receive":
+          coopBtns.receive = true; //接单
+          break;
+        case "transfer":
+          coopBtns.transfer = true; //转派
+          break;
       }
     });
     console.log(coopBtns);

src/app/share/assets-product-management-prompt-modal/assets-product-management-prompt-modal.component.ts

@@ -36,14 +36,15 @@ export class AssetsProductManagementPromptModalComponent implements OnInit {
   // 获取故障现象
   incidentCategoryList:any[] = [];
   getIncidentCategoryList(){
-    if(!this.currentHospital.type || (this.currentHospital.type && this.currentHospital.type.value !== '6')){
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+    if(type === 'hospital' || type === 'department'){
       this.incidentCategoryList = [];
       return;
     };
     let postData = {
       hasThird: 'true',//只差有三级的故障现象列表
       category: {
-        dutyIds: this.currentHospital.type.value === '6' ? this.currentHospital.id.toString()  : undefined,
+        dutyIds: type === 'duty' ? hospital.id.toString()  : undefined,
       },
     };
     this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {

src/app/share/image-viewer/image-viewer.component.html

@@ -1,11 +1,9 @@
 <div class="imgViewHelp">
-  <ul id="ljImgViewerId" #ljImgViewerId class="list">
+  <div id="ljImgViewerId" #ljImgViewerId class="list">
     <img
       class="image"
       [src]="item"
       *ngFor="let item of imageUrl"
-      [width]="width"
-      [height]="height"
     />
-  </ul>
+  </div>
 </div>

src/app/share/image-viewer/image-viewer.component.less

@@ -1,9 +1,5 @@
 .imgViewHelp {
-  ul {
-    margin: 0;
-    padding: 0;
-    img {
-      margin-right: 8px;
-    }
+  img {
+    margin-right: 8px;
   }
 }

src/app/share/image-viewer/image-viewer.component.ts

@@ -9,10 +9,8 @@ export class ImageViewerComponent implements OnInit, AfterViewInit,OnDestroy {
   @ViewChild("ljImgViewerId", { static: false }) ljImgViewer: ElementRef;
   // 图片地址
   @Input() imageUrl: any = [];
-  // 默认预览图大小 (单位px)
-  @Input() width: any = 100;
-  @Input() height: any = 100;
   @Input() isPreviewNow: boolean = false;
+  @Input() initialViewIndex: number = 0;
   viewer = null;
 
   constructor() {}
@@ -22,7 +20,17 @@ export class ImageViewerComponent implements OnInit, AfterViewInit,OnDestroy {
   }
 
   ngAfterViewInit(): void {
+    let _this = this;
     this.viewer = new Viewer(this.ljImgViewer["nativeElement"],{
+      inlineStyle: {
+        width: '100px', // 设置图片宽度
+        height: 'auto', // 设置图片高度，‌这里设置为自动以保持原始比例
+      },
+      viewed() {
+        setTimeout(() => {
+          this.viewer.view(_this.initialViewIndex);
+        }, 0)
+      },
       hide(){
         console.log('隐藏')
         this.viewer && this.viewer.destroy();

src/app/share/share.module.ts

@@ -54,6 +54,7 @@ import { MedicalWasteLogPromptModalComponent } from './medical-waste-log-prompt-
 import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing-record-detail.component';
 import { InspectionExecuteDetailComponent } from './inspection-execute-detail/inspection-execute-detail.component';
 import { wangEditorComponent } from './wang-editor/wang-editor.component';
+import { StripHtmlPipe } from '../pipes/strip-html.pipe.';
 @NgModule({
   declarations: [
     DetailSampleComponent,
@@ -94,6 +95,7 @@ import { wangEditorComponent } from './wang-editor/wang-editor.component';
     CollapseComponent,
     CollapsePanelComponent,
     HtmlTransformPipe,
+    StripHtmlPipe,
     FilterSelfPipe,
     ExcelExportComponent,
     ExcelImportComponent,
@@ -162,6 +164,7 @@ import { wangEditorComponent } from './wang-editor/wang-editor.component';
     CollapseComponent,
     CollapsePanelComponent,
     HtmlTransformPipe,
+    StripHtmlPipe,
     FilterSelfPipe,
     ExcelExportComponent,
     ExcelImportComponent,

src/app/views/assets-consumable/assets-consumable.component.ts

@@ -110,9 +110,10 @@ export class AssetsConsumableComponent implements OnInit {
     this.modal = true;
     this.productDto = {};
     this.initForm();
-    if(this.currentHospital.type && this.currentHospital.type.value === '6'){
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+    if(type === 'duty'){
       this.disableDutyId = true;
-      this.validateForm.controls.dutyId.setValue(this.currentHospital.id);
+      this.validateForm.controls.dutyId.setValue(hospital.id);
     }else{
       this.disableDutyId = false;
     }

src/app/views/assets-info/assets-info.component.ts

@@ -120,9 +120,10 @@ export class AssetsInfoComponent implements OnInit {
     this.add = true; //新增
     this.modal = true;
     this.initForm();
-    if(this.currentHospital.type && this.currentHospital.type.value === '6'){
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+    if(type === 'duty'){
       this.disableDutyId = true;
-      this.validateForm.controls.dutyId.setValue(this.currentHospital.id);
+      this.validateForm.controls.dutyId.setValue(hospital.id);
     }else{
       this.disableDutyId = false;
     }

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

@@ -7,11 +7,11 @@
       <div nz-col nzXl='18' class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">登记时间</span>：
-          <nz-range-picker style="width: 373px;" nzShowTime [(ngModel)]="searchDTO.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
+          <nz-range-picker style="width: 373px;" nzShowTime [(ngModel)]="searchDTO.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
         </div>
         <div class="list-template__searchItem">
           <span class="label">事件单号</span>：
-          <input nz-input class="formItem" placeholder="请输入事件单号" [(ngModel)]="searchDTO.gdcode" />
+          <input nz-input class="formItem" placeholder="请输入事件单号" [(ngModel)]="searchDTO.incidentsign" />
         </div>
         <div class="list-template__searchItem">
           <span class="label">报修科室</span>：
@@ -28,15 +28,15 @@
         <div class="list-template__searchItem">
           <span class="label">状态</span>：
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
-            nzPlaceHolder="请选择状态" [(ngModel)]="gdState">
-            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of gdStates"></nz-option>
+            nzPlaceHolder="请选择状态" [(ngModel)]="searchDTO.statusId">
+            <nz-option [nzLabel]="data.name" [nzValue]="data.id" *ngFor="let data of gdStates"></nz-option>
           </nz-select>
         </div>
         <div class="list-template__searchItem">
           <span class="label">处理人</span>：
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择处理人" [(ngModel)]="worker">
-            <ng-container *ngFor="let option of allWorker">
+            (nzOnSearch)="changeUser($event, 'handle')" nzAllowClear nzPlaceHolder="请选择处理人" [(ngModel)]="searchDTO.todoingUser">
+            <ng-container *ngFor="let option of handleUserList">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
@@ -49,7 +49,7 @@
         <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
         <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
         <button nz-button *ngIf="coopBtns.export" class="btn default ml8" (click)='export()' [nzLoading]="loading2">导出</button>
-        <button nz-button class="btn default ml8" (click)='reset()'>详细搜索</button>
+        <button nz-button class="btn default ml8" (click)='showSearchModal()'>详细搜索</button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -70,17 +70,40 @@
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td class="text_align_left"><span class="red">极高</span> SJ2408030022 2024-08-03 08:45电类-电器插座空开-安装电线线路插座，需要3个插座，联系电话137774177017，周一要开诊</td>
-            <td class="text_align_left">南院区<br>神经内科Ⅰ<br>行政办公楼5楼办公室A</td>
-            <td class="text_align_left">廖小明<br>联电:18711111111<br>来电:18711111111</td>
-            <td>王满<br>水电组<br><span class="red">08-03 08:45</span>前接单</td>
-            <td>次日维修<br>06月28日<br>01时00分前完成</td>
-            <td>已关闭</td>
+            <td class="text_align_left">
+              <span [ngClass]="priorityColor(data.priorityId)">{{ data.priorityDTO?.name }}</span>
+              {{ data.incidentsign }} {{ data.description }}
+              <i class="icon_transport transport-a-11111 ml8" *ngIf="data.reqAttachment"></i>
+              <i class="icon_transport transport-luyin ml8" *ngIf="data.reqRecord"></i>
+            </td>
+            <td class="text_align_left">
+              {{ data.hosName || '无' }}<br>
+              {{ data.department?.dept || '无' }}<br>
+              {{ data.place ? data.place.building.buildingName : '' }}{{ data.place ? data.place.floorName : '' }}{{ data.houseNumber }}
+            </td>
+            <td class="text_align_left">
+              {{ data.requester?.name || '无' }}<br>
+              联电：{{ data.contactsInformation || '无' }}<br>
+              来电：{{ data.incomingPhone || '无' }}
+              <i class="icon_transport transport-luyin ml8" *ngIf="data.callID"></i>
+            </td>
+            <td>
+              {{ data.acceptUser?.name || '无' }}<br>
+              {{ transferSynergetic(data) }}<br>
+              <span [ngStyle]="{ color: 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.del&&data.gdState.value!=6&&data.gdState.value!=7"
-                  (click)="showDelModal($event,data.id)">删除</span>
+                <!-- <span *ngIf="coopBtns.edit" (click)="detail($event,data.id)">编辑</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>
               </div>
             </td>
           </tr>
@@ -93,11 +116,9 @@
       </div>
     </div>
   </div>
-  <!-- 删除模态框 -->
-  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="loading3"
-    (confirmDelEvent)="confirmDel()" content="您确认要删除工单吗？"></app-dialog-delete>
-
 </div>
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo"></app-prompt-modal>
@@ -109,35 +130,54 @@
     <div class="content">
       <form nz-form [formGroup]="validateSearchForm" class="addForm">
         <nz-form-item>
-          <nz-form-label [nzSpan]="5" nzRequired nzFor="name">故障现象</nz-form-label>
+          <nz-form-label [nzSpan]="5" nzFor="levelCategory">故障现象</nz-form-label>
           <nz-form-control [nzSpan]="19" nzErrorTip="请输入故障现象!">
-            <nz-input-group>
-                <input formControlName="name" nz-input placeholder="请输入故障现象">
-            </nz-input-group>
+            <nz-tree-select [nzNodes]="incidentCategoryList" nzPlaceHolder="请选择故障现象" formControlName="levelCategory"></nz-tree-select>
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSpan]="5" nzFor="user">受理人</nz-form-label>
+          <nz-form-label [nzSpan]="5" nzFor="acceptUser">受理人</nz-form-label>
           <nz-form-control [nzSpan]="19" nzErrorTip="请选择受理人!">
             <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择受理人" formControlName="user">
-            <ng-container *ngFor="let option of allWorker">
-              <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>
+            (nzOnSearch)="changeUser($event, 'acceptUser')" nzAllowClear nzPlaceHolder="请选择受理人" formControlName="acceptUser">
+              <ng-container *ngFor="let option of acceptUserList">
+                <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>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzFor="selectType">逾期查询</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择逾期查询!">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+            nzPlaceHolder="请选择逾期查询" formControlName="selectType">
+              <nz-option [nzLabel]="data.name" [nzValue]="data.id" *ngFor="let data of overdueStates"></nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzFor="deleteFlag">是否已删除</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择是否已删除!">
+            <nz-radio-group formControlName="deleteFlag">
+              <label nz-radio [nzValue]="1">是</label>
+              <label nz-radio [nzValue]="0">否</label>
+            </nz-radio-group>
           </nz-form-control>
         </nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">
-      <button nzType="primary" nz-button (click)="submitSearchForm()" [nzLoading]="btnLoading">确认搜索</button>
+      <button nzType="primary" nz-button (click)="submitSearchModal()" [nzLoading]="btnLoading">确认搜索</button>
       <button class="btn cancel" nz-button nzType="default" (click)="hideSearchModal()">取消</button>
     </div>
   </div>
 </div>
 
-<!-- 查看详情 -->
-<router-outlet></router-outlet>
+<!-- 处理 -->
+<app-incident-handle [id]="coopData.id" *ngIf="handleModalShow" (closeModelHs)="closeHandleModelOrder($event)" (confirmModelHs)="confirmHandleModelOrder($event)"></app-incident-handle>
+
+<!-- 换人处理 -->
+<app-incident-substitution [id]="coopData.id" *ngIf="substitutionModalShow" (closeModelHs)="closeSubstitutionModelOrder($event)" (confirmModelHs)="confirmSubstitutionModelOrder($event)"></app-incident-substitution>

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

@@ -1,5 +1,9 @@
 @import "../../../../src/theme.less";
 
+.icon_transport{
+  color: @primary-color;;
+}
+
 .save {
   position: fixed;
   left: 0;
@@ -10,7 +14,7 @@
   z-index: 99;
 
   .modalBody {
-    width: 1000px;
+    width: 424px;
     background: #fff;
     border-radius: 5px;
     padding: 10px 20px;
@@ -89,92 +93,6 @@
   .txtR {
     text-align: right !important;
   }
-}
-//删除
-.saveDel {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.4);
-  z-index: 99;
-
-  .modalBody {
-    width: 350px;
-    height: 220px;
-    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: 310px;
-      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: 18px;
-        }
-
-        &:nth-child(3) {
-          font-size: 14px;
-          color: #666;
-        }
-      }
-    }
-
-    button {
-      margin-top: 10px;
-
-      &.btn {
-        margin-left: 8px;
-      }
-    }
-  }
 
   // 新增
   &.add {
@@ -185,16 +103,50 @@
       .content {
         width: 100%;
         height: auto;
-        padding: 18px 14px 0 14px;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
 
         .addForm {
           .ant-form-item {
-            margin-bottom: 15px;
+            margin-bottom: 0;
 
             .ant-form-item-label {
-              line-height: 0;
               text-align: left;
             }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
           }
         }
 
@@ -203,18 +155,12 @@
             margin-bottom: 15px;
 
             .ant-form-item-label {
-              line-height: 0;
+              line-height: 14px;
               text-align: left;
             }
           }
         }
       }
-
-      button {
-        &:nth-child(1) {
-          margin-right: 20px;
-        }
-      }
     }
   }
 }

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

@@ -6,8 +6,9 @@ import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { format } from 'date-fns';
+import { format, addDays, addHours } from 'date-fns';
 import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+import cloneDeep from 'lodash-es/cloneDeep'
 @Component({
   selector: "app-incident-management",
   templateUrl: "./incident-management.component.html",
@@ -30,9 +31,11 @@ export class IncidentManagementComponent implements OnInit {
   hospital: string; //选中院区
   alldepart: any = []; //当前院区所属科室
   worker: number; //选择执行配送人员
-  allWorker: any = []; //当前院区执行配送人员列表
+  handleUserList: any = []; //处理人列表
+  acceptUserList: any = []; //受理人列表
   gdState: number; //选择工单状态
   gdStates: any; //工单状态列表
+  overdueStates: any; //逾期查询列表
   pageIndex: number = 1; //页码
   listLength: number = 10; //总条数
   pageSize: number = 10; //每页条数
@@ -59,6 +62,7 @@ export class IncidentManagementComponent implements OnInit {
   searchDTO: any = {};
 
   searchTimerSubject = new Subject();
+  debounceSubject = new Subject(); //防抖
 
   // 初始化增删改按钮
   coopBtns: any = {};
@@ -67,17 +71,29 @@ export class IncidentManagementComponent implements OnInit {
   queryTask:string = 'todo';//默认待我接单
   changeTab(key){
     this.queryTask = key;
+    this.loading1 = true;
+    this.debounceSubject.next(true);
   }
 
   ngOnInit() {
+    this.initSearchForm();
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
-      fun.call(this, v[1]);
+      fun.call(this, v[1], v[2]);
+    });
+    this.debounceSubject.pipe(debounceTime(500)).subscribe((v:boolean) => {
+      this.getList(v);
     });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initTabs();
-    this.getAllHos();
+    this.getDeparts();
+    this.getUsers('', null, 'handle');
+    this.getUsers('', null, 'acceptUser');
     this.getGdStates();
+    this.getOverdueStates();
+    this.getIncidentCategoryList();
+    this.loading1 = true;
+    this.debounceSubject.next(true);
   }
 
   // 初始化tab
@@ -93,52 +109,54 @@ export class IncidentManagementComponent implements OnInit {
         let index = this.tabs.findIndex(v => v.key == 'doing');
         this.tabs.splice(index + 1, 0 , {key: 'reassign', value: '重新指派', num: 0});
     }
-    if (this.coopBtns.badEvaluate) {
-        this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0});
-    }
+    // if (this.coopBtns.badEvaluate) {
+    //     this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0});
+    // }
   }
 
   // 搜索
   search() {
-    this.pageIndex = 1;
-    this.getList();
+    this.loading1 = true;
+    this.debounceSubject.next(true);
   }
   // 重置
   reset() {
-    this.pageIndex = 1;
-    if (!(this.coopBtns.currentDept && !this.coopBtns.allOrders)) {
-      this.searchDTO.department = null;
-    }
-    if (!(this.coopBtns.currentUser && !this.coopBtns.allOrders)) {
-      this.worker = null;
-    }
-    this.gdState = null;
     this.searchDTO = {};
-    this.changeDate();
-    this.getList();
+    this.initSearchForm();
+    this.loading1 = true;
+    this.debounceSubject.next(true);
   }
 
-  // 获取院区
-  getAllHos() {
-    this.hospital = this.tool.getCurrentHospital().id + "";
-    this.changeHos();
-  }
-  // 修改院区获取对应科室,工单类型，执行配送人员
-  changeHos() {
-    this.searchDTO.department = null;
-    this.worker = null;
-    this.getDeparts();
-    this.getAllWorker();
+  // 获取故障现象
+  incidentCategoryList:any[] = [];
+  getIncidentCategoryList(){
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+    if(type === 'hospital' || type === 'department'){
+      this.incidentCategoryList = [];
+      return;
+    };
+    let postData = {
+      hasThird: 'true',//只差有三级的故障现象列表
+      category: {
+        dutyIds: type === 'duty' ? hospital.id.toString()  : undefined,
+      },
+    };
+    this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
+      let incidentCategoryList = res.data || [];
+      incidentCategoryList = incidentCategoryList.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, title: v.category, key: v.id}));
+      this.incidentCategoryList = this.tool.tranListToTreeDataLeaf(incidentCategoryList, undefined, "parentId");
+      console.log(this.incidentCategoryList);
+    })
   }
 
-  // 获取配送人员
-  getAllWorker(e?, those?) {
+  // 获取处理人
+  getUsers(e?, those?, type?) {
     let that = those || this;
     let postData = {
       user: {
         name: e || "",
         hospital: { id: that.hospital },
-        usertype: { id: 106 }, //配送人员
+        simpleQuery: true,
       },
       idx: 0,
       sum: 20,
@@ -147,8 +165,12 @@ export class IncidentManagementComponent implements OnInit {
     that.mainService
       .getFetchDataList("data", "user", postData)
       .subscribe((data) => {
-        that.allWorker = data.list;
         that.isLoading = false;
+        if(type === 'handle'){
+          that.handleUserList = data.list;
+        }else if(type === 'acceptUser'){
+          that.acceptUserList = data.list;
+        }
       });
   }
 
@@ -162,61 +184,182 @@ export class IncidentManagementComponent implements OnInit {
       this.searchDTO.dateRange = [dateStart,dateEnd];
     }
   }
+
+  // 优先级颜色
+  priorityColor(priorityId) {
+    // 极低|低
+    if(priorityId == 1 || priorityId == 2){
+      return '';
+    } else if(priorityId == 3){
+      return 'yellow';
+    } else if(priorityId == 4 || priorityId == 5){
+      return 'red';
+    }
+  }
+  // 处理人+协同人
+  transferSynergetic(incidentData){
+    let str = incidentData.groupORHandlerUser || "";
+    if(incidentData.synergetic && incidentData.synergetic.length){
+        str += '，' + incidentData.synergetic.map(v => v.name).join('，');
+    }
+    return str;
+  }
+
+  // 延期记录
+  transferHandlerLog = function (currentLog) {
+    if(!currentLog){
+        return '无';
+    }
+    currentLog = cloneDeep(currentLog);
+    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分前完成");
+        }else{
+          return currentLog.extra1DTO.name+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
+        }
+    }else{
+        return '无';
+    }
+  }
+
+  // 判断当前人是否在工单组里
+  isInGroup(data){
+    return this.tool.getCurrentGroupList().some(v => data.currentLog && v.id == data.currentLog.groupId);
+  }
+
+  // 是否显示接单按钮
+  computedReceive(data){
+    let inUser = data.currentLog && data.currentLog.workerId == this.tool.getCurrentUserId();
+    let inGroup = false;
+    let groupList = this.tool.getCurrentGroupList();
+    groupList.forEach(item => {
+        if(data.currentLog){
+            if (item.id == data.currentLog.groupId) {
+                inGroup = true;
+            }
+        }
+    })
+    return data.state.value === 'pending' && (inUser || inGroup) && this.coopBtns.receive && data.deleteFlag !== 1;
+  }
+
+  // 是否显示处理按钮
+  computedHandle(data){
+    return data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
+  }
+
+  // 是否显示换人处理按钮
+  computedSubstitution(data){
+    return data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign) && data.deleteFlag !== 1;
+  }
+
   // 表格数据
   loading1 = false;
-  getList() {
-    var that = this;
-    let data: any = {
-      idx: that.pageIndex - 1,
-      sum: that.pageSize,
-      workOrder: {
-        worker: { id: that.worker },
-        gdState: { id: that.gdState },
-        gdcode: this.searchDTO.gdcode,
-        createDept: that.searchDTO.department,
-        hosId: that.hospital,
+  getList(isInit = false) {
+    let postData: any = {
+      idx: isInit ? 0 : (this.pageIndex - 1),
+      sum: this.pageSize,
+      incident: {
+        assignee: this.tool.getCurrentUserId(),
+        acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        incidentsign: this.searchDTO.incidentsign,
+        department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
+        statusId: this.searchDTO.statusId || undefined,
+        todoingUser: this.searchDTO.todoingUser ? { id: this.searchDTO.todoingUser } : undefined,
+        levelCategory: this.validateSearchForm.value.levelCategory ? { id: this.validateSearchForm.value.levelCategory } : undefined,
+        acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,
+        selectType: this.validateSearchForm.value.selectType || undefined,
+        deleteFlag: this.validateSearchForm.value.deleteFlag,
       },
     };
 
-    if (!data.workOrder.worker.id) {
-      delete data.workOrder.worker;
-    }
-    if (!data.workOrder.gdState.id) {
-      delete data.workOrder.gdState;
-    }
-    if (
-      data.workOrder.specialCloseFlag === undefined ||
-      data.workOrder.specialCloseFlag === null
-    ) {
-      delete data.workOrder.specialCloseFlag;
-    }
-    if (!data.workOrder.createDept) {
-      delete data.workOrder.createDept;
+    if(this.queryTask === 'all' || this.queryTask === 'callback' || this.queryTask === 'badEvaluate'){
+      let { hospital, type } = this.tool.getHospitalOrDuty();
+      if(type === 'duty'){
+        // 当前的所属责任部门
+        postData.incident.duty = hospital;
+      }else{
+        // 当前的所属院区
+        postData.incident.hosId = hospital.id;
+      }
+    }else{
+        delete postData.incident.duty;
+        delete postData.incident.branch;
     }
-    delete data.workOrder.overdueTime24;
-    delete data.workOrder.startTime1;
-    delete data.workOrder.endTime1;
-    if (false) {
-      data.workOrder.overdueTime24 = true;
-    } else if (that.startDate && that.endDate) {
-      data.workOrder.startTime1 = that.startDate;
-      data.workOrder.endTime1 = that.endDate;
+
+    postData.incident.queryTask = this.queryTask;
+
+    if(this.queryTask === 'todo' || this.queryTask === 'owns'){
+      postData.incident.candidateGroups = this.tool.getCurrentGroupList().map(v => v.id).toString();
+    }else{
+      delete postData.incident.candidateGroups;
     }
-    that.loading1 = true;
-    that.mainService
-      .getFetchDataList("data", "workOrder", data)
+
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "incident", postData)
       .subscribe((result) => {
-        that.loading1 = false;
-        that.listOfData = result.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
-        that.listLength = result.totalNum;
+        this.loading1 = false;
+        this.listOfData = result.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
+        this.listLength = result.totalNum;
       });
+
+    // 获取数量
+    this.getCount(postData.incident);
   }
 
+  // 调用接口-查数量
+  getCount = function (incident = {}){
+    let postData = {
+        incidentList: [],
+    }
+    this.tabs.forEach(v => {
+        postData.incidentList.push({...incident, ...{queryTask: v.key}});
+    })
+    postData.incidentList.forEach(incident => {
+        // 请求参数调整
+        if(!incident){
+            incident = {};
+        }
+        if(this.queryTask === 'all' || this.queryTask === 'callback' || this.queryTask === 'badEvaluate'){
+          let { hospital, type } = this.tool.getHospitalOrDuty();
+          if(type === 'duty'){
+            // 当前的所属责任部门
+            incident.duty = hospital;
+          }else{
+            // 当前的所属院区
+            incident.hosId = hospital.id;
+          }
+        }else{
+            delete incident.duty;
+            delete incident.branch;
+        }
+
+        incident.assignee = this.tool.getCurrentUserId();
+
+        if(this.queryTask === 'todo' || this.queryTask === 'owns'){
+          incident.candidateGroups = this.tool.getCurrentGroupList().map(v => v.id).toString();
+        }else{
+          delete incident.candidateGroups;
+        }
+    })
+    this.mainService
+      .getCount(postData)
+      .subscribe((result) => {
+        let myData = result.data || {};
+        this.tabs.forEach(v => {
+            v.num = myData[v.key];
+        })
+      });
+}
+
   // 获取所有科室
   getDeparts(dept?) {
     let data = {
       department: {
-        cascadeHosId: this.hospital,
+        searchType: 1,// 简单查询
+        cascadeHosId: this.tool.getCurrentHospital().id,
         dept: dept,
       },
       idx: 0,
@@ -228,38 +371,21 @@ export class IncidentManagementComponent implements OnInit {
       .subscribe((data) => {
         this.alldepart = data.list;
         this.isLoading = false;
-        if (dept === undefined && this.coopBtns.currentDept && !this.coopBtns.allOrders) {
-          // 初次渲染，权限有当前科室工单,没有全部工单，则回显申请科室
-          this.alldepart = [this.loginUser.dept];
-          this.searchDTO.department = this.loginUser.dept.id;
-        }
-        if (dept === undefined && this.coopBtns.currentUser && !this.coopBtns.allOrders) {
-          // 初次渲染，权限有当前人员工单,没有全部工单，则回显执行配送人员
-          this.allWorker = [this.loginUser];
-          this.worker = this.loginUser.id;
-        }
-        this.getList();
       });
   }
 
   // 获取工单状态
   getGdStates() {
-    var that = this;
-    that.mainService.getDictionary("list", "gdstate").subscribe((data) => {
-      that.gdStates = data;
+    this.mainService.getDictionary("list", "incident_status").subscribe((data) => {
+      this.gdStates = data || [];
     });
   }
 
-  // 日期选择
-  startDate: string; //发起时间开始
-  endDate: string; //发起时间结束
-  changeDate(result?): void {
-    if (!result) {
-      this.startDate = this.endDate = "";
-      return;
-    }
-    this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-    this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+  // 获取逾期查询
+  getOverdueStates() {
+    this.mainService.getDictionary("list", "overdue_state").subscribe((data) => {
+      this.overdueStates = data || [];
+    });
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
@@ -271,99 +397,114 @@ export class IncidentManagementComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    this.getList();
+    this.loading1 = true;
+    this.debounceSubject.next(false);
   }
 
   // 查看
   detail(e, id) {
     e.stopPropagation();
-    this.router.navigateByUrl("/main/orderManagement/orderDetail/" + id);
   }
 
-  //删除
-  loading3 = false;
   delModal: boolean = false; //删除模态框
-  showDelModal(e, id) {
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    e,
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
     e.stopPropagation();
+    this.confirmDelType = type;
     this.delModal = true;
-    this.coopId = id + "";
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
   }
+  // 隐藏删除框
   hideDelModal() {
     this.delModal = false;
   }
+  // 确认删除
   confirmDel() {
-    this.loading3 = true;
-    this.mainService[this.coopId.includes(",") ? "delOrders" : "delOrder"](
-      this.coopId
-    ).subscribe((data) => {
-      this.loading3 = false;
-      this.delModal = false;
-      if (data.status == 200) {
-        if (
-          this.listOfData.length == 1 &&
-          this.pageIndex == Math.ceil(this.listLength / this.pageSize)
-        ) {
-          this.listLength--;
-          this.pageIndex = Math.ceil(this.listLength / this.pageSize);
-        }
-        this.showPromptModal("删除", true, "");
-      } else {
-        this.showPromptModal("删除", false, data.msg);
-      }
-    });
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "incident", [this.coopData.id])
+        .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 === "receive") {
+      //接单
+      this.mainService
+        .flowPost("incident/task/receive", { incident: this.coopData })
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.state == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
   }
 
   // 导出
   loading2 = false;
   export() {
-    // 有备注，无发起时间则提示
-    if(!this.searchDTO.dateRange.length){
-      this.message.info('请选择发起时间！');
-      return;
-    }
-    // 三个权限都没有，则不展示
-    if(!this.coopBtns.currentDept && !this.coopBtns.currentUser && !this.coopBtns.allOrders){
-      return;
-    }
-    let that = this;
     let postData: any = {
-      idx: that.pageIndex - 1,
-      sum: that.pageSize,
-      workOrder: {
-        worker: { id: that.worker },
-        gdState: { id: that.gdState },
-        gdcode: this.searchDTO.gdcode,
-        createDept: that.searchDTO.department,
-        hosId: that.hospital,
+      idx: 0,
+      sum: 9999,
+      incident: {
+        assignee: this.tool.getCurrentUserId(),
+        duty: this.tool.getCurrentHospital(),
+        acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        incidentsign: this.searchDTO.incidentsign,
+        department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
+        statusId: this.searchDTO.statusId || undefined,
+        todoingUser: this.searchDTO.todoingUser ? { id: this.searchDTO.todoingUser } : undefined,
+        levelCategory: this.validateSearchForm.value.levelCategory ? { id: this.validateSearchForm.value.levelCategory } : undefined,
+        acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,
+        selectType: this.validateSearchForm.value.selectType || undefined,
+        deleteFlag: this.validateSearchForm.value.deleteFlag,
       },
     };
 
-    if (!postData.workOrder.worker.id) {
-      delete postData.workOrder.worker;
-    }
-    if (!postData.workOrder.gdState.id) {
-      delete postData.workOrder.gdState;
-    }
-    if (
-      postData.workOrder.specialCloseFlag === undefined ||
-      postData.workOrder.specialCloseFlag === null
-    ) {
-      delete postData.workOrder.specialCloseFlag;
-    }
-    if (!postData.workOrder.createDept) {
-      delete postData.workOrder.createDept;
+    if(this.queryTask === 'all' || this.queryTask === 'callback' || this.queryTask === 'badEvaluate'){
+      let { hospital, type } = this.tool.getHospitalOrDuty();
+      if(type === 'duty'){
+        // 当前的所属责任部门
+        postData.incident.duty = hospital;
+      }else{
+        // 当前的所属院区
+        postData.incident.hosId = hospital.id;
+      }
+    }else{
+        delete postData.incident.duty;
+        delete postData.incident.branch;
     }
-    delete postData.workOrder.overdueTime24;
-    delete postData.workOrder.startTime1;
-    delete postData.workOrder.endTime1;
-    if (false) {
-      postData.workOrder.overdueTime24 = true;
-    } else if (that.startDate && that.endDate) {
-      postData.workOrder.startTime1 = that.startDate;
-      postData.workOrder.endTime1 = that.endDate;
+
+    postData.incident.queryTask = this.queryTask;
+
+    if(this.queryTask === 'todo' || this.queryTask === 'owns'){
+      postData.incident.candidateGroups = this.tool.getCurrentGroupList().map(v => v.id).toString();
+    }else{
+      delete postData.incident.candidateGroups;
     }
     this.loading2 = true;
-    that.mainService.dataExport("workOrder", postData).subscribe(
+    this.mainService.downDataModel(postData).subscribe(
       (data) => {
         this.loading2 = false;
         this.showPromptModal("导出", true, "");
@@ -375,7 +516,7 @@ export class IncidentManagementComponent implements OnInit {
         var a = document.createElement("a");
         a.href = fileURL;
         a.target = "_blank";
-        a.download = "工单列表.xls";
+        a.download = "故障工单.xls";
         document.body.appendChild(a);
         a.click();
       },
@@ -386,58 +527,102 @@ export class IncidentManagementComponent implements OnInit {
     );
   }
 
-  // 申请科室边输边搜节流阀
+  // 科室边输边搜节流阀
   isLoading = false;
   changeInp(e) {
     this.searchTimer(this.getDeparts, e);
   }
 
-  // 用户输入搜索配送人员
-  changeUser(e) {
-    this.searchTimer(this.getAllWorker, e);
+  // 人员边输边搜节流阀
+  changeUser(e, type) {
+    this.searchTimer(this.getUsers, e, type);
   }
 
   // 边输入边搜索节流阀
-  searchTimer(fun, e) {
+  searchTimer(fun, e, type?) {
     this.isLoading = true;
-    this.searchTimerSubject.next([fun, e]);
-  }
-
-  // 截取意见内容(ie内核截取)
-  spliceContent(con) {
-    if (con.length >= 41 && navigator.userAgent.indexOf("Trident") > -1) {
-      return con.slice(0, 20) + "...";
-    } else {
-      return con;
-    }
+    this.searchTimerSubject.next([fun, e, type]);
   }
 
   // 详细搜索
   searchModal: boolean = false; //新增/编辑模态框
   modelName = ""; //模态框名称
-  add: boolean; //true:新增；false:编辑
   validateSearchForm: FormGroup; //新增/编辑表单
-  coopData: any; //当前操作列
-  // 新增弹框
-  addModal() {
-    this.modelName = "新增";
-    this.add = true; //新增
+  coopData: any = {}; //当前操作列
+  // 显示弹框
+  showSearchModal() {
+    this.modelName = "详细搜索";
     this.searchModal = true;
-    this.initSearchForm();
   }
   //关闭新增/编辑弹框
-  hideAddModal() {
+  hideSearchModal() {
     this.searchModal = false;
-    this.initSearchForm();
+  }
+
+  // 详细搜索-提交
+  submitSearchModal(){
+    this.searchModal = false;
+    this.getList(true);
   }
 
   // 初始化新增form表单
   initSearchForm() {
     this.validateSearchForm = this.fb.group({
-      subType: [null],
-      description: [''],
-      supplierIds: [[]],
-      manufacturerIds: [[]],
+      levelCategory: [null],
+      acceptUser: [null],
+      selectType: [null],
+      deleteFlag: [0],
     });
   }
+
+  // 详细搜索提交
+  submitForm(): void {
+    for (const i in this.validateSearchForm.controls) {
+      this.validateSearchForm.controls[i].markAsDirty();
+      this.validateSearchForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateSearchForm.invalid) {
+      return;
+    }
+
+    console.log(this.validateSearchForm.value)
+    this.loading1 = true;
+    this.debounceSubject.next(true);
+  }
+
+  // 处理-弹窗
+  handleModalShow = false; //弹窗开关
+  handle(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.handleModalShow = true;
+  }
+  // 关闭弹窗
+  closeHandleModelOrder(e) {
+    this.handleModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmHandleModelOrder(e){
+    console.log(e);
+    this.handleModalShow = false;
+    this.getList(true);
+  }
+
+  // 处理-弹窗
+  substitutionModalShow = false; //弹窗开关
+  substitution(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.substitutionModalShow = true;
+  }
+  // 关闭弹窗
+  closeSubstitutionModelOrder(e) {
+    this.substitutionModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmSubstitutionModelOrder(e){
+    console.log(e);
+    this.substitutionModalShow = false;
+    this.getList(true);
+  }
 }

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

@@ -4,16 +4,20 @@ import { CommonModule } from '@angular/common';
 import { IncidentManagementRoutingModule } from './incident-management-routing.module';
 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';
 
 
 @NgModule({
   declarations: [
-    IncidentManagementComponent
+    IncidentManagementComponent,
   ],
   imports: [
     CommonModule,
     IncidentManagementRoutingModule,
-    ShareModule
+    ShareModule,
+    IncidentHandleModule,
+    IncidentSubstitutionModule,
   ]
 })
 export class IncidentManagementModule { }

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

@@ -74,7 +74,7 @@ export class RepositoryManageAddComponent implements OnInit {
   coopId: number; //表格中执行操作的id
   department: number; //所属科室
 	drug: number; //药品名称
-	hosId: number; 
+	hosId: number;
 	rowId:number; //清单id
 	dateRange;//时间
   batchNumber; //批次号
@@ -130,7 +130,7 @@ export class RepositoryManageAddComponent implements OnInit {
 				operationType:'lookOver',
 			}
 		};
-	
+
 		that.mainService
 			.getFetchDataList("data", "solution", query)
 			.subscribe((res) => {
@@ -176,11 +176,11 @@ export class RepositoryManageAddComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal() {
 	  this.delModal = false;
 	}
-	
+
 	// 获取产品
 	getProduct(name){
 		let postData = {
@@ -200,31 +200,32 @@ export class RepositoryManageAddComponent implements OnInit {
 				},500)
 		  });
 	}
-	
+
   // 获取所有院区
   getAllHospital() {
 		this.getPolling()
 		this.getProduct('')
 		this.getMalfunction()
   }
-	
+
 	// 获取故障现象数据
 	getMalfunction(){
-		if(!this.currentHospital.type || (this.currentHospital.type && this.currentHospital.type.value !== '6')){
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+		if(type === 'hospital' || type === 'department'){
 		  this.malfunctionData = [];
 		  return;
 		};
 		let postData = {
 			hasThird: 'true',
 		  category: {
-		    dutyIds: this.currentHospital.type.value === '6' ? this.currentHospital.id.toString()  : undefined,
+		    dutyIds: type === 'duty' ? hospital.id.toString()  : undefined,
 		  },
 		};
 		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
 		  let incidentCategoryList = res.data || [];
 		  incidentCategoryList = incidentCategoryList.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, label: v.category, value: v.id}));
 		  let arr = this.tool.tranListToTreeDataLeaf(incidentCategoryList, undefined, "parentId");
-			
+
 			for(let i of arr){
 				for(let t of i.children){
 					for(let x of t.children){
@@ -235,14 +236,14 @@ export class RepositoryManageAddComponent implements OnInit {
 					}
 				}
 			}
-			
+
 			if(this.detailData && this.detailData.categoryId){
 				// let malfunctionId = this.tool.tranListToTreeDataFindIdsLeaf(this.malfunctionData,this.detailData.categoryId);
 				this.validateForm.controls.malfunction.setValue(this.detailData.categoryId);
 			}
 		})
 	}
-	
+
 	// 获取巡检列表
 	pollingData = [];
 	getPolling(){
@@ -261,7 +262,7 @@ export class RepositoryManageAddComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 获取知识分类字典
 	dicData = [];
 	getDicData(){
@@ -280,7 +281,7 @@ export class RepositoryManageAddComponent implements OnInit {
 			this.typeDic = res
 		});
 	}
-	
+
 	// 选择知识库分类
 	radioChnage(e){
 		let item = this.dicData.find(i=>i.id == this.validateForm.value.knowledgeClass)
@@ -288,18 +289,18 @@ export class RepositoryManageAddComponent implements OnInit {
 			this.classItem = item.value
 		}
 	}
-	
+
 	hideGrantModal(){
 		this.delGrantModal = false;
 	}
-	
-	
+
+
 	// 富文本内容
 	editOrData=null;
 	changeContent(data){
 		this.editOrData = data
 	}
-	
+
 	// 表单提交
 	submitForm(type): void {
 	  var that = this;
@@ -365,7 +366,7 @@ export class RepositoryManageAddComponent implements OnInit {
 		}else{
 			that.btnLoading2 = true;
 		}
-		
+
 	  that.mainService
 	    .simplePost(this.add?"addData":"updData", "solution", data)
 	    .subscribe((res) => {
@@ -394,7 +395,7 @@ export class RepositoryManageAddComponent implements OnInit {
 				}
 	    });
 	}
-	
+
 	// 上传图片
 	uploadFile(id){
 		let url = `/service/common/common/uploadAttachment/solution/${id}/${id}`
@@ -404,18 +405,18 @@ export class RepositoryManageAddComponent implements OnInit {
 			if(!item){
 				formData.append('file', i as any);
 				formData.append('filename', i.name);
-				
+
 				const req = new HttpRequest('POST', url, formData, {
 					reportProgress: false,
 					withCredentials: false
 				});
 				this.http.request(req).subscribe((res) => {
-				    
+
 				});
 			}
 		}
 	}
-	
+
   // 新增弹框
   showModal() {
     this.add = true;
@@ -426,7 +427,7 @@ export class RepositoryManageAddComponent implements OnInit {
 	back(){
 		this.router.navigateByUrl(`/main/repositoryManage`);
 	}
-	
+
   hideModal() {
     this.modal = false;
   }
@@ -444,12 +445,12 @@ export class RepositoryManageAddComponent implements OnInit {
 			malfunction:[null,],
 		});
   }
-	
+
 	beforeUpload = (file: UploadFile) => {
 		let index = file.name.lastIndexOf('.')
 		let type = file.name.slice(index + 1)
 		const isSize = file.size / 1024 / 1024 < 10;
-		const isPic = (type === 'xlsx' || type === 'pdf' || 
+		const isPic = (type === 'xlsx' || type === 'pdf' ||
 		type === 'xls' || type === 'ppt' || type === 'pptx' ||
 		type === 'txt' || type === 'doc' || type === 'docx');
 		if (!isPic) {
@@ -463,7 +464,7 @@ export class RepositoryManageAddComponent implements OnInit {
 		this.fileData = this.fileData.concat(file);
 		return false;
 	};
-	
+
 	// 删除附件
 	removeFile = (file:any) =>  {
 		let item = this.fileAllData.find(i=>i.id == file.uid)
@@ -474,21 +475,21 @@ export class RepositoryManageAddComponent implements OnInit {
 				.subscribe((res:any=[]) => {
 					if (res.status == 200) {
 						this.getFile()
-					} 
+					}
 				});
 		}else{//附件不在数据库
 			if(index!=-1){
 				this.fileData.splice(index, 1)
 			}
 		}
-		
+
 	}
-	
+
 	closeModel(){
 		this.initForm();
 		this.back()
 	}
-	
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {
     this.promptModalShow = false;

src/assets/iconfont/demo_index.html

@@ -55,6 +55,48 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe62a;</span>
+                <div class="name">图片</div>
+                <div class="code-name">&amp;#xe62a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe887;</span>
+                <div class="name">示闲</div>
+                <div class="code-name">&amp;#xe887;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe7bd;</span>
+                <div class="name">示忙</div>
+                <div class="code-name">&amp;#xe7bd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe636;</span>
+                <div class="name">语音播放</div>
+                <div class="code-name">&amp;#xe636;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe89d;</span>
+                <div class="name">来电</div>
+                <div class="code-name">&amp;#xe89d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe679;</span>
+                <div class="name">通话中</div>
+                <div class="code-name">&amp;#xe679;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe623;</span>
+                <div class="name">配送成功</div>
+                <div class="code-name">&amp;#xe623;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe606;</span>
                 <div class="name">星号</div>
                 <div class="code-name">&amp;#xe606;</div>
@@ -822,9 +864,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1722851970750') format('woff2'),
-       url('iconfont.woff?t=1722851970750') format('woff'),
-       url('iconfont.ttf?t=1722851970750') format('truetype');
+  src: url('iconfont.woff2?t=1723428088159') format('woff2'),
+       url('iconfont.woff?t=1723428088159') format('woff'),
+       url('iconfont.ttf?t=1723428088159') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -851,6 +893,69 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-a-11111"></span>
+            <div class="name">
+              图片
+            </div>
+            <div class="code-name">.transport-a-11111
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-shixian"></span>
+            <div class="name">
+              示闲
+            </div>
+            <div class="code-name">.transport-shixian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-shimang1"></span>
+            <div class="name">
+              示忙
+            </div>
+            <div class="code-name">.transport-shimang1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-yuyinbofang"></span>
+            <div class="name">
+              语音播放
+            </div>
+            <div class="code-name">.transport-yuyinbofang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-laidian"></span>
+            <div class="name">
+              来电
+            </div>
+            <div class="code-name">.transport-laidian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-tonghuazhong"></span>
+            <div class="name">
+              通话中
+            </div>
+            <div class="code-name">.transport-tonghuazhong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-peisongchenggong"></span>
+            <div class="name">
+              配送成功
+            </div>
+            <div class="code-name">.transport-peisongchenggong
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-required"></span>
             <div class="name">
               星号
@@ -2004,6 +2109,62 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-a-11111"></use>
+                </svg>
+                <div class="name">图片</div>
+                <div class="code-name">#transport-a-11111</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-shixian"></use>
+                </svg>
+                <div class="name">示闲</div>
+                <div class="code-name">#transport-shixian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-shimang1"></use>
+                </svg>
+                <div class="name">示忙</div>
+                <div class="code-name">#transport-shimang1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-yuyinbofang"></use>
+                </svg>
+                <div class="name">语音播放</div>
+                <div class="code-name">#transport-yuyinbofang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-laidian"></use>
+                </svg>
+                <div class="name">来电</div>
+                <div class="code-name">#transport-laidian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-tonghuazhong"></use>
+                </svg>
+                <div class="name">通话中</div>
+                <div class="code-name">#transport-tonghuazhong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-peisongchenggong"></use>
+                </svg>
+                <div class="name">配送成功</div>
+                <div class="code-name">#transport-peisongchenggong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-required"></use>
                 </svg>
                 <div class="name">星号</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1722851970750') format('woff2'),
-       url('iconfont.woff?t=1722851970750') format('woff'),
-       url('iconfont.ttf?t=1722851970750') format('truetype');
+  src: url('iconfont.woff2?t=1723428088159') format('woff2'),
+       url('iconfont.woff?t=1723428088159') format('woff'),
+       url('iconfont.ttf?t=1723428088159') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,34 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-a-11111:before {
+  content: "\e62a";
+}
+
+.transport-shixian:before {
+  content: "\e887";
+}
+
+.transport-shimang1:before {
+  content: "\e7bd";
+}
+
+.transport-yuyinbofang:before {
+  content: "\e636";
+}
+
+.transport-laidian:before {
+  content: "\e89d";
+}
+
+.transport-tonghuazhong:before {
+  content: "\e679";
+}
+
+.transport-peisongchenggong:before {
+  content: "\e623";
+}
+
 .transport-required:before {
   content: "\e606";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,55 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "39056749",
+      "name": "图片",
+      "font_class": "a-11111",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "37032584",
+      "name": "示闲",
+      "font_class": "shixian",
+      "unicode": "e887",
+      "unicode_decimal": 59527
+    },
+    {
+      "icon_id": "3483956",
+      "name": "示忙",
+      "font_class": "shimang1",
+      "unicode": "e7bd",
+      "unicode_decimal": 59325
+    },
+    {
+      "icon_id": "12025079",
+      "name": "语音播放",
+      "font_class": "yuyinbofang",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
+      "icon_id": "22978012",
+      "name": "来电",
+      "font_class": "laidian",
+      "unicode": "e89d",
+      "unicode_decimal": 59549
+    },
+    {
+      "icon_id": "27189368",
+      "name": "通话中",
+      "font_class": "tonghuazhong",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "17956225",
+      "name": "配送成功",
+      "font_class": "peisongchenggong",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
       "icon_id": "20719696",
       "name": "星号",
       "font_class": "required",

src/common.less

@@ -46,6 +46,9 @@
 .green {
   color: #49b856 !important;
 }
+.yellow {
+  color: #FADB14 !important;
+}
 .text_align_left{
   text-align: left !important;
 }
@@ -301,7 +304,7 @@
       display: flex;
       justify-content: space-between;
       align-items: center;
-      padding: 16px 0 0;
+      padding: 16px 0;
       position: relative;
       overflow: hidden;
       z-index: 2;
@@ -309,8 +312,8 @@
         display: flex;
         align-items: center;
         flex-wrap: wrap;
+        row-gap: 16px;
         .list-template__searchItem {
-          margin-bottom: 16px;
           .label {
             margin-left: 16px;
             color: #333;