调度台工单

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

@@ -228,11 +228,6 @@ export class IncidentDetailComponent implements OnInit {
     return this.incidentData.synergetic && this.incidentData.synergetic.length ? this.incidentData.synergetic.map(v => v.name).join('，') : '';
   }
 
-  // 是否进入汇总单
-  isInSummaryOrder(){
-    return this.incidentData.duty && this.itsmSummarySheet.value == 1 && (this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId());
-  }
-
   // 获取院区配置信息
   itsmSummarySheet:any = {};//是否需要填写汇总单
   getHospitalConfig() {
@@ -250,12 +245,10 @@ export class IncidentDetailComponent implements OnInit {
         let list = result.list || [];
         this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
         console.log(this.itsmSummarySheet)
-        if(this.isInSummaryOrder()){
-          // 维修汇总单
-          if(this.incidentData.state.value == 'close' && this.incidentData.summaryId){
-            let flag = this.tabs.some(v => v.value === 4);
-            !flag && this.tabs.splice(2, 0, {name: '汇总单', value: 4});
-          }
+        // 维修汇总单
+        if(this.incidentData.state.value == 'close' && this.itsmSummarySheet.value == 1 && this.incidentData.summaryId){
+          let flag = this.tabs.some(v => v.value === 4);
+          !flag && this.tabs.splice(2, 0, {name: '汇总单', value: 4});
         }
       });
   }

src/app/services/main.service.ts

@@ -1000,4 +1000,10 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+  // 调度台头部运维分组
+	incidentUserTaskCount(data) {
+	  return this.http.post(host.host + `/incident/incidentUserTaskCount`,data, {
+	    headers: this.headers,
+	  });
+	}
 }

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

@@ -3,35 +3,18 @@
     <!-- 头部Tab -->
     <div class="tabBox">
       <div class="tab" #tabs>
-        <div
-          class="tab_inner"
-          [style.transform]="'translateX(' + disXHead + 'px)'"
-        >
-          <div
-            [ngClass]="{ tabItem: true, checked: typeId == -1 }"
-            (click)="checkTab(-1)"
-          >
+        <div class="tab_inner" [style.transform]="'translateX(' + disXHead + 'px)'">
+          <!-- <div [ngClass]="{ tabItem: true, checked: typeId == -1 }" (click)="checkTab(-1)">
             全部
-          </div>
-          <div
-            [ngClass]="{ tabItem: true, checked: typeId == item.id }"
-            *ngFor="let item of scopeGroups"
-            (click)="checkTab(item.id)"
-            [title]="item.groupName"
-          >
+          </div> -->
+          <div [ngClass]="{ tabItem: true, checked: typeId == item.id }" *ngFor="let item of scopeGroups" (click)="checkTab(item.id)" [title]="item.groupName">
             {{ item.groupName }}
           </div>
         </div>
       </div>
       <div class="tabBox__operate">
-        <i
-          class="tabBox__Icon--right icon_transport transport-xiangzuo"
-          (click)="headToLeft()"
-        ></i>
-        <i
-          class="tabBox__Icon--left icon_transport transport-xiangzuo"
-          (click)="headToRight()"
-        ></i>
+        <i class="tabBox__Icon--right icon_transport transport-xiangzuo" (click)="headToLeft()"></i>
+        <i class="tabBox__Icon--left icon_transport transport-xiangzuo" (click)="headToRight()"></i>
       </div>
       <div class="timer">{{ workerRefreshTime }}s</div>
     </div>
@@ -39,88 +22,56 @@
     <div class="message_cot">
       <!-- 配送人员信息 -->
       <div class="cot_hid" [style.height]="cotHeight + 'px'">
