调度台列表

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

@@ -0,0 +1,22 @@
+<div class="save display_flex justify-content_flex-center align-items_center add">
+  <div class="modalBody">
+    <div class="title">不受理<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="rejectRemark">不受理原因</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请填写不受理原因!">
+            <textarea rows="4" nz-input formControlName="rejectRemark" placeholder="请填写不受理原因"></textarea>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

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

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

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

@@ -0,0 +1,65 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-reject',
+  templateUrl: './incident-reject.component.html',
+  styleUrls: ['./incident-reject.component.less']
+})
+export class IncidentRejectComponent implements OnInit {
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  isLoading = false;
+
+  ngOnInit() {
+    this.initForm();
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      rejectRemark: [null, [Validators.required]],//不受理原因
+    });
+    console.log(this.validateForm.controls)
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  maskFlag:any = false;
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    this.confirmModelHs.emit(this.validateForm.value.rejectRemark);
+  }
+}
+
+
+
+

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

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

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

@@ -12,7 +12,7 @@
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 8;
+  z-index: 18;
   .ji {
     position: absolute;
     right: 0px;

src/app/services/tool.service.ts

@@ -116,6 +116,14 @@ export class ToolService {
         jurisdiction = e.childrens || []; //匹配路由后，取得对应的权限
       }
     });
+    if(!jurisdiction.length){
+      // type为panel路由
+      menu.forEach(v => {
+        if(v.type === 'panel' && v.link == link && v.childrens){
+          jurisdiction = v.childrens || []; //匹配路由后，取得对应的权限
+        }
+      })
+    }
     jurisdiction.forEach((e) => {
       switch (e.link) {
         case "look":
@@ -265,6 +273,15 @@ export class ToolService {
         case "visit":
           coopBtns.visit = true; //回访
           break;
+        case "continue":
+            coopBtns.continue = true; //继续建单
+            break;
+        case "generate":
+          coopBtns.generate = true; //生成
+          break;
+        case "reject":
+          coopBtns.reject = true; //不受理
+          break;
       }
     });
     console.log(coopBtns);

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

@@ -239,7 +239,7 @@
                   <!-- 加急单 -->
                   <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
                 </div>
-                <div class="right_bots display_flex col-flex align-items_center justify-content_space-around">
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
                   <input type="button" *ngIf="data.data.gdState.value == 2" class="top_bot" value="派单" (click)="allotWorker(data.data.id, data.data.gdState.id)" />
                   <input type="button" *ngIf="!data.data.worker && data.data.gdState.value != 2" class="top_bot" value="派单" (click)="allotWorker(data.data.id, data.data.gdState.id, 1)" />
                   <input type="button" *ngIf="data.data.gdState.value == 2 || ((data.data.gdState.value == 3 || data.data.gdState.value == 4) && data.data.worker)" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'hsms')" />
@@ -291,14 +291,14 @@
                     </span>
                   </div>
                 </div>
-                <div class="right_bots display_flex col-flex align-items_center justify-content_space-around">
-                  <input type="button" *ngIf="data.data.state.value == 'accept'" class="top_bot" value="生成" (click)="generateOrder(data.data)" />
-                  <input type="button" *ngIf="data.data.state.value == 'accept'" class="top_bot" value="不受理" (click)="generateOrder(data.data)" />
-                  <input type="button" *ngIf="data.data.state.value == 'storage'" class="top_bot" value="继续建单" (click)="generateOrder(data.data)" />
-                  <input type="button" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                  <input type="button" *ngIf="coopBtns.generate && data.data.state.value == 'accept'" class="top_bot" value="生成" (click)="generateOrder(data.data)" />
+                  <input type="button" *ngIf="coopBtns.reject && data.data.state.value == 'accept'" class="top_bot" value="不受理" (click)="rejectFn(data.data)" />
+                  <input type="button" *ngIf="coopBtns.continue && data.data.state.value == 'storage'" class="top_bot" value="继续建单" (click)="storageSj(data.data)" />
+                  <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
                 </div>
-                <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
-                <div *ngIf="data.data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
+                <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
+                <div *ngIf="data.data.overtimePercent > 100" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
               </ng-container>
             </div>
           </ng-container>
@@ -350,28 +350,16 @@
         </overlay-scrollbars>
       </div>
     </div>
-    <!-- 待到达 -->
+    <!-- 待到达/待接单 -->
     <div class="lists">
       <div class="head">
-        <span class="auto_tit">待到达({{ arriveList.length }}条)</span>
-        <span class="toLastTime"
-          >刷新倒计时<span class="time">{{ orderRefreshTime }}s</span></span
-        >
+        <span class="auto_tit"><span *ngIf="flagList.hsmsFlag2">待到达</span><span *ngIf="flagList.itsmFlag2 && flagList.hsmsFlag2">/</span><span *ngIf="flagList.itsmFlag2">待接单</span>({{ arriveList.length }}条)</span>
+        <span class="toLastTime"><span class="itsmOrHsms" [ngClass]="{bold: flagList.itsmFlag2}" *ngIf="itsmData.mdv2Switch" (click)="filterOrderList('itsm', 2)">运维</span><span class="itsmOrHsms" *ngIf="itsmData.mdv2Switch && hsmsData.hsmsSwitch">|</span><span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag2}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 2)">配送</span><span class="time">{{ orderRefreshTime }}s</span></span>
       </div>
