调度台

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

@@ -127,11 +127,11 @@
   </div>
   <!-- 状态工单 -->
   <div class="lists_box" [ngClass]="{ top185: hurseInfoHiding != '1' }">
-    <!-- 未分派 -->
+    <!-- 未分派/未受理 -->
     <div class="lists">
       <div class="head">
-        <span class="auto_tit">未分派({{ unassignedList.length }}条)</span>
-        <div class="ml8 auto_building">
+        <span class="auto_tit"><span *ngIf="flagList.hsmsFlag1">未分派</span><span *ngIf="flagList.itsmFlag1 && flagList.hsmsFlag1">/</span><span *ngIf="flagList.itsmFlag1">未受理</span>({{ unassignedList.length }}条)</span>
+        <div class="ml8 auto_building" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1">
           <nz-select class="auto_building_select" [(ngModel)]="unassignedBuilding" nzMode="multiple" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeUnassignedBuilding($event)" (ngModelChange)="changeUnassignedBuilding($event)">
             <ng-container *ngFor="let option of unassignedBuildings">
               <nz-option *ngIf="!bLoading && !b2Loading" [nzLabel]="option[0] + '(' + option[2] + ')'" [nzValue]="option[3]"></nz-option>
@@ -141,9 +141,9 @@
             </nz-option>
           </nz-select>
         </div>
-        <span class="toLastTime"><span class="itsmOrHsms" [ngClass]="{bold: itsmData.mdv2Switch}" *ngIf="itsmData.mdv2Switch">运维</span><span class="itsmOrHsms" *ngIf="itsmData.mdv2Switch && hsmsData.hsmsSwitch">|</span><span class="itsmOrHsms" [ngClass]="{bold: hsmsData.hsmsSwitch}" *ngIf="hsmsData.hsmsSwitch">配送</span><span class="time">{{ orderRefreshTime }}s</span></span>
+        <span class="toLastTime"><span class="itsmOrHsms" [ngClass]="{bold: flagList.itsmFlag1}" *ngIf="itsmData.mdv2Switch" (click)="filterOrderList('itsm', 1)">运维</span><span class="itsmOrHsms" *ngIf="itsmData.mdv2Switch && hsmsData.hsmsSwitch">|</span><span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag1}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 1)">配送</span><span class="time">{{ orderRefreshTime }}s</span></span>
       </div>
-      <div class="searchBox">
+      <div class="searchBox" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1">
         <label nz-checkbox [(ngModel)]="allUnassignedList" (ngModelChange)="changeAllUnassignedList($event)">全选</label>
         <div class="search wp60">
           <input class="wp75" type="text" placeholder="请输入关键字" [(ngModel)]="unassignedSearchCon" />
@@ -156,132 +156,189 @@
           批量派单
         </button>
       </div>
-      <div class="cots_body weifenpai" *ngIf="txtLabelCol == 1" [ngClass]="{ top185: hurseInfoHiding != '1' }">
+      <div class="cots_body weifenpai" *ngIf="(txtLabelCol == 1 && hsmsData.hsmsSwitch && !itsmData.mdv2Switch) || itsmData.mdv2Switch" [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">
-              <div class="left_cots">
-                <!-- 工单 -->
-                <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.id)">
-                  <span class="left mr8"><label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchDispatchSelect($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)="batchDispatchSelect(!data.checked, data.data.id)">
+                    <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 }})
                     </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.data.gdState.name }}</span>
+                      </span>
+                    </div>
                   </div>
-                </div>
-                <!-- 地点 -->
-                <div class="didian" (click)="openDetails(data)">
-                  <span class="left" *ngIf="data.taskType.associationType.value == 'inspect'">
-                    {{ data.startDept ? data.startDept.dept : "" }}
-                    <span *ngFor="let item of data.middleDept">
-                      ->{{ item.dept }}
+                  <!-- 地点 -->
+                  <div class="didian" (click)="openDetails(data.data)">
+                    <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">
+                        ->{{ item.dept }}
+                      </span>
                     </span>
-                  </span>
-                  <span class="left" *ngIf="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>
+                    <span class="left" *ngIf="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="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>
+                <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.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')" />
+                </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.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>
+                    <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>
-                  </span>
-                  <span class="right" nz-tooltip [nzTooltipTitle]="'总时长' + formatTime(data.expectTimeNum / 1000)">
-                    {{ data.showCreateTime }}
-                  </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>
-                <!-- 急单 -->
-                <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.worker && data.gdState.value != 2" class="top_bot" value="派单" (click)="allotWorker(data.id, data.gdState.id, 1)" />
-                <input type="button" *ngIf="data.gdState.value == 2 || ((data.gdState.value == 3 || data.gdState.value == 4) && data.worker)" class="btm_bot" value="删除" (click)="openDelModal(data.id)" />
-              </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 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>
+                <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>
             </div>
           </ng-container>
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading1">
             <img src="../../assets/images/loading.gif" alt="" />
           </div>
+
           <div class="no_data" *ngIf="unassignedList.length == 0 && !loading1">
             暂无数据
           </div>
         </overlay-scrollbars>
       </div>
-      <div class="cots_body weifenpai twoCol" *ngIf="txtLabelCol == 2" [ngClass]="{ top185: hurseInfoHiding != '1' }">
+      <div class="cots_body weifenpai twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag1 && !flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != '1' }">
         <overlay-scrollbars #osComponentRef1 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="unassignedList.length && !loading1">
             <div class="list listsTypeColor" *ngFor="let data of unassignedList">