-        <div id="cotAll" class="cot_all" *ngIf="patientCareCol != 6">
-          <div
-            [ngClass]="{
-              cot: true,
-              fourCol: patientCareCol == 4,
-              sevenCol: patientCareCol == 7
-            }"
-            *ngFor="let data of workerMessage"
-          >
-            <div class="first">
-              <span nz-tooltip [nzTooltipTitle]="data.phone">{{
-                data.name
-              }}</span>
-              <span>累计{{ data.totalCount }}单</span>
-              <span
-                class="times imptime"
-                *ngIf="
-                  data.freetime === '今日还未接单' || data.freetime === null
-                "
-                >{{ data.freetime }}</span
-              >
-              <span
-                class="times imptime imptime-green"
-                *ngIf="
-                  data.freetime !== '今日还未接单' && data.freetime !== null
-                "
-                >{{ "空闲时间" + data.freetime }}</span
-              >
+        <ng-container *ngIf="!wLoading && (typeData.type === 1 || typeData.type === 2)">
+          <div id="cotAll" class="cot_all" *ngIf="patientCareCol != 6">
+            <div [ngClass]="{cot: true, fourCol: patientCareCol == 4, sevenCol: patientCareCol == 7}" *ngFor="let data of workerMessage">
+              <div class="first" *ngIf="data">
+                <span nz-tooltip [nzTooltipTitle]="data.phone">{{ data.name }}</span>
+                <span>累计{{ data.totalCount }}单</span>
+                <span class="times imptime" *ngIf="data.freetime === '今日还未接单' || data.freetime === null">{{ data.freetime }}</span>
+                <span class="times imptime imptime-green" *ngIf="data.freetime !== '今日还未接单' && data.freetime !== null">{{ "空闲时间" + data.freetime }}</span>
+              </div>
+              <div class="second" *ngIf="data">
+                <span *ngIf="data.workingFlag == true">{{ data.gdType }}</span>
+                <span [ngClass]="{ fr: true, colorRed: data.timeOut == true }" *ngIf="data.workingFlag == true">{{ data.gdState }}</span>
+              </div>
             </div>
-            <div class="second">
-              <span *ngIf="data.workingFlag == true">{{ data.gdType }}</span>
-              <span
-                [ngClass]="{ fr: true, colorRed: data.timeOut == true }"
-                *ngIf="data.workingFlag == true"
-                >{{ data.gdState }}</span
-              >
+          </div>
+          <div id="cotAll" nz-row *ngIf="patientCareCol == 6">
+            <div nz-col nzSpan="4" class="cot col-6" *ngFor="let data of workerMessage">
+              <div class="first" *ngIf="data">
+                <span nz-tooltip [nzTooltipTitle]="data.phone">{{ data.name }}</span>
+                <span class="times imptime" *ngIf="data.freetime === '今日还未接单' || data.freetime === null">{{ data.freetime }}</span>
+                <span class="times imptime imptime-green" *ngIf="data.freetime !== '今日还未接单' && data.freetime !== null">{{ "空闲时间" + data.freetime }}</span>
+              </div>
             </div>
           </div>
-        </div>
-        <div id="cotAll" nz-row *ngIf="patientCareCol == 6">
-          <div
-            nz-col
-            nzSpan="4"
-            class="cot col-6"
-            *ngFor="let data of workerMessage"
-          >
-            <div class="first">
-              <span nz-tooltip [nzTooltipTitle]="data.phone">{{
-                data.name
-              }}</span>
-              <span
-                class="times imptime"
-                *ngIf="
-                  data.freetime === '今日还未接单' || data.freetime === null
-                "
-                >{{ data.freetime }}</span
-              >
-              <span
-                class="times imptime imptime-green"
-                *ngIf="
-                  data.freetime !== '今日还未接单' && data.freetime !== null
-                "
-                >{{ "空闲时间" + data.freetime }}</span
-              >
+        </ng-container>
+        <ng-container *ngIf="!wLoading && typeData.type === 3">
+          <div id="cotAll" class="cot_all">
+            <div [ngClass]="{cot: true, sevenCol: true}" *ngFor="let data of workerMessage">
+              <div class="first" *ngIf="data">
+                <span nz-tooltip [nzTooltipTitle]="data[2]">{{ data[1] }}</span>
+                <span class="fr">今日完成：{{ data[3][2] }}</span>
+              </div>
+              <div class="first" *ngIf="data">
+                <span>待接单：{{ data[3][0] }}</span>
+                <span class="fr">处理中：{{ data[3][1] }}</span>
+              </div>
             </div>
           </div>
-        </div>
-        <div class="cot_img" *ngIf="workerMessage.length == 0">
+        </ng-container>
+        <div class="cot_img" *ngIf="wLoading">
           <img src="../../assets/images/loading.gif" alt="" />
         </div>
-        <div class="cot_img" *ngIf="workerMessage.length == 0">
+        <div class="cot_img" *ngIf="!wLoading && workerMessage.length == 0">
           <span>暂无数据</span>
         </div>
       </div>
       <div class="arrow" *ngIf="showRowNum < maxNum" (click)="unfold()">
         <i class="icon_transport transport-xiala2-01"></i>
       </div>