-      <div class="searchBox">
-        <label
-          nz-checkbox
-          [(ngModel)]="allArriveList"
-          (ngModelChange)="changeAllArriveList($event)"
-          >全选</label
-        >
+      <div class="searchBox" *ngIf="!flagList.itsmFlag2 && flagList.hsmsFlag2">
+        <label nz-checkbox [(ngModel)]="allArriveList" (ngModelChange)="changeAllArriveList($event)">全选</label>
         <div class="search wp60">
-          <input
-            class="wp75"
-            type="text"
-            placeholder="请输入关键字"
-            [(ngModel)]="arriveSearchCon"
-          />
+          <input class="wp75" type="text" placeholder="请输入关键字" [(ngModel)]="arriveSearchCon" />
           <div class="magnifier wp20" (click)="searchArrive()">
             <i class="icon_transport transport-sousuo"></i>
             <span>搜索</span>
@@ -386,296 +374,150 @@
           批量撤回
         </button>
       </div>
-      <div
-        class="cots_body daidaoda"
-        *ngIf="txtLabelCol == 1"
-        [ngClass]="{ top185: hurseInfoHiding != '1' }"
-      >
+      <div class="cots_body daidaoda" *ngIf="(txtLabelCol == 1 && hsmsData.hsmsSwitch && !itsmData.mdv2Switch) || itsmData.mdv2Switch" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag2 }">
         <overlay-scrollbars #osComponentRef3 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="arriveList.length && !loading2">
             <div class="list listsTypeColor" *ngFor="let data of arriveList">