-              <div class="left_cots" (click)="openDetails(data)">
+              <div class="left_cots" (click)="openDetails(data.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 class="left">{{ data.data.taskType.associationType.name }}{{ data.data.createDeptDTO ? "(" + data.data.createDeptDTO.dept + ")" : "" }}</span>
+                  <span [ngClass]="{ right: true, colorRed: data.data.timeOut == true }">
+                    {{ data.data.gdState.name }}
                   </span>
                 </div>
                 <!-- 时间 -->
                 <div class="shijian">
                   <div class="left">
-                    {{ data.createUser ? data.createUser.name : "" }}
+                    {{ data.data.createUser ? data.data.createUser.name : "" }}
                   </div>
                   <span class="right">
-                    <span>{{ data.showCreateTime }}</span>
+                    <span>{{ data.data.showCreateTime }}</span>
                   </span>
                 </div>
                 <!-- 急单 -->
-                <img *ngIf="data.emergencyType && data.emergencyType.id == 300" src="../../assets/images/icon_ji.png" alt="" class="ji" />
+                <img *ngIf="data.data.emergencyType && data.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.data.emergencyType && data.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.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>
           </ng-container>
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading1">
@@ -594,7 +651,7 @@
                   "
                   class="btm_bot"
                   value="删除"
-                  (click)="openDelModal(data.id)"
+                  (click)="openDelModal(data.id, 'hsms')"
                 />
               </div>
               <div
@@ -1614,7 +1671,7 @@
           <div class="name">来电咨询</div>
           <div class="newTopItem">
             <span class="grayFont required">院区：</span>
-            <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.branch" (ngModelChange)="changeApplyHospital($event)" nzAllowClear>
+            <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear>
               <ng-container *ngFor="let option of applicationHospitalList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -1636,15 +1693,18 @@
           </div>
           <div class="newTopItem">
             <span class="grayFont">申请人：</span>
-            <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">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
-              </ng-container>
-              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-              </nz-option>
-            </nz-select>
-            <label nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
+            <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">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+              <label nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
+            </ng-container>
           </div>
           <div class="newTopItem">
             <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
@@ -2322,18 +2382,18 @@
                       </nz-select>
                     </div>
                     <div class="col flex7">
-                      <input nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.address" />
+                      <input nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" />
                     </div>
                   </div>
 
                   <div class="row gap8">
                     <div class="col">
                       <span class="name">科室电话：</span>
-                      <ng-container *ngIf="incidentMsg.manyPhone">{{incidentMsg.manyPhone|stringToFirstValue}}<em (click)="importPhone(incidentMsg.manyPhone, true)">引入</em></ng-container>
+                      <ng-container *ngIf="incidentMsg.deptManyPhone">{{incidentMsg.deptManyPhone|stringToFirstValue}}<em (click)="importPhone(incidentMsg.deptManyPhone, true)">引入</em></ng-container>
                     </div>
                     <div class="col">
                       <span class="name">报修人电话：</span>
-                      <ng-container *ngIf="incidentMsg.phone">{{incidentMsg.phone}}<em (click)="importPhone(incidentMsg.phone)">引入</em></ng-container>
+                      <ng-container *ngIf="incidentMsg.requesterPhone">{{incidentMsg.requesterPhone}}<em (click)="importPhone(incidentMsg.requesterPhone)">引入</em></ng-container>
                     </div>
                     <div class="col">
                       <span class="name">来电电话：</span>
@@ -2403,16 +2463,21 @@
                     <div class="col">
                       <span class="name">报修图片：</span>
                       <div class="value w100 upload">
-                        <nz-upload nzListType="picture-card" [(nzFileList)]="fileList" [nzShowUploadList]="showUploadList" [nzPreview]="handlePreview" nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png" [nzShowButton]="fileList.length < 3" [nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl" [nzSize]="10240">
-                          <i nz-icon nzType="plus"></i>
-                          <div class="ant-upload-text">上传照片</div>
-                        </nz-upload>
-                        <nz-modal [nzVisible]="previewVisible" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible = false">
-                          <ng-template #modalContent>
-                            <img [src]="previewImage" [ngStyle]="{ width: '100%' }" />
-                          </ng-template>
-                        </nz-modal>
-                        <div class="tips">(支持JPG/PNG格式图片，单张大小10M以内)</div>
+                        <ng-container *ngIf="repairImgs.length === 0">
+                          <nz-upload nzListType="picture-card" [(nzFileList)]="fileList" [nzShowUploadList]="showUploadList" [nzPreview]="handlePreview" nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png" [nzShowButton]="fileList.length < 3" [nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl" [nzSize]="10240">
+                            <i nz-icon nzType="plus"></i>
+                            <div class="ant-upload-text">上传照片</div>
+                          </nz-upload>
+                          <nz-modal [nzVisible]="previewVisible" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible = false">
+                            <ng-template #modalContent>
+                              <img [src]="previewImage" [ngStyle]="{ width: '100%' }" />
+                            </ng-template>
+                          </nz-modal>
+                          <div class="tips">(支持JPG/PNG格式图片，单张大小10M以内)</div>
+                        </ng-container>
+                        <div class="thumbList" *ngIf="repairImgs.length > 0">
+                          <div class="thumb" *ngFor="let item of repairImgs;let index = index;" (click)="previewImageHandler(repairImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -2538,7 +2603,7 @@
                   <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)" />