-      <div
-        class="arrow"
-        *ngIf="showRowNum > maxNum || showRowNum == maxNum"
-        (click)="retract()"
-      >
+      <div class="arrow" *ngIf="showRowNum > maxNum || showRowNum == maxNum" (click)="retract()">
         <i class="icon_transport transport-shangla-"></i>
       </div>
     </div>
@@ -156,15 +107,15 @@
           批量派单
         </button>
       </div>
-      <div class="cots_body weifenpai" *ngIf="(txtLabelCol == 1 && hsmsData.hsmsSwitch && !itsmData.mdv2Switch) || itsmData.mdv2Switch" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag1 }">
+      <div class="cots_body weifenpai" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag1 && !flagList.itsmFlag1) || flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag1 }">
         <overlay-scrollbars #osComponentRef2 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="unassignedList.length && !loading1">
             <div class="list listsTypeColor" *ngFor="let data of unassignedList">
               <!-- 配送 -->
               <ng-container *ngIf="data.type === 'hsms'">
-                <div class="left_cots">
+                <div class="left_cots" (click)="openDetails(data.data)">
                   <!-- 工单 -->
-                  <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id)">
+                  <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id, $event)">
                     <span class="left mr8" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1"><label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchDispatchSelect($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 }})
@@ -177,7 +128,7 @@
                     </div>
                   </div>
                   <!-- 地点 -->
-                  <div class="didian" (click)="openDetails(data.data)">
+                  <div class="didian">
                     <span class="left" *ngIf="data.data.taskType.associationType.value == 'inspect'">
                       {{ data.data.startDept ? data.data.startDept.dept : "" }}
                       <span *ngFor="let item of data.data.middleDept">
@@ -197,7 +148,7 @@
                     </span>
                   </div>
                   <!-- 时间 -->
-                  <div class="shijian" (click)="openDetails(data.data)">
+                  <div class="shijian">
                     <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">
@@ -249,8 +200,8 @@
               </ng-container>
               <!-- 运维 -->
               <ng-container *ngIf="data.type === 'mdv2'">
-                <div class="left_cots">
-                  <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id)">
+                <div class="left_cots" (click)="openItsmDetails(data.data)">
+                  <div class="gongdan">
                     <span class="left gongdan_name">
                       <span [ngClass]="priorityColor(data.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>
@@ -261,26 +212,26 @@
                     </div>
                   </div>
 
-                  <div class="didian" (click)="openItsmDetails(data.data)">
+                  <div class="didian">
                     <span class="left">
                       <span nz-tooltip [nzTooltipTitle]="data.data.description">{{ data.data.description }}</span>
                     </span>
                   </div>
 
-                  <div class="didian" (click)="openItsmDetails(data.data)">
+                  <div class="didian">
                     <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)">
+                  <div class="didian" *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)">
+                  <div class="shijian">
                     <span class="left">
                       <span>
                         申请人：{{ data.data.requester?.name }}
@@ -365,24 +316,19 @@
             <span>搜索</span>
           </div>
         </div>
-        <button
-          nz-button
-          nzType="primary"
-          (click)="batchWithdrawal()"
-          [disabled]="!batchType1"
-        >
+        <button nz-button nzType="primary" (click)="batchWithdrawal()" [disabled]="!batchType1">
           批量撤回
         </button>
       </div>
-      <div class="cots_body daidaoda" *ngIf="(txtLabelCol == 1 && hsmsData.hsmsSwitch && !itsmData.mdv2Switch) || itsmData.mdv2Switch" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag2 }">
+      <div class="cots_body daidaoda" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag2 && !flagList.itsmFlag2) || flagList.itsmFlag2" [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">
               <!-- 配送 -->
               <ng-container *ngIf="data.type === 'hsms'">
-                <div class="left_cots">
+                <div class="left_cots" (click)="openDetails(data.data)">
                   <!-- 工单 -->
-                  <div class="gongdan" (click)="batchWithdrawalSelect(!data.data.checked, data.data.id)">
+                  <div class="gongdan" (click)="batchWithdrawalSelect(!data.data.checked, data.data.id, $event)">
                     <span class="left mr8">
                       <label nz-checkbox [ngModel]="data.data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
@@ -397,7 +343,7 @@
                     </div>
                   </div>
                   <!-- 地点 -->