-              <div class="left_cots">
-                <!-- 工单 -->
-                <div
-                  class="gongdan"
-                  (click)="batchWithdrawalSelect(!data.checked, data.id)"
-                >
-                  <span class="left mr8"
-                    ><label
-                      nz-checkbox
-                      [ngModel]="data.checked"
-                      (ngModelChange)="batchWithdrawalSelect($event, data.id)"
-                    ></label
-                  ></span>
-                  <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'">
-                    {{ data.isHalfInspect === 1 ? "半程陪检" : data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})
-                  </span>
-                  <div class="right_all">
-                    <span nz-tooltip [nzTooltipTitle]="data.worker ? data.worker.phone : ''" class="right_all_name">{{ data.worker ? data.worker.name : "" }}</span>
-                    <span class="right">
-                      <span [ngClass]="{ colorRed: data.timeOut == true }">{{ data.gdState.name }}</span>
+              <!-- 配送 -->
+              <ng-container *ngIf="data.type === 'hsms'">
+                <div class="left_cots">
+                  <!-- 工单 -->
+                  <div class="gongdan" (click)="batchWithdrawalSelect(!data.data.checked, data.data.id)">
+                    <span class="left mr8">
+                      <label nz-checkbox [ngModel]="data.data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
+                    </span>
+                    <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
+                      {{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                    </span>
+                    <div class="right_all">
+                      <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
+                      <span class="right">
+                        <span [ngClass]="{ colorRed: data.data.timeOut == true }">{{ data.gdState.name }}</span>
+                      </span>
+                    </div>
+                  </div>
+                  <!-- 地点 -->
+                  <div class="didian" (click)="openDetails(data.data)">
+                    <span class="left" *ngIf="data.data.taskType.associationType && data.data.taskType.associationType.value == 'inspect'">
+                      {{ data.data.startDept ? data.data.startDept.dept : "" }}
+                      <span *ngFor="let item of data.data.middleDept">
+                        ->{{ item.dept }}
+                      </span>
+                    </span>
+                    <span class="left" *ngIf="data.data.taskType.associationType && data.data.taskType.associationType.id != 260">
+                      {{ data.data.startDept ? data.data.startDept.dept : "" }}{{ data.data.endDepts ? " -> " + data.data.endDepts[0].dept : "" }}
+                    </span>
+                    <span class="right" *ngIf="data.data.goods">
+                      <i class="icon_transport transport-icon3"></i>
+                      <span>{{ data.data.goods }}</span>
+                    </span>
+                    <span class="right" *ngIf="data.data.workOrderRemark" [title]="data.data.workOrderRemark">
+                      <i class="icon_transport transport-icon3"></i>
+                      <span>{{ data.data.workOrderRemark }}</span>
                     </span>
                   </div>
+                  <!-- 时间 -->
+                  <div class="shijian" (click)="openDetails(data.data)">
+                    <span class="left" *ngIf="data.data.expectTimeNum && data.data.timeOut != true">
+                      <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
+                      <ng-container *ngIf="(data.data.taskType.associationType.value == 'patientTransport' || data.data.taskType.associationType.value == 'inspect') && data.data.patient?.illnessState">
+                        <i *ngIf="data.data.patient.illnessState.value === '2'" class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
+                        <i *ngIf="data.data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong" nz-tooltip nzTooltipTitle="病重"></i>
+                      </ng-container>
+                      <ng-container *ngIf="(data.data.taskType.associationType.value == 'patientTransport' || data.data.taskType.associationType.value == 'inspect') && data.data.patient?.careLevel">
+                        <i *ngIf="data.data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
+                        <i *ngIf="data.data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid" nz-tooltip nzTooltipTitle="一级护理"></i>
+                        <i *ngIf="data.data.patient.careLevel.value === '2'" class="icon_transport transport-2_round_solid" nz-tooltip nzTooltipTitle="二级护理"></i>
+                        <i *ngIf="data.data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid" nz-tooltip nzTooltipTitle="三级护理"></i>
+                      </ng-container>
+                      <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.data.taskType.associationType.value == 'patientTransport' || data.data.taskType.associationType.value == 'inspect'">{{ data.data.patient.patientName }}<span *ngIf="data.data.patient.residenceNo">（{{ data.data.patient.residenceNo }}）</span></span>
+                    </span>
+                    <span class="left" *ngIf="data.data.timeOutLength && data.data.timeOut == true">
+                      <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
+                      <ng-container *ngIf="(data.data.taskType.associationType.value == 'patientTransport' || data.data.taskType.associationType.value == 'inspect') && data.data.patient?.illnessState">
+                        <i *ngIf="data.data.patient.illnessState.value === '2'" class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
+                        <i *ngIf="data.data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong" nz-tooltip nzTooltipTitle="病重"></i>
+                      </ng-container>
+                      <ng-container *ngIf="(data.data.taskType.associationType.value == 'patientTransport' || data.data.taskType.associationType.value == 'inspect') && data.data.patient?.careLevel">
+                        <i *ngIf="data.data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
+                        <i *ngIf="data.data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid" nz-tooltip nzTooltipTitle="一级护理"></i>
+                        <i *ngIf="data.data.patient.careLevel.value === '2'" class="icon_transport transport-2_round_solid" nz-tooltip nzTooltipTitle="二级护理"></i>
+                        <i *ngIf="data.data.patient.careLevel.value === '3'" class="icon_transport transport-3_round_solid" nz-tooltip nzTooltipTitle="三级护理"></i>
+                      </ng-container>
+                      <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.data.taskType.associationType.value == 'patientTransport' || data.data.taskType.associationType.value == 'inspect'">{{ data.data.patient.patientName }}<span *ngIf="data.data.patient.residenceNo">（{{ data.data.patient.residenceNo }}）</span></span>
+                    </span>
+                    <span class="right" nz-tooltip [nzTooltipTitle]="'总时长' + formatTime(data.data.expectTimeNum / 1000)">
+                      {{ data.data.showCreateTime }}
+                    </span>
+                  </div>
+                  <!-- 急单 -->
+                  <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 300" src="../../assets/images/icon_ji.png" alt="" class="ji" />
+                  <!-- 加急单 -->
+                  <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
                 </div>
-                <!-- 地点 -->
-                <div
-                  class="didian"
-                  (click)="
-                    openDetails(data)
-                  "
-                >
-                  <span
-                    class="left"
-                    *ngIf="
-                      data.taskType.associationType &&
-                      data.taskType.associationType.value == 'inspect'
-                    "
-                  >
-                    {{ data.startDept ? data.startDept.dept : "" }}
-                    <span *ngFor="let item of data.middleDept">
-                      ->{{ item.dept }}
+                <div class="right_bots display_flex col-flex align-items_center justify-content_space-around">
+                  <input type="button" *ngIf="data.data.gdState.value == 2" class="top_bot" value="派单" (click)="allotWorker(data.data.id, data.data.gdState.id)" />
+                  <input type="button" *ngIf="data.data.gdState.value == 3 || data.data.gdState.value == 4" class="mid_bot" value="撤回" (click)="openRecallModal(data.data.id)" />
+                  <input type="button" *ngIf="data.data.gdState.value == 2 || data.data.gdState.value == 3 || data.data.gdState.value == 4" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'hsms')" />
+                </div>
+                <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
+                <div *ngIf="data.data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
+              </ng-container>
+              <!-- 运维 -->
+              <ng-container *ngIf="data.type === 'mdv2'">
+                <div class="left_cots">
+                  <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id)">
+                    <span class="left gongdan_name">
+                      <span [ngClass]="priorityColor(data.priorityId)">{{ data.data.priorityDTO?.name }}</span>{{ data.data.incidentsign }} <span nz-tooltip [nzTooltipTitle]="data.data.hosName + data.data.department?.dept">{{ data.data.hosName }}{{ data.data.department?.dept }}</span>
                     </span>