+                    <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>
@@ -2698,7 +2763,7 @@
           </button>
         </ng-container>
         <ng-container *ngIf="currentTabIndex === '99999'">
-          <label nz-checkbox [(ngModel)]="isBuildOrderAgagin">是否连续建单</label>
+          <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '微信转事件'">是否连续建单</label>
           <button nz-button class="btn" nzType="primary" (click)="directOrder()">
             直接解决
           </button>
@@ -2831,3 +2896,9 @@
 
 <!-- 知识库查看 -->
 <app-knowledge-look (cancelKnowledgeModal)="cancelKnowledgeModal()" *ngIf="isShowKnowledge" [knowledgeData]="coopData"></app-knowledge-look>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>
+
+<!-- 图片预览 -->
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>

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

@@ -11,6 +11,31 @@
   }
 }
 
+.thumbList{
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  .thumb{
+    width: 64px;
+    height: 64px;
+    padding: 4px;
+    border-radius: 4px;
+    border: 1px solid rgba(0,0,0,0.15);
+    img{
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      object-position: center;
+      cursor: pointer;
+    }
+  }
+}
+
+.transport-a-11111{
+  color: @primary-color;
+}
+
 .itsmOrHsms{
   color: rgba(0,0,0,0.45);
   cursor: pointer;
@@ -423,7 +448,7 @@
 
   .lists .head .auto_tit {
     font-weight: bold;
-    font-size: 16px;
+    font-size: 14px;
   }
   .lists .head .auto_building {
     display: inline-block;
@@ -519,7 +544,10 @@
     background-color: white;
     border-top: 1px rgb(225, 229, 232) solid;
     &.top185 {
-      height: calc(100vh - 355px);
+      height: calc(100% - 94px);
+    }
+    &.top185_1 {
+      height: calc(100% - 40px);
     }
   }
 
@@ -555,9 +583,11 @@
 
   /* 未分派 */
   .weifenpai .list {
-    height: 100px;
+    // height: 100px;
     border-bottom: 1px rgb(225, 229, 232) solid;
     position: relative;
+    overflow: hidden;
+    display: flex;
   }
   // 转出院记录
   .patientLog .list {
@@ -570,7 +600,7 @@
 
   /* 左边 */
   .left_cots {
-    height: 100px;
+    // height: 100px;
     width: 78%;
     float: left;
     margin-left: 2%;
@@ -590,14 +620,8 @@
   /* 右边 */
   .right_bots {
     width: 20%;
-    height: 100px;
-    float: left;
     border-left: 1px #e1e5e8 solid;
-    // display: flex;
-    // flex-wrap: wrap;
-    // align-items: center;
-    // justify-content: center;
-    padding: 12px 0;
+    padding: 8px 0;
   }
 
   /* 上按钮 */
@@ -613,7 +637,8 @@
 
   .slider {
     position: absolute;
-    top: 98px;
+    // top: 98px;
+    bottom: 0;
     right: 0;
     width: 100%;
     height: 2px;
@@ -646,7 +671,7 @@
     width: 70%;
     border-radius: 4px;
     color: #78797a;
-    background-color: #f9fafb;
+    background-color: #F0F6ED;
     border: 1px #e5e9ed solid;
     cursor: pointer;
     height: 27px;
@@ -655,7 +680,7 @@
   /* 工单 */
   .weifenpai .left_cots .gongdan {
     height: 24px;
-    margin-top: 5px;
+    margin: 4px 0;
     line-height: 24px;
     text-align: center;
   }
@@ -666,7 +691,7 @@
     font-size: 14px;
   }
   .gongdan_name {
-    max-width: 60% !important;
+    max-width: 80% !important;
     overflow: hidden !important;
     text-overflow: ellipsis !important;
     white-space: nowrap !important;
@@ -704,7 +729,7 @@
   .weifenpai .didian {
     height: 24px;
     line-height: 24px;
-    margin-top: 8px;
+    margin: 4px 0;
     display: flex;
   }
 
@@ -746,7 +771,7 @@
   .weifenpai .shijian {
     height: 24px;
     line-height: 24px;
-    margin-top: 8px;
+    margin: 4px 0;
   }
 
   .weifenpai .shijian .left {
@@ -775,14 +800,16 @@
 
   /* 待到达 */
   .daidaoda .list {
-    height: 100px;
+    // height: 100px;
+    overflow: hidden;
     border-bottom: 1px rgb(225, 229, 232) solid;
     position: relative;
+    display: flex;
   }
 
   /* 左边 */
   .daidaoda .left_cots {
-    height: 100px;
+    // height: 100px;
     width: 78%;
     float: left;
     margin-left: 2%;
@@ -810,7 +837,7 @@
   /* 工单 */
   .daidaoda .gongdan {
     height: 24px;
-    margin-top: 5px;
+    margin: 4px 0;
     line-height: 24px;
     text-align: center;
   }
@@ -853,7 +880,7 @@
   .daidaoda .didian {
     height: 24px;
     line-height: 24px;
-    margin-top: 8px;
+    margin: 4px 0;
     display: flex;
   }
 
@@ -889,7 +916,7 @@
   .daidaoda .shijian {
     height: 24px;
     line-height: 24px;
-    margin-top: 8px;
+    margin: 4px 0;
   }
 
   .daidaoda .shijian .left {
@@ -918,11 +945,12 @@
 
   /* 执行中 */
   .zhixingzhong .list {
-    height: 100px;
+    // height: 100px;
     border-bottom: 1px rgb(225, 229, 232) solid;
     cursor: pointer;
     position: relative;
     overflow: hidden;
+    display: flex;
 
     .left_cots {
       width: 98%;
@@ -940,7 +968,7 @@
   /* 工单 */
   .zhixingzhong .gongdan {
     height: 24px;
-    margin-top: 5px;
+    margin: 4px 0;
     line-height: 24px;
     text-align: center;
   }
@@ -983,7 +1011,7 @@
   .zhixingzhong .didian {
     height: 24px;
     line-height: 24px;
-    margin-top: 8px;
+    margin: 4px 0;
     display: flex;
   }
 
@@ -1023,7 +1051,7 @@
   .zhixingzhong .shijian {
     height: 24px;
     line-height: 24px;
-    margin-top: 8px;
+    margin: 4px 0;
   }
 
   .zhixingzhong .shijian .left {
@@ -1177,7 +1205,7 @@
 
   /* 左边 */
   .create-order-model .right_lists .left_cots {
-    height: 100px;
+    // height: 100px;
     width: 78%;
     float: left;
     margin-left: 2%;
@@ -1229,7 +1257,7 @@
     margin-top: 4px;
     border-radius: 4px;
     color: #78797a;
-    background-color: #f9fafb;
+    background-color: #F0F6ED;
     border: 1px #e5e9ed solid;
     cursor: pointer;
     height: 27px;
@@ -1238,7 +1266,7 @@
   /* 工单 */
   .create-order-model .right_lists .left_cots .gongdan {
     height: 24px;
-    margin-top: 5px;
+    margin: 4px 0;
     line-height: 24px;
   }
 
@@ -1318,7 +1346,7 @@
   .create-order-model .right_lists .shijian {
     height: 24px;
     line-height: 24px;
-    margin-top: 8px;
+    margin: 4px 0;
   }
 
   .create-order-model .right_lists .shijian .left {

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

@@ -20,9 +20,10 @@ import { Subject, forkJoin } from "rxjs";
 import { debounceTime, filter } from "rxjs/operators";
 import { SourceId } from "src/app/type/types";
 import { ToolService } from 'src/app/services/tool.service';
-import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, parse, format } from 'date-fns';
+import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, parse, format, addHours } from 'date-fns';
 import { UploadFile } from 'ng-zorro-antd';
 import { HttpRequest, HttpClient, HttpResponse } from '@angular/common/http';
+import cloneDeep from 'lodash-es/cloneDeep'
 
 // 日期禁用
 function range(start: number, end: number): number[] {
@@ -771,6 +772,15 @@ export class FuwutaiComponent implements OnInit {
   recDelLoading: boolean = false; //撤回并删除loading状态
   saveLoading: boolean = false; //保存按钮loading状态
 
+  flagList:any = {
+    itsmFlag1: false,
+    hsmsFlag1: false,
+    itsmFlag2: false,
+    hsmsFlag2: false,
+    itsmFlag3: false,
+    hsmsFlag3: false,
+  }
+
   mainRole: boolean = false; //回到系统管理权限
   initRole() {
     // let roles = JSON.parse(localStorage.getItem('user')).user.role;
@@ -831,6 +841,9 @@ export class FuwutaiComponent implements OnInit {
       orderScopeRadio: this.orderScopeRadio || '0',
       hsmsSwitch: scopeInfo.hsmsSwitch === 1,
     }
+    this.flagList.hsmsFlag1 = this.hsmsData.hsmsSwitch;
+    this.flagList.hsmsFlag2 = this.hsmsData.hsmsSwitch;
+    this.flagList.hsmsFlag3 = this.hsmsData.hsmsSwitch;
     this.itsmCheckedHos = scopeInfo.dutyList || [];
     this.itsmOrderScopeRadio = scopeInfo.dutyRange + "";
     this.itsmScopeGroups = scopeInfo.dutyGroupList || [];
@@ -841,6 +854,9 @@ export class FuwutaiComponent implements OnInit {
       mdv2Switch: scopeInfo.mdv2Switch === 1,
       allDuty: scopeInfo.allDuty === undefined ? 1 : scopeInfo.allDuty,
     }
+    this.flagList.itsmFlag1 = this.itsmData.mdv2Switch;
+    this.flagList.itsmFlag2 = this.itsmData.mdv2Switch;
+    this.flagList.itsmFlag3 = this.itsmData.mdv2Switch;
     this.getHospitalConfigList('allowNucleicAcidPrinting');
   }
 
@@ -1262,45 +1278,51 @@ export class FuwutaiComponent implements OnInit {
   loading2 = true;
   loading3 = true;
   getOrderList(stateId, isAudio?) {
-    let that = this;
+    this[`loading${stateId}`] = true;
     let keyWords = "";
-    if (stateId == 1) {
-      keyWords = this.unassignedSearchCon || "";
-    } else if (stateId == 2) {
-      keyWords = this.arriveSearchCon || "";
-    } else if (stateId == 3) {
-      keyWords = this.executionSearchCon || "";
-    }
-    if (that.user.user.scope) {
-      that.user.user.scope.typeIds = that.user.user.scope.typeIds || [];
-    }
-    if (!that.user.user.scope || !that.user.user.scope.typeIds) {
-      that.loading1 = that.loading2 = that.loading3 = false;
-      return;
-    }
     let types = "";
-    that.user.user.scope.typeIds.forEach((e) => {
-      types += e.id + ",";
-    });
-    types = types.slice(0, types.length - 1);
+
     let postData:any = {};
     // 配送
-    if(this.hsmsData.hsmsSwitch){
-      postData.workOrderQuery = {
-        workOrder: {
-          serTaskTypes: types || "null",
-          serGdState: stateId,
-          range: that.orderScopeRadio,
-          platform: 3,
-          searchDays: 1,
-          keyWord: keyWords,
-        },
-        idx: 0,
-        sum: 1,
+    if(this.flagList['hsmsFlag' + stateId]){
+      if (stateId == 1) {
+        keyWords = this.unassignedSearchCon || "";
+      } else if (stateId == 2) {
+        keyWords = this.arriveSearchCon || "";
+      } else if (stateId == 3) {
+        keyWords = this.executionSearchCon || "";
+      }
+      if (this.user.user.scope) {
+        this.user.user.scope.typeIds = this.user.user.scope.typeIds || [];
+      }
+      if (!this.user.user.scope || !this.user.user.scope.typeIds) {
+        this.loading1 = this.loading2 = this.loading3 = false;
+      }else{
+        this.user.user.scope.typeIds.forEach((e) => {
+          types += e.id + ",";
+        });
+        types = types.slice(0, types.length - 1);
+
+        postData.workOrderQuery = {
+          workOrder: {
+            serTaskTypes: types || "null",
+            serGdState: stateId,
+            range: this.orderScopeRadio,
+            platform: 3,
+            searchDays: 1,
+            keyWord: keyWords,
+          },
+          idx: 0,
+          sum: 1,
+        }
+
+        if (this.unassignedBuilding.length && stateId == 1) {
+          postData.workOrderQuery.workOrder["deptIds"] = this.unassignedBuilding.toString();
+        }
       }
     }
     // 运维
-    if(this.itsmData.mdv2Switch){
+    if(this.flagList['itsmFlag' + stateId]){
       postData.incidentQuery = {
         incident: {
           "queryTask": "storageAccept",
@@ -1310,37 +1332,22 @@ export class FuwutaiComponent implements OnInit {
         sum: 1,
       }
     }
-    if (stateId == 1) {
-      if (this.unassignedBuilding.length) {
-        postData.workOrderQuery.workOrder["deptIds"] = this.unassignedBuilding.toString();
-      }
-      that.loading1 = true;
-    } else if (stateId == 2) {
-      that.loading2 = true;
-    } else if (stateId == 3) {
-      that.loading3 = true;
-    }
+
     console.log(postData);
-    that.mainService
-      .orderList(postData)
-      .subscribe((data:any) => {
+    this.mainService.orderList(postData).subscribe((data:any) => {
         if (stateId == 1) {
           // 未分派
-          that.unassignedList = data.list || [];
-          that.unassignedList.forEach((item) => {
+          this.unassignedList = data.data || [];
+          this.unassignedList.forEach((item) => {
             item.checked = false;
           });
-          that.batchType = false;
-          that.allUnassignedList = false;
-          that.unassignedListClone = JSON.parse(
-            JSON.stringify(that.unassignedList)
+          this.batchType = false;
+          this.allUnassignedList = false;
+          this.unassignedListClone = JSON.parse(
+            JSON.stringify(this.unassignedList)
           );
 
-          if (
-            this.audioNotDispatched &&
-            that.unassignedList.length > 0 &&
-            isAudio
-          ) {
+          if (this.audioNotDispatched && this.unassignedList.length > 0 && isAudio) {
             //语音播报开启
             let audio = document.createElement("audio");
             audio.src = "./../../assets/audio/audioNotDispatched.mp3";
@@ -1349,25 +1356,25 @@ export class FuwutaiComponent implements OnInit {
               audio.play();
             });
           }
-          that.loading1 = false;
+          this.loading1 = false;
         } else if (stateId == 2) {
           // 待到达
-          that.arriveList = data.list || [];
-          that.arriveList.forEach((item) => {
+          this.arriveList = data.list || [];
+          this.arriveList.forEach((item) => {
             item.checked = false;
           });
-          that.batchType1 = false;
-          that.allArriveList = false;
-          that.arriveListClone = JSON.parse(JSON.stringify(that.arriveList));
-          that.loading2 = false;
+          this.batchType1 = false;
+          this.allArriveList = false;
+          this.arriveListClone = JSON.parse(JSON.stringify(this.arriveList));
+          this.loading2 = false;
         } else if (stateId == 3) {
           // 执行中
-          that.executionList = data.list || [];
-          that.loading3 = false;
+          this.executionList = data.list || [];
+          this.loading3 = false;
         }
 
         if (keyWords) {
-          that.loading1 = that.loading2 = that.loading3 = false;
+          this.loading1 = this.loading2 = this.loading3 = false;
         }
       });
   }
@@ -1437,6 +1444,22 @@ export class FuwutaiComponent implements OnInit {
       this.router.navigateByUrl("dispatchingDesk/detailOthers/" + data.id);
     }
   }
+
+  // 查看ITSM工单详情
+  detailModalShow = false; //弹窗开关
+  openItsmDetails(data) {
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+  }
   // 选择楼栋
   changeUnassignedBuilding(e) {
     this.getOrderList(1);
@@ -1610,13 +1633,16 @@ export class FuwutaiComponent implements OnInit {
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
   deathTasktypeIdPatient; //获取这个写死的任务类型的id,转出院记录
-  async showNewOrder(des?, phone?) {
+  async showNewOrder(des = '', phone = '', isInit = false, buildType = '') {
+    this.buildType = buildType;
     if(this.itsmData.mdv2Switch){
       this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
       this.searchApplicationSource();
-      this.searchApplicationDepartment('itsm');
+      isInit ? this.searchApplicationDepartment('itsm', undefined, undefined, undefined, true) : this.searchApplicationDepartment('itsm');
+      isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) ) && this.incidentModel.hosId && this.searchApplicationBuilding();
+      isInit && this.incidentModel.area && this.searchApplicationFloor();
       if(!this.hsmsData.hsmsSwitch){
         this.taskBuild = null;
         this.newOrderShow = true;
@@ -1624,10 +1650,11 @@ export class FuwutaiComponent implements OnInit {
         this.fixedTab = "newOrder";
         this.currentRTab = 0;
         this.rightTitle_tab = [];
-        this.incidentModel = {};
-        this.incidentMsg = {};
+        this.incidentModel = isInit ? this.incidentModel : {};
+        this.incidentMsg = isInit ? this.incidentMsg : {};
+        this.isBuildOrderAgagin = false;
         this.applyDept = null;
-        this.incidentModel.department = null;
+        this.incidentModel.department = isInit ? this.incidentModel.department : null;
 
         //正常初始化
         this.getAutoWorkTypes();
@@ -1656,8 +1683,7 @@ export class FuwutaiComponent implements OnInit {
     let deathTasktypePatientResult: any = await this.patientLogTasktype();
     this.patientLogTasktypeLoading = false;
     if (deathTasktypePatientResult.status == 200) {
-      this.deathTasktypeIdPatient =
-        deathTasktypePatientResult.list[0].valueconfig;
+      this.deathTasktypeIdPatient = deathTasktypePatientResult.list[0].valueconfig;
     } else {
       return;
     }
@@ -1668,10 +1694,11 @@ export class FuwutaiComponent implements OnInit {
     this.fixedTab = "newOrder";
     this.currentRTab = 0;
     this.rightTitle_tab = [];
-    this.incidentModel = {};
-    this.incidentMsg = {};
+    this.incidentModel = isInit ? this.incidentModel : {};
+    this.incidentMsg = isInit ? this.incidentMsg : {};
+    this.isBuildOrderAgagin = false;
     this.applyDept = null;
-    this.incidentModel.department = null;
+    this.incidentModel.department = isInit ? this.incidentModel.department : null;
     console.log(des);
     if (des === "no") {
       //没绑定科室
@@ -1816,8 +1843,13 @@ export class FuwutaiComponent implements OnInit {
           { id: 3, name: '知识库' },
         ]
         this.rightTitleHandler(this.rightTitle_tab[0].id);
-      }else{
-        this.rightTitle_tab = [];
+      }
+
+      let deptObj = this.applicationDeptList.find(v => v.id == this.incidentModel.department);
+
+      if(this.applyDept != this.incidentModel.department){
+        this.applyDept = this.incidentModel.department;
+        this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
       }
 
       // 回显事件来源
@@ -1832,8 +1864,13 @@ export class FuwutaiComponent implements OnInit {
           { id: 1, name: '转出院记录' },
         ]
         this.rightTitleHandler(this.rightTitle_tab[0].id);
-      }else{
-        this.rightTitle_tab = [];
+      }
+
+      let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
+
+      if(this.incidentModel.department != this.applyDept){
+        this.incidentModel.department = this.applyDept;
+        this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
       }
     }
   }
@@ -1904,7 +1941,9 @@ export class FuwutaiComponent implements OnInit {
     this.incidentModel.department = undefined;
     this.searchApplicationDepartment('itsm');
 
-    this.incidentModel.requester = undefined;
+    if(this.buildType !== '微信转事件'){
+      this.incidentModel.requester = undefined;
+    }
     this.applicationRequesterList = [];
 
     this.incidentModel.area = undefined;
@@ -1913,7 +1952,7 @@ export class FuwutaiComponent implements OnInit {
     this.incidentModel.place = undefined;
     this.applicationFloorList = [];
 
-    this.incidentModel.address = undefined;
+    this.incidentModel.houseNumber = undefined;
     this.incidentModel.duty = undefined;
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
@@ -1961,7 +2000,7 @@ export class FuwutaiComponent implements OnInit {
       idx: 0,
       sum: 20,
       user: {
-        hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.branch },
+        hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
         dept: this.isRelatedDepartment ? { id: this.incidentModel.department } : undefined,
         name: keyWord,
         // simpleQuery: true,
@@ -1983,7 +2022,7 @@ export class FuwutaiComponent implements OnInit {
     let userObj = this.applicationRequesterList.find(v => v.id == e);
     // 选择申请人回显申请人电话
     if(userObj){
-      this.incidentMsg.phone = userObj.phone;
+      this.incidentMsg.requesterPhone = userObj.phone;
     }
   }
   // 故障现象列表
@@ -2016,7 +2055,7 @@ export class FuwutaiComponent implements OnInit {
     // 知识库
     this.getKnowageList();
     // 根据院区和故障现象带出责任部门，优先级，维修人/组，故障描述
-    if(this.incidentModel.branch && e){
+    if(this.incidentModel.hosId && e){
       // 带出故障描述
       if(this.incidentModel.description){
         this.incidentModel.description = this.incidentModel.description + ' ' + this.applicationCategoryList.find(v => v.id == e).mutiCategory;
@@ -2029,7 +2068,7 @@ export class FuwutaiComponent implements OnInit {
         sum: 9999,
         incidentCategoryConfig: {
           categoryId: e,
-          hosId: this.incidentModel.branch,
+          hosId: this.incidentModel.hosId,
         },
       };
       console.log(postData);
@@ -2088,10 +2127,10 @@ export class FuwutaiComponent implements OnInit {
         "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
         "contactsInformation": this.incidentModel.contactsInformation,
         "contacts": this.incidentModel.contacts,
-        "hosId": this.incidentModel.branch || undefined,
+        "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.address,
+        "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,
@@ -2108,6 +2147,10 @@ export class FuwutaiComponent implements OnInit {
       },
     };
 
+    if(this.buildType){
+      Object.assign(postData.incident, this.editOrder);
+    }
+
     this.mainService
       .flowPost("incident/task/accept", postData)
       .subscribe((result) => {
@@ -2342,7 +2385,7 @@ export class FuwutaiComponent implements OnInit {
       idx: 0,
       sum: 9999,
       building: {
-        hosId: this.incidentModel.branch,
+        cascadeHosId: this.incidentModel.hosId,
       },
     };
     this.isLoading = true;
@@ -2369,7 +2412,7 @@ export class FuwutaiComponent implements OnInit {
       sum: 9999,
       floor: {
         buildId: this.incidentModel.area || undefined,
-        hosId: this.incidentModel.branch,
+        hosId: this.incidentModel.hosId,
       },
     };
     this.isLoading = true;
@@ -2384,13 +2427,15 @@ export class FuwutaiComponent implements OnInit {
   }
   // 修改关联查
   changeApplyRelatedDepartment(e){
-    this.incidentModel.requester = undefined;
+    if(this.buildType !== '微信转事件'){
+      this.incidentModel.requester = undefined;
+    }
     this.searchApplicationRequester();
   }
   // 申请科室列表（搜索）
   isLoadingApply: boolean = false;
   applicationDeptList:any[] = [];
-  searchApplicationDepartment(type, e?, phone?, deptId?) {
+  searchApplicationDepartment(type, e?, phone?, deptId?, isInit?) {
     if(!this.hsmsData.hsmsSwitch && !this.itsmData.mdv2Switch){
       return;
     }
@@ -2400,7 +2445,7 @@ export class FuwutaiComponent implements OnInit {
     }
     let cascadeHosId;
     if(type == 'itsm'){
-      cascadeHosId = this.incidentModel.branch || undefined;
+      cascadeHosId = this.incidentModel.hosId || undefined;
     }else{
       cascadeHosId = this.checkedHos;
     }
@@ -2456,6 +2501,8 @@ export class FuwutaiComponent implements OnInit {
             }
           }else if(type == 'itsm'){
             this.applicationDeptList = data.list;
+            let ids = this.applicationDeptList.map(v => v.id);
+            isInit && !ids.includes(this.incidentModel.department) && (this.applicationDeptList.unshift({id: this.incidentModel.department, dept: this.incidentMsg.deptName}))
             deptId && this.changeApplyDept(deptId);
           }
         }
@@ -2513,9 +2560,9 @@ export class FuwutaiComponent implements OnInit {
     }
 
     // 选择科室回显一级院区
-    if(!this.incidentModel.branch){
+    if(!this.incidentModel.hosId){
       if(deptObj){
-        this.incidentModel.branch = deptObj.hospital.parent ? deptObj.hospital.parent.id : deptObj.hospital.id;
+        this.incidentModel.hosId = deptObj.hospital.parent ? deptObj.hospital.parent.id : deptObj.hospital.id;
       }
 
       this.incidentModel.area = undefined;
@@ -2528,16 +2575,18 @@ export class FuwutaiComponent implements OnInit {
     // 选择科室回显科室电话，楼栋，楼层，地址
     if(deptObj){
       console.log('deptObj:', deptObj)
-      this.incidentMsg.manyPhone = deptObj.manyPhone;
+      this.incidentMsg.deptManyPhone = deptObj.manyPhone;
       this.incidentModel.area = deptObj.building ? deptObj.building.id : undefined;
       this.incidentModel.area && this.searchApplicationBuilding();
       this.incidentModel.place = deptObj.floor ? deptObj.floor.id : undefined;
       this.incidentModel.place && this.searchApplicationFloor();
-      this.incidentModel.address = deptObj.address;
+      this.incidentModel.houseNumber = deptObj.address;
     }
 
     // 刷新申请人列表
-    this.incidentModel.requester = undefined;
+    if(this.buildType !== '微信转事件'){
+      this.incidentModel.requester = undefined;
+    }
     this.searchApplicationRequester();
 
     // 回显维修人/组
@@ -2734,10 +2783,10 @@ export class FuwutaiComponent implements OnInit {
         "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
         "contactsInformation": this.incidentModel.contactsInformation,
         "contacts": this.incidentModel.contacts,
-        "hosId": this.incidentModel.branch || undefined,
+        "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.address,
+        "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,
@@ -2752,6 +2801,9 @@ export class FuwutaiComponent implements OnInit {
         "assignee": this.incidentModel.user || undefined,
       }
     };
+    if(this.buildType){
+      Object.assign(postData.incident, this.editOrder);
+    }
     console.log(postData);
     // return;
 
@@ -2784,8 +2836,10 @@ export class FuwutaiComponent implements OnInit {
       this.incidentModel.category = undefined;
       this.incidentModel.user = undefined;
       this.incidentModel.group = undefined;
+      this.showPromptModal("建单", true, "", "");
     }else{
-      this.newOrderCancel();
+      this.newOrderShow = false; //关闭弹窗
+      this.showPromptModal("建单", true, "", "");
     }
   }
 
@@ -2823,10 +2877,11 @@ export class FuwutaiComponent implements OnInit {
           });
           console.log('workTypesArrange', this.workTypesArrange);
           // 任务类型是否显示操作项
-          this.workTypesFlag = Object.keys(this.workTypesArrange).length >= 5;
+          let arr = Object.keys(this.workTypesArrange);
+          this.workTypesFlag = arr.length >= 5;
           // 默认选中第一项
-          if (Object.keys(this.workTypesArrange).length > 0) {
-            this.tabClick(Object.keys(this.workTypesArrange)[0]);
+          if (arr.length > 0) {
+            this.tabClick(arr[arr.length - 1]);
           }
         }
       });
@@ -3380,24 +3435,39 @@ export class FuwutaiComponent implements OnInit {
   // 删除
   // 打开模态框
   coopId; //当前操作id
-  openDelModal(id) {
+  coopType;
+  openDelModal(id, type) {
     this.coopId = id;
+    this.coopType = type;
     this.delOrderShow = true;
   }
   // 确认删除
   confirmDel() {
     let that = this;
     that.btnLoading = true;
-    that.mainService.delOrder(that.coopId).subscribe((data) => {
-      that.btnLoading = false;
-      console.log(data);
-      that.closeDelOrderModal();
-      if (data.status == 200) {
-        that.showPromptModal("删除", true, "");
-      } else {
-        that.showPromptModal("删除", false, data.msg);
-      }
-    });
+    if(this.coopType === 'hsms'){
+      that.mainService.delOrder(that.coopId).subscribe((data) => {
+        that.btnLoading = false;
+        console.log(data);
+        that.closeDelOrderModal();
+        if (data.status == 200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data.msg);
+        }
+      });
+    }else if(this.coopType === 'itsm'){
+      that.mainService.simplePost("rmvData", "incident", [this.coopId]).subscribe((data) => {
+        that.btnLoading = false;
+        console.log(data);
+        that.closeDelOrderModal();
+        if (data.status == 200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data.msg);
+        }
+      });
+    }
   }
 
   // 关闭模态框
@@ -3669,4 +3739,99 @@ export class FuwutaiComponent implements OnInit {
       this.radioValueQt = +arr[1];
     }
   }
+
+  // 运维、配送工单切换
+  filterOrderList(type, state){
+    this.flagList[`${type}Flag${state}`] = !this.flagList[`${type}Flag${state}`];
+    this.getOrderList(state, state === 1);
+  }
+
+  // 优先级颜色
+  priorityColor(priorityId) {
+    // 极低|低
+    if(priorityId == 1 || priorityId == 2){
+      return '';
+    } else if(priorityId == 3){
+      return 'yellow';
+    } else if(priorityId == 4 || priorityId == 5){
+      return 'red';
+    }
+  }
+
+  // 延期记录
+  transferHandlerLog = function (currentLog) {
+    if(!currentLog){
+        return '';
+    }
+    currentLog = cloneDeep(currentLog);
+    if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
+        if(currentLog.extra2==0.5){
+          currentLog.extra2 = 4;
+          return currentLog.extra1DTO.name+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日")+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
+        }else{
+          return currentLog.extra1DTO.name+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
+        }
+    }else{
+        return '';
+    }
+  }
+
+  // 生成工单
+  buildType;
+  editOrder;
+  generateOrder(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);
+  }
+
+  // 获取报修图片
+  repairImgs:any[] = [];//报修图片
+  getRepairImgs(incidentId) {
+    this.mainService
+      .getPreviewImage('wechatRequesterIncident', incidentId)
+      .subscribe((res:any) => {
+        res.data = res.data || [];
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+        })
+        this.repairImgs = res.data;
+      });
+  }
+
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  initialViewIndex:number = 0;
+  previewImageHandler(data = [], index = 0) {
+    this.initialViewIndex = index;
+    console.log(index)
+    this.isPreview = false;
+    data = data || [];
+    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+    setTimeout(() => {
+      this.isPreview = true;
+    }, 0)
+  }
 }

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

@@ -9,6 +9,7 @@ import { NgxPrintModule } from 'ngx-print';
 import { OrderScopeModule } from 'src/app/components/order-scope/order-scope.module';
 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';
 
 
 @NgModule({
@@ -23,6 +24,7 @@ import { KnowledgeLookModule } from 'src/app/components/knowledge-look/knowledge
     OrderScopeModule,
     IncidentDicrectOrderModule,
     KnowledgeLookModule,
+    IncidentDetailModule,
   ]
 })
 export class FuwutaiModule { }