-                  <div class="didian" (click)="openDetails(data.data)">
+                  <div class="didian">
                     <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">
@@ -417,7 +363,7 @@
                     </span>
                   </div>
                   <!-- 时间 -->
-                  <div class="shijian" (click)="openDetails(data.data)">
+                  <div class="shijian">
                     <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">
@@ -465,8 +411,8 @@
               </ng-container>
               <!-- 运维 -->
               <ng-container *ngIf="data.type === 'mdv2'">
-                <div class="left_cots">
-                  <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id)">
+                <div class="left_cots" (click)="openItsmDetails(data.data)">
+                  <div class="gongdan">
                     <span class="left gongdan_name">
                       <span [ngClass]="priorityColor(data.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>
@@ -477,26 +423,26 @@
                     </div>
                   </div>
 
-                  <div class="didian" (click)="openItsmDetails(data.data)">
+                  <div class="didian">
                     <span class="left">
                       <span nz-tooltip [nzTooltipTitle]="data.data.description">{{ data.data.description }}</span>
                     </span>
                   </div>
 
-                  <div class="didian" (click)="openItsmDetails(data.data)">
+                  <div class="didian">
                     <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)">
+                  <div class="didian" *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)">
+                  <div class="shijian">
                     <span class="left">
                       <span>
                         申请人：{{ data.data.requester?.name }}
@@ -525,34 +471,15 @@
           </div>
         </overlay-scrollbars>
       </div>
-      <div
-        class="cots_body daidaoda twoCol"
-        *ngIf="txtLabelCol == 2"
-        [ngClass]="{ top185: hurseInfoHiding != '1' }"
-      >
+      <div class="cots_body daidaoda twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag2 && !flagList.itsmFlag2" [ngClass]="{ top185: hurseInfoHiding != '1' }">
         <overlay-scrollbars #osComponentRef4 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="arriveList.length && !loading2">
             <div class="list listsTypeColor" *ngFor="let data of arriveList">
-              <div
-                class="left_cots"
-                (click)="openDetails(data)"
-              >
+              <div class="left_cots" (click)="openDetails(data)">
                 <!-- 工单 -->
                 <div class="gongdan">
-                  <span class="left"
-                    >{{ data.taskType.associationType.name
-                    }}{{
-                      data.createDeptDTO
-                        ? "(" + data.createDeptDTO.dept + ")"
-                        : ""
-                    }}</span
-                  >
-
-                  <span
-                    [ngClass]="{ right: true, colorRed: data.timeOut == true }"
-                  >
-                    {{ data.gdState.name }}
-                  </span>
+                  <span class="left">{{ data.taskType.associationType.name }}{{ data.createDeptDTO ? "(" + data.createDeptDTO.dept + ")" : "" }}</span>
+                  <span [ngClass]="{ right: true, colorRed: data.timeOut == true }">{{ data.gdState.name }}</span>
                 </div>
                 <!-- 时间 -->
                 <div class="shijian">
@@ -565,42 +492,15 @@
                 </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 == 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"
-                />
+                <img *ngIf="data.emergencyType && data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
               </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.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.percent + '%' }"></div>
+              <div *ngIf="data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
             </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">
@@ -612,262 +512,162 @@
     <!-- 执行中 -->
     <div class="lists">
       <div class="head">
-        <span class="auto_tit">执行中({{ executionList.length }}条)</span>
-        <span class="toLastTime"
-          >刷新倒计时<span class="time">{{ orderRefreshTime }}s</span></span
-        >
+        <span class="auto_tit"><span *ngIf="flagList.hsmsFlag3">执行中</span><span *ngIf="flagList.itsmFlag3 && flagList.hsmsFlag3">/</span><span *ngIf="flagList.itsmFlag3">处理中</span>({{ executionList.length }}条)</span>
+        <span class="toLastTime"><span class="itsmOrHsms" [ngClass]="{bold: flagList.itsmFlag3}" *ngIf="itsmData.mdv2Switch" (click)="filterOrderList('itsm', 3)">运维</span><span class="itsmOrHsms" *ngIf="itsmData.mdv2Switch && hsmsData.hsmsSwitch">|</span><span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag3}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 3)">配送</span><span class="time">{{ orderRefreshTime }}s</span></span>
       </div>
-      <div class="searchBox">
+      <div class="searchBox" *ngIf="!flagList.itsmFlag3 && flagList.hsmsFlag3">
         <div class="search">