-                  </span>
-                  <span
-                    class="left"
-                    *ngIf="
-                      data.taskType.associationType &&
-                      data.taskType.associationType.id != 260
-                    "
-                  >
-                    {{ data.startDept ? data.startDept.dept : ""
-                    }}{{ data.endDepts ? " -> " + data.endDepts[0].dept : "" }}
-                  </span>
-                  <span class="right" *ngIf="data.goods">
-                    <i class="icon_transport transport-icon3"></i>
-                    <span>{{ data.goods }}</span>
-                  </span>
-                  <span class="right" *ngIf="data.workOrderRemark" [title]="data.workOrderRemark">
-                    <i class="icon_transport transport-icon3"></i>
-                    <span>{{ data.workOrderRemark }}</span>
-                  </span>
+                    <div class="right_all">
+                      <span class="right">
+                        <span>{{ data.data.state.name }}</span>
+                      </span>
+                    </div>
+                  </div>
+
+                  <div class="didian" (click)="openItsmDetails(data.data)">
+                    <span class="left">
+                      <span nz-tooltip [nzTooltipTitle]="data.data.description">{{ data.data.description }}</span>
+                    </span>
+                  </div>
+
+                  <div class="didian" (click)="openItsmDetails(data.data)">
+                    <span class="left">
+                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName : '' }}{{ data.data.houseNumber }}</span>
+                      <i class="icon_transport transport-a-11111 ml8" *ngIf="data.data.reqAttachment"></i>
+                    </span>
+                  </div>
+
+                  <div class="didian" (click)="openItsmDetails(data.data)" *ngIf="transferHandlerLog(data.data.currentLog)">
+                    <span class="left">
+                      <span [innerHTML]="transferHandlerLog(data.data.currentLog)" nz-tooltip [nzTooltipTitle]="transferHandlerLog(data.data.currentLog)"></span>
+                    </span>
+                  </div>
+                  <!-- 时间 -->
+                  <div class="shijian" (click)="openItsmDetails(data.data)">
+                    <span class="left">
+                      <span>
+                        申请人：{{ data.data.requester?.name }}
+                      </span>
+                    </span>
+                    <span class="right">
+                      {{ data.data.startDate | date: 'yyyy-MM-dd HH:mm'}}
+                    </span>
+                  </div>
                 </div>
-                <!-- 时间 -->
-                <div
-                  class="shijian"
-                  (click)="
-                    openDetails(data)
-                  "
-                >
-                  <span
-                    class="left"
-                    *ngIf="data.expectTimeNum && data.timeOut != true"
-                  >
-                    <i
-                      class="icon_transport transport-shouye10"
-                      nz-tooltip
-                      nzTooltipTitle="进行中"
-                    ></i>
-                    <ng-container
-                      *ngIf="
-                        (data.taskType.associationType.value ==
-                          'patientTransport' ||
-                          data.taskType.associationType.value == 'inspect') &&
-                        data.patient?.illnessState
-                      "
-                    >
-                      <i
-                        *ngIf="data.patient.illnessState.value === '2'"
-                        class="colorRed icon_transport transport-tubiao_wei"
-                        nz-tooltip
-                        nzTooltipTitle="病危"
-                      ></i>
-                      <i
-                        *ngIf="data.patient.illnessState.value === '3'"
-                        class="colorRed icon_transport transport-zhong"
-                        nz-tooltip
-                        nzTooltipTitle="病重"
-                      ></i>
-                    </ng-container>
-                    <ng-container
-                      *ngIf="
-                        (data.taskType.associationType.value ==
-                          'patientTransport' ||
-                          data.taskType.associationType.value == 'inspect') &&
-                        data.patient?.careLevel
-                      "
-                    >
-                      <i
-                        *ngIf="data.patient.careLevel.value === '0'"
-                        class="icon_transport transport-te1"
-                        nz-tooltip
-                        nzTooltipTitle="特级护理"
-                      ></i>
-                      <i
-                        *ngIf="data.patient.careLevel.value === '1'"
-                        class="icon_transport transport-1_round_solid"
-                        nz-tooltip
-                        nzTooltipTitle="一级护理"
-                      ></i>
-                      <i
-                        *ngIf="data.patient.careLevel.value === '2'"
-                        class="icon_transport transport-2_round_solid"
-                        nz-tooltip
-                        nzTooltipTitle="二级护理"
-                      ></i>
-                      <i
-                        *ngIf="data.patient.careLevel.value === '3'"
-                        class="icon_transport transport-3_round_solid"
-                        nz-tooltip
-                        nzTooltipTitle="三级护理"
-                      ></i>
-                    </ng-container>
-                    <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
-                    <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
-                  </span>
-                  <span
-                    class="left"
-                    *ngIf="data.timeOutLength && data.timeOut == true"
-                  >
-                    <i
-                      class="colorRed icon_transport transport-daojishi"
-                      nz-tooltip
-                      nzTooltipTitle="超时"
-                    ></i>
-                    <ng-container
-                      *ngIf="
-                        (data.taskType.associationType.value ==
-                          'patientTransport' ||
-                          data.taskType.associationType.value == 'inspect') &&
-                        data.patient?.illnessState
-                      "
-                    >
-                      <i
-                        *ngIf="data.patient.illnessState.value === '2'"
-                        class="colorRed icon_transport transport-tubiao_wei"
-                        nz-tooltip
-                        nzTooltipTitle="病危"
-                      ></i>
-                      <i
-                        *ngIf="data.patient.illnessState.value === '3'"
-                        class="colorRed icon_transport transport-zhong"
-                        nz-tooltip
-                        nzTooltipTitle="病重"
-                      ></i>
-                    </ng-container>
-                    <ng-container
-                      *ngIf="
-                        (data.taskType.associationType.value ==
-                          'patientTransport' ||
-                          data.taskType.associationType.value == 'inspect') &&
-                        data.patient?.careLevel
-                      "
-                    >
-                      <i
-                        *ngIf="data.patient.careLevel.value === '0'"
-                        class="icon_transport transport-te1"
-                        nz-tooltip
-                        nzTooltipTitle="特级护理"
-                      ></i>
-                      <i
-                        *ngIf="data.patient.careLevel.value === '1'"
-                        class="icon_transport transport-1_round_solid"
-                        nz-tooltip
-                        nzTooltipTitle="一级护理"
-                      ></i>
-                      <i
-                        *ngIf="data.patient.careLevel.value === '2'"
-                        class="icon_transport transport-2_round_solid"
-                        nz-tooltip
-                        nzTooltipTitle="二级护理"
-                      ></i>
-                      <i
-                        *ngIf="data.patient.careLevel.value === '3'"
-                        class="icon_transport transport-3_round_solid"
-                        nz-tooltip
-                        nzTooltipTitle="三级护理"
-                      ></i>
-                    </ng-container>
-                    <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
-                    <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
-                  </span>
-                  <span
-                    class="right"
-                    nz-tooltip
-                    [nzTooltipTitle]="
-                      '总时长' + formatTime(data.expectTimeNum / 1000)
-                    "
-                  >
-                    {{ data.showCreateTime }}
-                  </span>
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                  <input type="button" *ngIf="computedSubstitution(data.data)" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
+                  <input type="button" *ngIf="computedReceive(data.data)" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗？','接单','receive')" />
+                  <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
                 </div>
