服务台工单列表

src/app/services/main.service.ts

@@ -993,4 +993,11 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+
+	// 调度台工单列表
+	orderList(data) {
+	  return this.http.post(host.host + `/ser/merge/orderList`,data, {
+	    headers: this.headers,
+	  });
+	}
 }

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

@@ -132,83 +132,38 @@
       <div class="head">
         <span class="auto_tit">未分派({{ unassignedList.length }}条)</span>
         <div class="ml8 auto_building">
-          <nz-select
-            class="auto_building_select"
-            [(ngModel)]="unassignedBuilding"
-            nzMode="multiple"
-            nzPlaceHolder="请选择楼栋"
-            (nzOpenChange)="openChangeUnassignedBuilding($event)"
-            (ngModelChange)="changeUnassignedBuilding($event)"
-          >
+          <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>
+              <nz-option *ngIf="!bLoading && !b2Loading" [nzLabel]="option[0] + '(' + option[2] + ')'" [nzValue]="option[3]"></nz-option>
             </ng-container>
             <nz-option *ngIf="bLoading || b2Loading" nzDisabled nzCustomContent>
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
             </nz-option>
           </nz-select>
         </div>
-        <span class="toLastTime"
-          >刷新倒计时<span class="time">{{ orderRefreshTime }}s</span></span
-        >
+        <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>
       </div>
       <div class="searchBox">
-        <label
-          nz-checkbox
-          [(ngModel)]="allUnassignedList"
-          (ngModelChange)="changeAllUnassignedList($event)"
-          >全选</label
-        >
+        <label nz-checkbox [(ngModel)]="allUnassignedList" (ngModelChange)="changeAllUnassignedList($event)">全选</label>
         <div class="search wp60">
-          <input
-            class="wp75"
-            type="text"
-            placeholder="请输入关键字"
-            [(ngModel)]="unassignedSearchCon"
-          />
+          <input class="wp75" type="text" placeholder="请输入关键字" [(ngModel)]="unassignedSearchCon" />
           <div class="magnifier wp20" (click)="searchUnassigned()">
             <i class="icon_transport transport-sousuo"></i>
             <span>搜索</span>
           </div>
         </div>
-        <button
-          nz-button
-          nzType="primary"
-          (click)="batchDispatch()"
-          [disabled]="!batchType"
-        >
+        <button nz-button nzType="primary" (click)="batchDispatch()" [disabled]="!batchType">
           批量派单
         </button>
       </div>
-      <div
-        class="cots_body weifenpai"
-        *ngIf="txtLabelCol == 1"
-        [ngClass]="{ top185: hurseInfoHiding != '1' }"
-      >
+      <div class="cots_body weifenpai" *ngIf="txtLabelCol == 1" [ngClass]="{ top185: hurseInfoHiding != '1' }">
         <overlay-scrollbars #osComponentRef2 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="unassignedList.length && !loading1">
-            <div
-              class="list listsTypeColor"
-              *ngFor="let data of unassignedList"
-            >
+            <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>
+                <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>
@@ -220,12 +175,7 @@
                   </div>
                 </div>
                 <!-- 地点 -->
-                <div
-                  class="didian"
-                  (click)="
-                    openDetails(data)
-                  "
-                >
+                <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">
@@ -245,226 +195,58 @@
                   </span>
                 </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>
+                <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 *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 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>
-                  <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>
+                  <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 *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 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>
-                  <span
-                    class="right"
-                    nz-tooltip
-                    [nzTooltipTitle]="
-                      '总时长' + formatTime(data.expectTimeNum / 1000)
-                    "
-                  >
+                  <span class="right" nz-tooltip [nzTooltipTitle]="'总时长' + formatTime(data.expectTimeNum / 1000)">
                     {{ data.showCreateTime }}
                   </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
-                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 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 *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="loading1"
-          >
+          <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">
@@ -472,34 +254,15 @@
           </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" [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="list listsTypeColor" *ngFor="let data of unassignedList">
+              <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 }"
-                  >
+                  <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>
@@ -513,42 +276,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="loading1"
-          >
+          <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">

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

@@ -11,6 +11,15 @@
   }
 }
 