-          <input
-            type="text"
-            placeholder="请输入关键字"
-            [(ngModel)]="executionSearchCon"
-          />
+          <input type="text" placeholder="请输入关键字" [(ngModel)]="executionSearchCon" />
           <div class="magnifier" (click)="searchExecution()">
             <i class="icon_transport transport-sousuo"></i>
             <span>搜索</span>
           </div>
         </div>
       </div>
-      <div
-        class="cots_body zhixingzhong"
-        *ngIf="txtLabelCol == 1"
-        [ngClass]="{ top185: hurseInfoHiding != '1' }"
-      >
+      <div class="cots_body zhixingzhong" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag3 && !flagList.itsmFlag3) || flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag3 }">
         <overlay-scrollbars #osComponentRef5 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="executionList.length && !loading3">
             <div class="list" *ngFor="let data of executionList">
-              <div
-                class="left_cots"
-                (click)="openDetails(data)"
-              >
-                <!-- 工单 -->
-                <div class="gongdan">
-                  <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" (click)="openDetails(data.data)">
+                  <!-- 工单 -->
+                  <div class="gongdan">
+                    <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">
+                    <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">
+                    <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">
-                  <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" (click)="openItsmDetails(data.data)">
+                  <div class="gongdan">
+                    <span class="left gongdan_name">
+                      <span [ngClass]="priorityColor(data.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">
+                    <span class="left">
+                      <span nz-tooltip [nzTooltipTitle]="data.data.description">{{ data.data.description }}</span>
+                    </span>
+                  </div>
+
+                  <div class="didian">
+                    <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" *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">
+                    <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">
-                  <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="computedHandle(data.data)" class="top_bot" value="处理" (click)="handle(data.data)" />
+                  <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
-                *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="loading3"
-          >
+          <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading3">
             <img src="../../assets/images/loading.gif" alt="" />
           </div>
           <div class="no_data" *ngIf="executionList.length == 0 && !loading3">
@@ -875,33 +675,15 @@
           </div>
         </overlay-scrollbars>
       </div>
-      <div
-        class="cots_body zhixingzhong twoCol"
-        *ngIf="txtLabelCol == 2"
-        [ngClass]="{ top185: hurseInfoHiding != '1' }"
-      >
+      <div class="cots_body zhixingzhong twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag3 && !flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != '1' }">
         <overlay-scrollbars #osComponentRef6 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="executionList.length && !loading3">
             <div class="list" *ngFor="let data of executionList">
-              <div
-                class="left_cots"
-                (click)="openDetails(data)"
-              >
+              <div class="left_cots" (click)="openDetails(data)">
                 <!-- 工单 -->
                 <div class="gongdan">
-                  <span class="left"
-                    >{{ data.taskType.associationType.name
-                    }}{{
-                      data.createDeptDTO
-                        ? "(" + data.createDeptDTO.dept + ")"
-                        : ""
-                    }}</span
-                  >
-                  <span
-                    [ngClass]="{ right: true, colorRed: data.timeOut == true }"
-                  >
-                    {{ data.gdState.name }}
-                  </span>
+                  <span class="left">{{ data.taskType.associationType.name }}{{ data.createDeptDTO ? "(" + data.createDeptDTO.dept + ")" : "" }}</span>
+                  <span [ngClass]="{ right: true, colorRed: data.timeOut == true }">{{ data.gdState.name }}</span>
                 </div>
                 <!-- 时间 -->
                 <div class="shijian">
@@ -913,42 +695,15 @@
                   </span>
                 </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 == 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"
-                />
+                <img *ngIf="data.emergencyType && data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
               </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.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.percent + '%' }"></div>
+              <div *ngIf="data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
             </div>
           </ng-container>
-          <div
-            class="
-              loading
-              display_flex
-              col-flex
-              justify-content_flex-center
-              align-items_center
-            "
-            *ngIf="loading3"
-          >
+          <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading3">
             <img src="../../assets/images/loading.gif" alt="" />
           </div>
           <div class="no_data" *ngIf="executionList.length == 0 && !loading3">