-                <!-- 急单 -->
-                <img
-                  *ngIf="data.emergencyType && data.emergencyType.id == 300"
-                  src="../../assets/images/icon_ji.png"
-                  alt=""
-                  class="ji"
-                />
-                <!-- 加急单 -->
-                <img
-                  *ngIf="data.emergencyType && data.emergencyType.id == 301"
-                  src="../../assets/images/icon_jiaji.png"
-                  alt=""
-                  class="ji"
-                />
-              </div>
-              <div
-                class="
-                  right_bots
-                  display_flex
-                  col-flex
-                  align-items_center
-                  justify-content_space-around
-                "
-              >
-                <input
-                  type="button"
-                  *ngIf="data.gdState.value == 2"
-                  class="top_bot"
-                  value="派单"
-                  (click)="allotWorker(data.id, data.gdState.id)"
-                />
-                <input
-                  type="button"
-                  *ngIf="data.gdState.value == 3 || data.gdState.value == 4"
-                  class="mid_bot"
-                  value="撤回"
-                  (click)="openRecallModal(data.id)"
-                />
-                <input
-                  type="button"
-                  *ngIf="
-                    data.gdState.value == 2 ||
-                    data.gdState.value == 3 ||
-                    data.gdState.value == 4
-                  "
-                  class="btm_bot"
-                  value="删除"
-                  (click)="openDelModal(data.id, 'hsms')"
-                />
-              </div>
-              <div
-                *ngIf="data.timeOut != true"
-                class="slider sgreen"
-                [ngStyle]="{ width: data.percent + '%' }"
-              ></div>
-              <div
-                *ngIf="data.timeOut == true"
-                class="slider sred"
-                [ngStyle]="{ width: '100%' }"
-              ></div>
+                <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
+                <div *ngIf="data.data.overtimePercent > 100" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
+              </ng-container>
             </div>
           </ng-container>
-          <div
-            class="
-              loading
-              display_flex
-              col-flex
-              justify-content_flex-center
-              align-items_center
-            "
-            *ngIf="loading2"
-          >
+          <div class="loading display_flex col-flex justify-content_flex-center align-items_center"  *ngIf="loading2">
             <img src="../../assets/images/loading.gif" alt="" />
           </div>
           <div class="no_data" *ngIf="arriveList.length == 0 && !loading2">
@@ -1693,7 +1535,7 @@
           </div>
           <div class="newTopItem">
             <span class="grayFont">申请人：</span>
-            <ng-container *ngIf="buildType === '微信转事件'">{{incidentMsg.requesterName}}</ng-container>
+            <ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
             <ng-container *ngIf="!buildType">
               <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear>
                 <ng-container *ngFor="let option of applicationRequesterList">
@@ -2600,7 +2442,7 @@
                     <!-- 加急单 -->
                     <img *ngIf="data.emergencyType && data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
                   </div>
-                  <div class="right_bots display_flex col-flex align-items_center justify-content_space-around">
+                  <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
                     <input type="button" *ngIf="data.gdState.value == 2" class="top_bot" value="派单" (click)="allotWorker(data.id, data.gdState.id)" />
                     <input type="button" *ngIf="data.gdState.value == 3 || data.gdState.value == 4" class="mid_bot" value="撤回" (click)="openRecallModal(data.id)" />
                     <input type="button" *ngIf="data.gdState.value == 2 || data.gdState.value == 3 || data.gdState.value == 4" class="btm_bot" value="删除" (click)="openDelModal(data.id, 'hsms')" />
@@ -2763,13 +2605,16 @@
           </button>
         </ng-container>
         <ng-container *ngIf="currentTabIndex === '99999'">