+.itsmOrHsms{
+  color: rgba(0,0,0,0.45);
+  cursor: pointer;
+  &.bold{
+    color: rgba(0,0,0,1);
+    font-weight: bold;
+  }
+}
+
 .anticon-plus{
   font-size: 32px;
   margin-bottom: 8px;
@@ -1375,6 +1384,7 @@
   .toLastTime .time {
     font-size: 12px;
     color: @primary-color;
+    margin-left: 8px;
   }
   .toLastTime1 {
     position: absolute;

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

@@ -1283,21 +1283,36 @@ export class FuwutaiComponent implements OnInit {
       types += e.id + ",";
     });
     types = types.slice(0, types.length - 1);
-    let postData = {
-      workOrder: {
-        serTaskTypes: types || "null",
-        serGdState: stateId,
-        range: that.orderScopeRadio,
-        platform: 3,
-        searchDays: 1,
-      },
-      idx: 0,
-      sum: 60,
-    };
-    postData.workOrder["keyWord"] = keyWords;
+    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.itsmData.mdv2Switch){
+      postData.incidentQuery = {
+        incident: {
+          "queryTask": "storageAccept",
+          "assignee": this.tool.getCurrentUserId(),
+        },
+        idx: 0,
+        sum: 1,
+      }
+    }
     if (stateId == 1) {
       if (this.unassignedBuilding.length) {
-        postData.workOrder["deptIds"] = this.unassignedBuilding.toString();
+        postData.workOrderQuery.workOrder["deptIds"] = this.unassignedBuilding.toString();
       }
       that.loading1 = true;
     } else if (stateId == 2) {
@@ -1307,12 +1322,11 @@ export class FuwutaiComponent implements OnInit {
     }
     console.log(postData);
     that.mainService
-      .getFetchDataList("ser", "workOrder", postData)
-      .subscribe((data) => {
+      .orderList(postData)
+      .subscribe((data:any) => {
         if (stateId == 1) {
           // 未分派
           that.unassignedList = data.list || [];
-          // if (that.unassignedListClone === null) {
           that.unassignedList.forEach((item) => {
             item.checked = false;
           });
@@ -1321,18 +1335,7 @@ export class FuwutaiComponent implements OnInit {
           that.unassignedListClone = JSON.parse(
             JSON.stringify(that.unassignedList)
           );
-          // } else {
-          //   that.unassignedList.forEach((item1) => {
-          //     that.unassignedListClone.forEach((item2) => {
-          //       if (item1.id == item2.id) {
-          //         item1.checked = item2.checked;
-          //       }
-          //     });
-          //   });
-          //   this.batchType = this.unassignedListClone.some(
-          //     (item) => item.checked
-          //   );
-          // }
+
           if (
             this.audioNotDispatched &&
             that.unassignedList.length > 0 &&
@@ -1350,23 +1353,12 @@ export class FuwutaiComponent implements OnInit {
         } else if (stateId == 2) {
           // 待到达
           that.arriveList = data.list || [];
-          // if (that.arriveListClone === null) {
           that.arriveList.forEach((item) => {
             item.checked = false;
           });
           that.batchType1 = false;
           that.allArriveList = false;
           that.arriveListClone = JSON.parse(JSON.stringify(that.arriveList));
-          // } else {
-          // that.arriveList.forEach((item1) => {
-          //   that.arriveListClone.forEach((item2) => {
-          //     if (item1.id == item2.id) {
-          //       item1.checked = item2.checked;
-          //     }
-          //   });
-          // });
-          // this.batchType1 = this.arriveListClone.some((item) => item.checked);
-          // }
           that.loading2 = false;
         } else if (stateId == 3) {
           // 执行中
@@ -3470,7 +3462,7 @@ export class FuwutaiComponent implements OnInit {
     }
     let that = this;
     let postData = {
-      controlView: { userId: that.user.user.id, hosId: this.checkedHos },
+      controlView: {},
       idx: 0,
       sum: 1,
     };
@@ -3522,8 +3514,6 @@ export class FuwutaiComponent implements OnInit {
 
     let postData = {
       controlView: {
-        hosId: this.checkedHos,
-        userId: that.user.user.id,
         workerNum: wn,
         labelNum: that.txtLabelCol,
         workerInfoTime: that.workerInfoTime,