@@ -2750,3 +2505,6 @@
 <app-incident-substitution [id]="coopData.id" *ngIf="substitutionModalShow" (closeModelHs)="closeSubstitutionModelOrder($event)" (confirmModelHs)="confirmSubstitutionModelOrder($event)"></app-incident-substitution>
 
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" (confirmDelEvent)="confirmDelFn()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 处理 -->
+<app-incident-handle [id]="coopData.id" *ngIf="handleModalShow" (closeModelHs)="closeHandleModelOrder($event)" (confirmModelHs)="confirmHandleModelOrder($event)"></app-incident-handle>

src/app/views/fuwutai/fuwutai.component.less

@@ -255,7 +255,7 @@
       border-top: 0;
       border-radius: 0 0 4px 4px;
       cursor: pointer;
-      z-index: 9;
+      z-index: 8;
     }
   }
 
@@ -428,7 +428,7 @@
     padding: 0 15px;
     border-bottom: 1px rgb(225, 229, 232) solid;
     position: relative;
-    z-index: 9;
+    z-index: 8;
   }
 
   .lists .head .last_time {
@@ -485,7 +485,7 @@
     padding: 10px 2%;
     background: #f9fafb;
     position: relative;
-    z-index: 9;
+    z-index: 8;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -953,7 +953,7 @@
     display: flex;
 
     .left_cots {
-      width: 98%;
+      // width: 98%;
     }
   }
 
@@ -1554,7 +1554,7 @@
     position: fixed;
     top: 40%;
     right: 0;