-          <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '微信转事件'">是否连续建单</label>
+          <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件'">是否连续建单</label>
           <button nz-button class="btn" nzType="primary" (click)="directOrder()">
             直接解决
           </button>
-          <button nz-button class="btn" nzType="primary" (click)="assignOrder()" [nzLoading]="isItsmSubmitLoading">
+          <button nz-button class="btn" nzType="primary" (click)="assignOrder()">
             建单并派单
           </button>
+          <button nz-button class="btn" nzType="primary" (click)="temporaryStorage()">
+            暂存
+          </button>
         </ng-container>
         <button class="btn cancel" nz-button nzType="default" (click)="newOrderCancel()">
           取消
@@ -2902,3 +2747,9 @@
 
 <!-- 图片预览 -->
 <app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>
+
+<!-- 不受理 -->
+<app-incident-reject [id]="coopData.id" *ngIf="rejectModalShow" (closeModelHs)="closeRejectModelOrder($event)" (confirmModelHs)="confirmRejectModelOrder($event)"></app-incident-reject>
+
+<!-- 换人处理 -->
+<app-incident-substitution [id]="coopData.id" *ngIf="substitutionModalShow" (closeModelHs)="closeSubstitutionModelOrder($event)" (confirmModelHs)="confirmSubstitutionModelOrder($event)"></app-incident-substitution>

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

@@ -6,7 +6,7 @@ import {
   ElementRef,
 } from "@angular/core";
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-import { Router } from "@angular/router";
+import { Router, ActivatedRoute } from "@angular/router";
 
 import { MainService } from "../../services/main.service";
 import { WebsocketPhoneService } from "../../services/websocket-phone.service";
@@ -139,6 +139,7 @@ export class FuwutaiComponent implements OnInit {
     private sers: WebsocketSerService,
     private tool: ToolService,
     private http: HttpClient,
+    public route: ActivatedRoute,
   ) {}
   validateFormZy!: FormGroup;
   validateFormQt!: FormGroup;
@@ -193,6 +194,9 @@ export class FuwutaiComponent implements OnInit {
   incidentModel:any = {};
   incidentMsg:any = {};
 
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
   // 获取院区配置配置，是否核酸打印
   isShowNucleicAcidPrinting = false;
   getHospitalConfigList(key) {
@@ -669,6 +673,7 @@ export class FuwutaiComponent implements OnInit {
       });
   }
   ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       v[1] !== '' && this.searchApplicationDepartment(v[0], v[1]);