-    z-index: 9;
+    z-index: 8;
     border-radius: 5px 0 0 5px;
 
     .fixedMark {

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

@@ -24,6 +24,7 @@ import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, pa
 import { UploadFile } from 'ng-zorro-antd';
 import { HttpRequest, HttpClient, HttpResponse } from '@angular/common/http';
 import cloneDeep from 'lodash-es/cloneDeep'
+import { userInfo } from 'os';
 
 // 日期禁用
 function range(start: number, end: number): number[] {
@@ -351,7 +352,8 @@ export class FuwutaiComponent implements OnInit {
   }
   // 批量分派选中
   allUnassignedList = false;
-  batchDispatchSelect(e, id) {
+  batchDispatchSelect(e, id, event?) {
+    event && event.stopPropagation();
     this.unassignedList.forEach((item) => {
       if (item.id == id) {
         item.checked = e;
@@ -375,7 +377,8 @@ export class FuwutaiComponent implements OnInit {
   }
   // 批量撤回选中
   allArriveList = false;
-  batchWithdrawalSelect(e, id) {
+  batchWithdrawalSelect(e, id, event?) {
+    event && event.stopPropagation();
     this.arriveList.forEach((item) => {
       if (item.id == id) {
         item.checked = e;
@@ -839,7 +842,12 @@ export class FuwutaiComponent implements OnInit {
     let scopeInfo = this.user.user.scope;
     this.checkedHos = scopeInfo.hospitalId ? scopeInfo.hospitalId.id : undefined;
     this.orderScopeRadio = scopeInfo.range + "";
-    this.scopeGroups = scopeInfo.groupIds || [];
+    let groupIds = scopeInfo.groupIds || [];
+    let dutyGroupList = scopeInfo.dutyGroupList || [];
+    this.scopeGroups = dutyGroupList.concat(groupIds);
+    if(this.scopeGroups.length){
+      this.typeId = this.scopeGroups[0].id;
+    }
     this.hsmsData = {
       checkedHos: this.checkedHos,
       scopeGroups: this.scopeGroups,
@@ -1245,37 +1253,64 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 切换顶部tab栏
-  typeId = -1; //当前选中tab ID
+  // typeId = -1; //当前选中tab ID
+  typeId; //当前选中tab ID
+  typeData; //当前选中tab
+  wLoading:boolean = false;
   checkTab(typeId) {
     if(!this.hsmsData.hsmsSwitch){
       return;
     }
     let that = this;
     that.typeId = typeId;
-    let postData = {
-      groups: [typeId],
-      idx: 0,
-      sum: 100,
-      hosId: this.checkedHos,
-    };
-    if (typeId == -1) {
-      let groups = [];
-      that.scopeGroups.forEach((e) => {
-        groups.push(e.id);
+    this.typeData = this.scopeGroups.find(v => v.id === typeId);
+    let type = this.typeData.type;
+    // 配送
+    if(type === 1 || type === 2){
+      let postData = {
+        groups: [typeId],
+        idx: 0,
+        sum: 100,
+        hosId: this.checkedHos,
+      };
+      // if (typeId == -1) {
+      //   let groups = [];
+      //   that.scopeGroups.forEach((e) => {
+      //     groups.push(e.id);
+      //   });
+      //   postData.groups = groups;
+      // }
+      if (this.hurseInfoHiding == '1'){
+        that.workerMessage = [];
+        that.initTopCount();
+        return;
+      }
+      this.wLoading = true;
+      that.mainService.getSerInfo("getWorkInfo", postData).subscribe((data) => {
+        this.wLoading = false;
+        that.workerMessage = data.data ? data.data : [];
+        that.initTopCount();
       });
-      postData.groups = groups;
     }
-    if (this.hurseInfoHiding == '1'){
-      that.workerMessage = [];
-      that.initTopCount();
-      return;
+
+    // 运维
+    if(type === 3){
+      let postData = {
+        groups: [typeId],
+      };
+      if (this.hurseInfoHiding == '1'){
+        that.workerMessage = [];
+        that.initTopCount();
+        return;
+      }
+      this.wLoading = true;
+      that.mainService.incidentUserTaskCount(postData).subscribe((data:any) => {
+        this.wLoading = false;
+        that.workerMessage = data.data ? data.data : [];
+        that.initTopCount();
+      });
     }
-    that.mainService.getSerInfo("getWorkInfo", postData).subscribe((data) => {
-      that.workerMessage = data.data ? data.data : [];
-      that.initTopCount();
-    });
-    // that.workerMessage = [];
-    // that.initTopCount();
+
   }
 
   // 获取三个状态数据数据
@@ -1346,7 +1381,12 @@ export class FuwutaiComponent implements OnInit {
           "queryTask": "todoReassign",
         }
       }else if(stateId == 3){
-        delete postData.incidentQuery;
+        postData.incidentQuery.incident = {
+          "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          "urgentType": +this.itsmData.orderScopeRadio + 1,
+          "queryTask": "doing",
+          "assignee": this.tool.getCurrentUserId(),
+        }
       }
     }
 
@@ -1386,7 +1426,7 @@ export class FuwutaiComponent implements OnInit {
           this.loading2 = false;
         } else if (stateId == 3) {
           // 执行中
-          this.executionList = data.list || [];
+          this.executionList = data.data || [];
           this.loading3 = false;
         }
 
@@ -4041,6 +4081,11 @@ export class FuwutaiComponent implements OnInit {
     return (data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign)) && data.deleteFlag !== 1;
   }
 
+  // 是否显示处理按钮
+  computedHandle(data){
+    return this.coopBtns.handle && data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
+  }
+
   delModal: boolean = false; //删除模态框
   tipsMsg1: string; //提示框信息
   tipsMsg2: string; //操作后信息
@@ -4094,4 +4139,21 @@ export class FuwutaiComponent implements OnInit {
         });
     }
   }
+
+  // 处理-弹窗
+  handleModalShow = false; //弹窗开关
+  handle(data) {
+    this.coopData = data;
+    this.handleModalShow = true;
+  }
+  // 关闭弹窗
+  closeHandleModelOrder(e) {
+    this.handleModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmHandleModelOrder(e){
+    console.log(e);
+    this.handleModalShow = false;
+    this.showPromptModalRefresh();
+  }
 }

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

@@ -12,6 +12,7 @@ import { KnowledgeLookModule } from 'src/app/components/knowledge-look/knowledge
 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';
+import { IncidentHandleModule } from 'src/app/components/incidentManagement/incident-handle/incident-handle.module';
 
 
 @NgModule({
@@ -29,6 +30,7 @@ import { IncidentSubstitutionModule } from 'src/app/components/incidentManagemen
     IncidentDetailModule,
     IncidentRejectModule,
     IncidentSubstitutionModule,
+    IncidentHandleModule,
   ]
 })
 export class FuwutaiModule { }

src/common.less

@@ -165,6 +165,14 @@
   word-break: break-all;
 }
 
+.fl {
+  float: left !important;
+}
+
+.fr {
+  float: right !important;
+}
+
 .ellipsis-multiline {
   display: -webkit-box;
   -webkit-box-orient: vertical;
@@ -237,13 +245,7 @@
     cursor: not-allowed;
     border: 1px solid rgba(0, 0, 0, 0.25);
   }
-  .fl {
-    float: left !important;
-  }
 
-  .fr {
-    float: right !important;
-  }
   .clearfixer :after {
     content: "";
     display: block;