@@ -1324,13 +1329,25 @@ export class FuwutaiComponent implements OnInit {
     // 运维
     if(this.flagList['itsmFlag' + stateId]){
       postData.incidentQuery = {
-        incident: {
-          "queryTask": "storageAccept",
-          "assignee": this.tool.getCurrentUserId(),
-        },
         idx: 0,
         sum: 1,
       }
+      if(stateId == 1){
+        postData.incidentQuery.incident = {
+          "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          "urgentType": +this.itsmData.orderScopeRadio + 1,
+          "queryTask": "storageAccept",
+          "assignee": this.tool.getCurrentUserId(),
+        }
+      }else if(stateId == 2){
+        postData.incidentQuery.incident = {
+          "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          "urgentType": +this.itsmData.orderScopeRadio + 1,
+          "queryTask": "todoReassign",
+        }
+      }else if(stateId == 3){
+        return;
+      }
     }
 
     console.log(postData);
@@ -1359,7 +1376,7 @@ export class FuwutaiComponent implements OnInit {
           this.loading1 = false;
         } else if (stateId == 2) {
           // 待到达
-          this.arriveList = data.list || [];
+          this.arriveList = data.data || [];
           this.arriveList.forEach((item) => {
             item.checked = false;
           });
@@ -1941,7 +1958,7 @@ export class FuwutaiComponent implements OnInit {
     this.incidentModel.department = undefined;
     this.searchApplicationDepartment('itsm');
 
-    if(this.buildType !== '微信转事件'){
+    if(this.buildType !== '报修转事件'){
       this.incidentModel.requester = undefined;
     }
     this.applicationRequesterList = [];
@@ -2116,7 +2133,7 @@ export class FuwutaiComponent implements OnInit {
     this.incidentModel = {...this.incidentModel, ...incidentModel};
 
     let category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
-    let postData = {
+    let postData:any = {
       solutionId: this.solutionId,
       "incident": {
         "id": this.incidentModel.id || undefined,
@@ -2148,6 +2165,9 @@ export class FuwutaiComponent implements OnInit {
     };
 
     if(this.buildType){
+      if(this.buildType === '报修转事件'){
+        postData.incident.fromWx = true;
+      }
       Object.assign(postData.incident, this.editOrder);
     }
 
@@ -2166,7 +2186,7 @@ export class FuwutaiComponent implements OnInit {
             })
           }
           this.directOrderModalShow = false;
-          this.msg.success('直接解决成功');
+          // this.msg.success('直接解决成功');
           this.isBuildOrderAgaginFn();
         } else {
           this.msg.error('直接解决失败');
@@ -2427,7 +2447,7 @@ export class FuwutaiComponent implements OnInit {
   }
   // 修改关联查
   changeApplyRelatedDepartment(e){
-    if(this.buildType !== '微信转事件'){
+    if(this.buildType !== '报修转事件'){
       this.incidentModel.requester = undefined;
     }
     this.searchApplicationRequester();
@@ -2584,7 +2604,7 @@ export class FuwutaiComponent implements OnInit {
     }
 
     // 刷新申请人列表
-    if(this.buildType !== '微信转事件'){
+    if(this.buildType !== '报修转事件'){
       this.incidentModel.requester = undefined;
     }
     this.searchApplicationRequester();
@@ -2774,7 +2794,7 @@ export class FuwutaiComponent implements OnInit {
       nzDuration: 0,
     }).messageId;
 
-    let postData = {
+    let postData:any = {
       solutionId: this.solutionId,
       "incident": {
         "id": this.incidentModel.id || undefined,
@@ -2802,6 +2822,9 @@ export class FuwutaiComponent implements OnInit {
       }
     };
     if(this.buildType){
+      if(this.buildType === '报修转事件'){
+        postData.incident.fromWx = true;
+      }
       Object.assign(postData.incident, this.editOrder);
     }
     console.log(postData);
@@ -2821,7 +2844,7 @@ export class FuwutaiComponent implements OnInit {
               await this.uploadImages(file, result.data.id);
             })
           }
-          this.msg.success('建单并派单成功');
+          // this.msg.success('建单并派单成功');
           this.isBuildOrderAgaginFn();
         } else {
           this.msg.error('建单并派单失败');
@@ -2829,6 +2852,75 @@ export class FuwutaiComponent implements OnInit {
       });
   }
 
+  // 运维-暂存
+  temporaryStorage(){
+    this.maskFlag = this.msg.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let category;
+    if(this.incidentModel.category){
+      category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
+    }
+
+    let postData:any = {
+      solutionId: this.solutionId,
+      "incident": {
+        "id": this.incidentModel.id || undefined,
+        "deleteFlag": 0,
+        "duty": this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
+        "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
+        "contactsInformation": this.incidentModel.contactsInformation,
+        "contacts": this.incidentModel.contacts,
+        "hosId": this.incidentModel.hosId || undefined,
+        "area": this.incidentModel.area ? { id: this.incidentModel.area } : undefined,
+        "place": this.incidentModel.place ? { id: this.incidentModel.place } : undefined,
+        "houseNumber": this.incidentModel.houseNumber,
+        "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
+        "priorityId": this.incidentModel.priorityId || undefined,
+        "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
+        "title": category ? category.mutiCategory : '',
+        "description": this.incidentModel.description,
+        "yyTime": this.incidentModel.yyTime ? format(this.incidentModel.yyTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
+        "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "acceptUser": { id: this.tool.getCurrentUserId() },
+        "callID": this.incidentModel.callID || undefined,
+        "incomingPhone": this.incidentModel.incomingPhone || undefined,
+        "candidateGroups": this.incidentModel.group || undefined,
+        "assignee": this.incidentModel.user || undefined,
+      }
+    };
+    if(this.buildType){
+      if(this.buildType === '报修转事件'){
+        postData.incident.fromWx = true;
+      }
+      Object.assign(postData.incident, this.editOrder);
+    }
+    console.log(postData);
+    // return;
+
+    this.mainService
+      .flowPost("incident/task/storage", postData)
+      .subscribe((result) => {
+        this.msg.remove(this.maskFlag);
+        this.maskFlag = false;
+
+        if (result.state == 200) {
+          // 图片上传
+          if(this.fileList.length){
+            console.log(this.fileList.map(v => v.originFileObj));
+            this.fileList.map(v => v.originFileObj).forEach(async file => {
+              await this.uploadImages(file, result.data.id);
+            })
+          }
+          // this.msg.success('暂存成功');
+          this.isBuildOrderAgaginFn();
+        } else {
+          this.msg.error('暂存失败');
+        }
+      });
+  }
+
   // 是否连续建单
   isBuildOrderAgaginFn(){
     if(this.isBuildOrderAgagin){
@@ -2836,10 +2928,10 @@ export class FuwutaiComponent implements OnInit {
       this.incidentModel.category = undefined;
       this.incidentModel.user = undefined;
       this.incidentModel.group = undefined;
-      this.showPromptModal("建单", true, "", "");
+      this.showPromptModal("操作", true, "", "");
     }else{
       this.newOrderShow = false; //关闭弹窗
-      this.showPromptModal("建单", true, "", "");
+      this.showPromptModal("操作", true, "", "");
     }
   }
 
@@ -3625,7 +3717,12 @@ export class FuwutaiComponent implements OnInit {
     this.promptInfo = promptInfo;
     this.back = back || "";
     setTimeout(() => {
-      this.getUnassignedBuilding2();
+      this.showPromptModalRefresh();
+    }, 100);
+  }
+
+  showPromptModalRefresh(){
+    this.getUnassignedBuilding2();
       this.resetList();
       this.getOrderList(1);
       this.getOrderList(2);
@@ -3642,7 +3739,6 @@ export class FuwutaiComponent implements OnInit {
       this.promptModalShow = true;
       this.fixedTab = "";
       this.fixedMenuShangla();
-    }, 100);
   }
 
   // 格式化时分秒
@@ -3799,7 +3895,34 @@ export class FuwutaiComponent implements OnInit {
     this.incidentMsg = incidentMsg;
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)
-    this.showNewOrder('', '', true, '微信转事件');
+    this.showNewOrder('', '', true, '报修转事件');
+
+    // 查询报修图片
+    this.getRepairImgs(data.id);
+  }
+
+  // 继续建单
+  storageSj(data){
+    this.editOrder = cloneDeep(data);
+    let incidentModel = cloneDeep(data);
+    let incidentMsg:any = {};
+    console.log('data:', data)
+    // incidentModel.department && (this.applicationDeptList = [cloneDeep(incidentModel.department)]);
+    incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
+    incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
+    incidentModel.department && (incidentModel.department = incidentModel.department.id);
+    incidentModel.requester && (this.applicationRequesterList = [cloneDeep(incidentModel.requester)]);
+    incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
+    incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
+    incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    incidentModel.source && (incidentModel.source = incidentModel.source.id);
+    incidentModel.area && (incidentModel.area = incidentModel.area.id);
+    incidentModel.place && (incidentModel.place = incidentModel.place.id);
+    this.incidentModel = incidentModel;
+    this.incidentMsg = incidentMsg;
+    console.log('this.applicationDeptList:', this.applicationDeptList)
+    console.log('incidentModel:', incidentModel)
+    this.showNewOrder('', '', true, '继续建单');
 
     // 查询报修图片
     this.getRepairImgs(data.id);
@@ -3834,4 +3957,81 @@ export class FuwutaiComponent implements OnInit {
       this.isPreview = true;
     }, 0)
   }
+
+  // 不受理-弹窗
+  rejectModalShow = false; //弹窗开关
+  rejectFn(data) {
+    this.coopData = data;
+    this.rejectModalShow = true;
+  }
+  // 关闭弹窗
+  closeRejectModelOrder(e) {
+    this.rejectModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmRejectModelOrder(rejectRemark){
+    this.maskFlag = this.msg.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData = {
+      incident: {
+        ...this.coopData,
+        rejectRemark,
+      },
+    }
+
+    console.log(postData);
+    // return;
+    this.mainService
+    .flowPost("incident/task/reject", postData)
+    .subscribe((result) => {
+      this.msg.remove(this.maskFlag);
+      this.maskFlag = false;
+
+      if (result.state == 200) {
+        this.rejectModalShow = false;
+        this.showPromptModal("不受理", true, "", "");
+      } else {
+        this.msg.error('不受理失败');
+      }
+    });
+  }
+
+  // 换人处理-弹窗
+  substitutionModalShow = false; //弹窗开关
+  substitution(data) {
+    this.coopData = data;
+    this.substitutionModalShow = true;
+  }
+  // 关闭弹窗
+  closeSubstitutionModelOrder(e) {
+    this.substitutionModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmSubstitutionModelOrder(e){
+    console.log(e);
+    this.substitutionModalShow = false;
+    this.showPromptModalRefresh();
+  }
+
+  // 是否显示接单按钮
+  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;
+  }
+
+  // 是否显示换人处理按钮
+  computedSubstitution(data){
+    return (data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign)) && data.deleteFlag !== 1;
+  }
 }

src/app/views/fuwutai/fuwutai.module.ts

@@ -10,6 +10,8 @@ import { OrderScopeModule } from 'src/app/components/order-scope/order-scope.mod
 import { IncidentDicrectOrderModule } from 'src/app/components/incidentManagement/incident-direct-order/incident-direct-order.module';
 import { KnowledgeLookModule } from 'src/app/components/knowledge-look/knowledge-look.module';
 import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
+import { IncidentRejectModule } from 'src/app/components/incidentManagement/incident-reject/incident-reject.module';
+import { IncidentSubstitutionModule } from 'src/app/components/incidentManagement/incident-substitution/incident-substitution.module';
 
 
 @NgModule({
@@ -25,6 +27,8 @@ import { IncidentDetailModule } from 'src/app/components/incidentManagement/inci
     IncidentDicrectOrderModule,
     KnowledgeLookModule,
     IncidentDetailModule,
+    IncidentRejectModule,
+    IncidentSubstitutionModule,
   ]
 })
 export class FuwutaiModule { }

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

@@ -250,7 +250,7 @@ export class IncidentManagementComponent implements OnInit {
 
   // 是否显示换人处理按钮
   computedSubstitution(data){
-    return data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign) && data.deleteFlag !== 1;
+    return (data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign)) && data.deleteFlag !== 1;
   }
 
   // 是否显示延期处理按钮
@@ -690,7 +690,7 @@ export class IncidentManagementComponent implements OnInit {
     this.getList(true);
   }
 
-  // 处理-弹窗
+  // 换人处理-弹窗
   substitutionModalShow = false; //弹窗开关
   substitution(e, data) {
     e.stopPropagation();

src/common.less

@@ -19,6 +19,9 @@
 .ml16 {
   margin-left: 16px !important;
 }
+.gap8{
+  gap: 8px !important;
+}
 .line_height_normal{
   line-height: normal !important;
 }