增加药房2

src/app/services/main.service.ts

@@ -511,4 +511,10 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //药房端2统计数据
+  getDrugsBagStateCount(data) {
+    return this.http.post(host.host + "/ser/getDrugsBagStateCount", data, {
+      headers: this.headers,
+    });
+  }
 }

src/app/share/log-prompt-modal/log-prompt-modal.component.html

@@ -0,0 +1,66 @@
+<div
+  class="modal display_flex justify-content_flex-center align-items_center"
+  *ngIf="show"
+>
+  <div class="modalBody">
+    <div class="title">
+      流程信息查看<i
+        class="icon_transport transport-guanbi"
+        (click)="hideModal()"
+      ></i>
+    </div>
+    <div class="content">
+      <nz-table
+        class="hospitalTable"
+        [nzData]="historySpecimenList"
+        nzSize="middle"
+        [nzShowPagination]="false"
+        [nzLoading]="hsLoading"
+      >
+        <thead>
+          <tr class="thead">
+            <th nzWidth="8%">序号</th>
+            <th nzWidth="23%">时间</th>
+            <th nzWidth="23%">操作类型</th>
+            <th nzWidth="23%">操作人</th>
+            <th nzWidth="23%">交接人</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of historySpecimenList; let i = index">
+            <td>{{ i + 1 }}</td>
+            <td>{{ data.operationTime | date: "MM-dd HH:mm" }}</td>
+            <td>{{ data.operationType ? data.operationType.name : "" }}</td>
+            <td>
+              {{ data.username || "暂无" }}
+              <span *ngIf="data.operatorAccount"
+                >({{ data.operatorAccount }})</span
+              >
+            </td>
+            <td>
+              {{ data.handoverPersonName || "暂无" }}
+              <span *ngIf="data.handoverPersonAccount"
+                >({{ data.handoverPersonAccount }})</span
+              >
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="pagination">
+        <nz-pagination
+          [(nzPageIndex)]="historySpecimenPageIndex"
+          [(nzTotal)]="historySpecimenListLength"
+          [(nzPageSize)]="historySpecimenPageSize"
+          (nzPageIndexChange)="getHistorySpecimen()"
+          (nzPageSizeChange)="getHistorySpecimen()"
+        >
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">
+        知道了
+      </button>
+    </div>
+  </div>
+</div>

src/app/share/log-prompt-modal/log-prompt-modal.component.less

@@ -0,0 +1,163 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 700px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+          padding-bottom: 10px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/log-prompt-modal/log-prompt-modal.component.ts

@@ -0,0 +1,55 @@
+import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ToolService } from "src/app/services/tool.service";
+
+@Component({
+  selector: "app-log-prompt-modal",
+  templateUrl: "./log-prompt-modal.component.html",
+  styleUrls: ["./log-prompt-modal.component.less"],
+})
+export class LogPromptModalComponent implements OnInit {
+  hosId;
+  // 切换科室，切换弹窗
+  hsLoading = false;
+  historySpecimenList: any = [];
+  historySpecimenPageIndex: number = 1; //表格当前页码
+  historySpecimenPageSize: number = 5; //表格每页展示条数
+  historySpecimenListLength: number = 10; //表格总数据量
+  @Input() show: Boolean;
+  @Input() packid: String;
+
+  @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) {}
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getHistorySpecimen();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false })); //emits(向上弹射)事件
+  }
+  // 获取列表数据
+  getHistorySpecimen(idx?) {
+    if (idx) {
+      this.historySpecimenPageIndex = 1;
+    }
+    let postData = {
+      idx: this.historySpecimenPageIndex - 1,
+      sum: this.historySpecimenPageSize,
+      drugsBagOperationLog: {
+        hosId: this.hosId,
+        packid: this.packid,
+      },
+    };
+    this.hsLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "drugsBagOperationLog", postData)
+      .subscribe((data) => {
+        this.hsLoading = false;
+        this.historySpecimenList = data.list || [];
+        this.historySpecimenListLength = data.totalNum || 0;
+      });
+  }
+}

src/app/share/share.module.ts

@@ -30,6 +30,7 @@ import { HtmlTransformPipe } from '../pipes/html-transform.pipe';
 import { BxPromptModalComponent } from './bx-prompt-modal/bx-prompt-modal.component';
 import { ExcelExportComponent } from './excel-export/excel-export.component';
 import { FilterSelfPipe } from '../pipes/filter-self.pipe';
+import { LogPromptModalComponent } from './log-prompt-modal/log-prompt-modal.component';
 
 @NgModule({
   declarations: [
@@ -58,6 +59,7 @@ import { FilterSelfPipe } from '../pipes/filter-self.pipe';
     HtmlTransformPipe,
     FilterSelfPipe,
     ExcelExportComponent,
+    LogPromptModalComponent,
   ],
   imports: [
     CommonModule,
@@ -101,6 +103,7 @@ import { FilterSelfPipe } from '../pipes/filter-self.pipe';
     HtmlTransformPipe,
     FilterSelfPipe,
     ExcelExportComponent,
+    LogPromptModalComponent,
   ]
 })
 export class ShareModule { }

src/app/views/main/main.component.html

@@ -35,6 +35,7 @@
           <button nz-button nzType="primary" *ngIf='deskRole' (click)="toFuwutai()">调度台</button>
           <button nz-button nzType="primary" *ngIf="nurseRole" (click)="toHuShi()">护士端</button>
           <button nz-button nzType="primary" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</button>
+          <button nz-button nzType="primary" *ngIf="pharmacyRole" (click)="toPharmacy2()">药房端2</button>
           <button nz-button nzType="primary" *ngIf="largeScreenRole" (click)="toBigScreen('largeScreen')">大屏端</button>
           <button nz-button nzType="primary" *ngIf="largeScreenRole2"
             (click)="toBigScreen('largeScreen2')">大屏端2</button>

src/app/views/main/main.component.ts

@@ -206,6 +206,10 @@ export class MainComponent implements OnInit {
   toPharmacy(): void {
     this.router.navigateByUrl("pharmacy");
   }
+  // 药房端2
+  toPharmacy2(): void {
+    this.router.navigateByUrl("pharmacy2");
+  }
   // 大屏端或视图端
   screenType;
   hosFlag = false;

src/app/views/pharmacy2/pharmacy2.component.html

@@ -12,8 +12,12 @@
     <div class="pharmacy-name">
       <h2 class="pharmacy-name__title">药房</h2>
       <div class="pharmacy-name__total">
-        <div>今日药单量：<strong>253</strong></div>
-        <div>今日已完成：<strong>248</strong></div>
+        <div>
+          今日药单量：<strong>{{ todayTotal }}</strong>
+        </div>
+        <div>
+          今日已完成：<strong>{{ todayComplete }}</strong>
+        </div>
       </div>
     </div>
     <div class="userInfo">
@@ -37,9 +41,7 @@
     <div class="pharmacy-main__list pharmacy-main__print">
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
-        <strong>药品计费（待配药）（0）</strong>
-        <!-- <button nz-button class="pharmacy-main__printAll" (click)="print()"
-            [disabled]="printPharmacyList.length===0">批量打印</button> -->
+        <strong>药品计费（待配药）（{{ printPharmacyTotal }}）</strong>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -62,6 +64,7 @@
       <overlay-scrollbars #osComponentRef1 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading1" style="height: 100%">
           <div
+            (click)="showLogs(item)"
             class="pharmacy-main__selection"
             *ngFor="let item of printPharmacyList"
           >
@@ -126,7 +129,7 @@
     <div class="pharmacy-main__list pharmacy-main__waitDelivery">
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
-        <strong>配药中（3）</strong>
+        <strong>配药中（{{ waitPharmacyTotal }}）</strong>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -149,6 +152,7 @@
       <overlay-scrollbars #osComponentRef2 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading2" style="height: 100%">
           <div
+            (click)="showLogs(item)"
             class="pharmacy-main__selection"
             *ngFor="let item of waitPharmacyList; let i = index"
           >
@@ -167,12 +171,6 @@
                   ><ng-container *ngIf="!item.bagTime">无</ng-container></span
                 >
               </div>
-              <div class="pharmacy-main__selectionItem">
-                <span *ngIf="i == 0">10:10 由 亚祥 配药</span>
-                <span *ngIf="i == 1">10:10 由 森源 配药</span>
-                <span *ngIf="i == 2">10:10 由 王满 配药</span>
-                <span *ngIf="i == 3">10:10 由 小平 配药</span>
-              </div>
             </div>
           </div>
           <div
@@ -219,7 +217,7 @@
     <div class="pharmacy-main__list pharmacy-main__delivery">
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
-        <strong>核对中（3）</strong>
+        <strong>核对中（{{ pharmacyTotal }}）</strong>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -242,8 +240,9 @@
       <overlay-scrollbars #osComponentRef3 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading3" style="height: 100%">
           <div
+            (click)="showLogs(item)"
             class="pharmacy-main__selection"
-            *ngFor="let item of waitPharmacyList; let i = index"
+            *ngFor="let item of pharmacyList; let i = index"
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
@@ -260,17 +259,11 @@
                   ><ng-container *ngIf="!item.bagTime">无</ng-container></span
                 >
               </div>
-              <div class="pharmacy-main__selectionItem">
-                <span *ngIf="i == 0">10:10 由 亚祥 核对</span>
-                <span *ngIf="i == 1">10:10 由 森源 核对</span>
-                <span *ngIf="i == 2">10:10 由 王满 核对</span>
-                <span *ngIf="i == 3">10:10 由 小平 核对</span>
-              </div>
             </div>
           </div>
           <div
             class="pharmacy-main__selection pharmacy-main__selection--noData"
-            *ngIf="waitPharmacyList.length === 0"
+            *ngIf="pharmacyList.length === 0"
           >
             <img src="./../../assets/images/image_kongbaiye.png" alt="" />
           </div>
@@ -308,13 +301,11 @@
       <!-- 列表 end -->
     </div>
     <!-- 核对中 end -->
-
-    <!-- 临时增加 start -->
-    <!-- 核对中 start -->
+    <!-- 配送中 start -->
     <div class="pharmacy-main__list pharmacy-main__delivery">
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
-        <strong>配送中（3）</strong>
+        <strong>配送中（{{ distributionTotal }}）</strong>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -324,9 +315,9 @@
           <input
             nz-input
             placeholder="请输入关键字"
-            [(ngModel)]="pharmacySearchKey"
+            [(ngModel)]="distributionSearchKey"
           />
-          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(3)">
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(4)">
             <i nz-icon nzType="search"></i>
             <span>搜索</span>
           </div>
@@ -335,10 +326,11 @@
       <!-- 搜索框 end -->
       <!-- 列表 start -->
       <overlay-scrollbars #osComponentRef4 class="pharmacy-main__selectionWrap">
-        <div *ngIf="!loading3" style="height: 100%">
+        <div *ngIf="!loading4" style="height: 100%">
           <div
+            (click)="showLogs(item)"
             class="pharmacy-main__selection"
-            *ngFor="let item of waitPharmacyList; let i = index"
+            *ngFor="let item of distributionList; let i = index"
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
@@ -355,24 +347,18 @@
                   ><ng-container *ngIf="!item.bagTime">无</ng-container></span
                 >
               </div>
-              <div class="pharmacy-main__selectionItem">
-                <span *ngIf="i == 0">10:10 由 亚祥 配送</span>
-                <span *ngIf="i == 1">10:10 由 森源 配送</span>
-                <span *ngIf="i == 2">10:10 由 王满 配送</span>
-                <span *ngIf="i == 3">10:10 由 小平 配送</span>
-              </div>
             </div>
           </div>
           <div
             class="pharmacy-main__selection pharmacy-main__selection--noData"
-            *ngIf="waitPharmacyList.length === 0"
+            *ngIf="distributionList.length === 0"
           >
             <img src="./../../assets/images/image_kongbaiye.png" alt="" />
           </div>
           <div
-            (click)="loadMore(3)"
+            (click)="loadMore(4)"
             class="pharmacy-main__selection pharmacy-main__selection--more"
-            *ngIf="pharmacyFlag"
+            *ngIf="distributionFlag"
           >
             <div class="pharmacy-main__selectionInfo">
               <i
@@ -380,14 +366,14 @@
                 nzType="loading"
                 nzTheme="outline"
                 class="pharmacy-main__selection--icon"
-                *ngIf="pharmacyLoad"
+                *ngIf="distributionLoad"
               ></i
               >查看更多
             </div>
           </div>
         </div>
         <div
-          *ngIf="loading3"
+          *ngIf="loading4"
           style="height: calc(100vh - 212px); min-height: 556px"
         >
           <div
@@ -402,12 +388,12 @@
       </overlay-scrollbars>
       <!-- 列表 end -->
     </div>
-    <!-- 核对中 end -->
-    <!-- 核对中 start -->
+    <!-- 配送中 end -->
+    <!-- 已完成 start -->
     <div class="pharmacy-main__list pharmacy-main__delivery">
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
-        <strong>已完成（3）</strong>
+        <strong>已完成（{{ completedTotal }}）</strong>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -417,9 +403,9 @@
           <input
             nz-input
             placeholder="请输入关键字"
-            [(ngModel)]="pharmacySearchKey"
+            [(ngModel)]="completedSearchKey"
           />
-          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(3)">
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(5)">
             <i nz-icon nzType="search"></i>
             <span>搜索</span>
           </div>
@@ -428,10 +414,11 @@
       <!-- 搜索框 end -->
       <!-- 列表 start -->
       <overlay-scrollbars #osComponentRef5 class="pharmacy-main__selectionWrap">
-        <div *ngIf="!loading3" style="height: 100%">
+        <div *ngIf="!loading5" style="height: 100%">
           <div
+            (click)="showLogs(item)"
             class="pharmacy-main__selection"
-            *ngFor="let item of waitPharmacyList; let i = index"
+            *ngFor="let item of completedList; let i = index"
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
@@ -448,24 +435,18 @@
                   ><ng-container *ngIf="!item.bagTime">无</ng-container></span
                 >
               </div>
-              <div class="pharmacy-main__selectionItem">
-                <span *ngIf="i == 0">10:10 由 亚祥 接收</span>
-                <span *ngIf="i == 1">10:10 由 森源 接收</span>
-                <span *ngIf="i == 2">10:10 由 王满 接收</span>
-                <span *ngIf="i == 3">10:10 由 小平 接收</span>
-              </div>
             </div>
           </div>
           <div
             class="pharmacy-main__selection pharmacy-main__selection--noData"
-            *ngIf="waitPharmacyList.length === 0"
+            *ngIf="completedList.length === 0"
           >
             <img src="./../../assets/images/image_kongbaiye.png" alt="" />
           </div>
           <div
-            (click)="loadMore(3)"
+            (click)="loadMore(5)"
             class="pharmacy-main__selection pharmacy-main__selection--more"
-            *ngIf="pharmacyFlag"
+            *ngIf="completedFlag"
           >
             <div class="pharmacy-main__selectionInfo">
               <i
@@ -473,14 +454,14 @@
                 nzType="loading"
                 nzTheme="outline"
                 class="pharmacy-main__selection--icon"
-                *ngIf="pharmacyLoad"
+                *ngIf="completedLoad"
               ></i
               >查看更多
             </div>
           </div>
         </div>
         <div
-          *ngIf="loading3"
+          *ngIf="loading5"
           style="height: calc(100vh - 212px); min-height: 556px"
         >
           <div
@@ -495,8 +476,7 @@
       </overlay-scrollbars>
       <!-- 列表 end -->
     </div>
-    <!-- 核对中 end -->
-    <!-- 临时增加 end -->
+    <!-- 已完成 end -->
   </div>
   <!-- 主体部分 end -->
   <!-- 二维码打印 -->
@@ -584,3 +564,11 @@
     ></div>
   </div>
 </app-hs-prompt-modal>
+
+<!-- 药包流程信息查看 -->
+<app-log-prompt-modal
+  *ngIf="logPromptModalShow"
+  [show]="logPromptModalShow"
+  [packid]="packid"
+  (closeModelHs)="closeModelLog($event)"
+></app-log-prompt-modal>

src/app/views/pharmacy2/pharmacy2.component.less

@@ -255,6 +255,7 @@
 					box-sizing: border-box;
 					border-bottom: 1px solid #e5e9ed;
           display: flex;
+          cursor: pointer;
           &.pharmacy-main__selection--more{
             color: @primary-color;
             height: 34px;

src/app/views/pharmacy2/pharmacy2.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from "@angular/core";
 import { MainService } from "../../services/main.service";
 import { Router } from "@angular/router";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { startOfDay, format, endOfDay } from "date-fns";
 
 @Component({
   selector: "app-pharmacy2",
@@ -35,26 +36,47 @@ export class Pharmacy2Component implements OnInit {
   })
   osComponentRef5: OverlayScrollbarsComponent;
   constructor(private mainService: MainService, public router: Router) {}
+  // 今日药单量
+  todayTotal: undefined;
+  // 今日已完成
+  todayComplete: undefined;
   //待配药数据
   codes = [];
   // 待配药
   printPharmacyList = []; //数据列表
   printPharmacyIdx = 0; //页码
+  printPharmacyTotal = 0; //总数
   printPharmacyFlag = false; //是否查看更多
   printPharmacySearchKey = ""; //搜索的内容
   printPharmacyLoad = false; //按钮的loading
   // 配药中列表
   waitPharmacyList = [];
   waitPharmacyIdx = 0;
+  waitPharmacyTotal = 0;
   waitPharmacyFlag = false;
   waitPharmacySearchKey = "";
   waitPharmacyLoad = false;
   // 核对中列表
   pharmacyList = [];
   pharmacyIdx = 0;
+  pharmacyTotal = 0;
   pharmacyFlag = false;
   pharmacySearchKey = "";
   pharmacyLoad = false;
+  // 配送中列表
+  distributionList = [];
+  distributionIdx = 0;
+  distributionTotal = 0;
+  distributionFlag = false;
+  distributionSearchKey = "";
+  distributionLoad = false;
+  // 已完成列表
+  completedList = [];
+  completedIdx = 0;
+  completedTotal = 0;
+  completedFlag = false;
+  completedSearchKey = "";
+  completedLoad = false;
 
   // other
   loginUser: any = localStorage.getItem("user")
@@ -66,6 +88,9 @@ export class Pharmacy2Component implements OnInit {
   logTimeConst = 60; //自动刷新秒数
 
   ngOnInit() {
+    // 统计
+    this.total();
+    // 切换科室
     this.changeKs();
     // 待配药列表
     this.getPharmacyList(this.printPharmacyIdx, 1, this.printPharmacySearchKey);
@@ -73,14 +98,53 @@ export class Pharmacy2Component implements OnInit {
     this.getPharmacyList(this.waitPharmacyIdx, 2, this.waitPharmacySearchKey);
     // 核对中列表
     this.getPharmacyList(this.pharmacyIdx, 3, this.pharmacySearchKey);
+    // 配送中列表
+    this.getPharmacyList(this.distributionIdx, 4, this.distributionSearchKey);
+    // 已完成列表
+    this.getPharmacyList(this.completedIdx, 5, this.completedSearchKey);
     this.initRole();
     // 自动刷新倒计时 start
     this.autoUpdate();
     // 自动刷新倒计时 end
   }
+  // 统计
+  total() {
+    let launch = {
+      id: JSON.parse(localStorage.getItem("user")).user.dept.id,
+    };
+    let startTime = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+    let endTime = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+    let postData = {
+      startTime,
+      endTime,
+      launch,
+    };
+
+    this.mainService.getDrugsBagStateCount(postData).subscribe((res: any) => {
+      if (res.status == 200) {
+        this.todayTotal = res.countMap.todayTotal;
+        this.todayComplete = res.countMap.todayComplete;
+      }
+    });
+  }
+  // 查看流程信息弹窗
+  logPromptModalShow = false; //弹窗开关
+  packid = ""; //查看记录携带packid
+  showLogs(data) {
+    clearInterval(this.logTimer);
+    this.packid = data.packid;
+    this.logPromptModalShow = true;
+  }
+  // 关闭流程信息弹窗
+  closeModelLog(e) {
+    this.logPromptModalShow = JSON.parse(e).show;
+    this.autoUpdate(false);
+  }
   // 自动刷新倒计时
-  autoUpdate(){
-    this.logTime = this.logTimeConst;
+  autoUpdate(flag = true) {
+    if (flag) {
+      this.logTime = this.logTimeConst;
+    }
     clearInterval(this.logTimer);
     this.logTimer = setInterval(() => {
       this.logTime--;
@@ -92,15 +156,21 @@ export class Pharmacy2Component implements OnInit {
         this.getPharmacyList(0, 2, this.waitPharmacySearchKey);
         // 核对中列表
         this.getPharmacyList(0, 3, this.pharmacySearchKey);
+        // 配送中列表
+        this.getPharmacyList(0, 4, this.distributionSearchKey);
+        // 已完成列表
+        this.getPharmacyList(0, 5, this.completedSearchKey);
       }
     }, 1000);
   }
   // 药房端药房列表查询、搜索
-  // 1为pc待打印状态、2为pc配药中、3为pc核对中
+  // 1为pc待打印状态、2为pc配药中、3为pc核对中、4为pc配送中
   // searchKey  为搜索的关键字，没有就不传
   loading1 = false;
   loading2 = false;
   loading3 = false;
+  loading4 = false;
+  loading5 = false;
   getPharmacyList(idx, type, searchKey) {
     let launch = {
       id: JSON.parse(localStorage.getItem("user")).user.dept.id,
@@ -115,11 +185,17 @@ export class Pharmacy2Component implements OnInit {
       case 3:
         this.loading3 = true;
         break;
+      case 4:
+        this.loading4 = true;
+        break;
+      case 5:
+        this.loading5 = true;
+        break;
     }
     let postData = {
       idx,
       sum: 10,
-      drugsBag: { searchType: type, searchKey, launch },
+      drugsBag: { searchState: type, searchKey, launch, platform: 3 },
     };
     this.mainService
       .getFetchDataList("api", "drugsBag", postData)
@@ -134,10 +210,18 @@ export class Pharmacy2Component implements OnInit {
           case 3:
             this.loading3 = false;
             break;
+          case 4:
+            this.loading4 = false;
+            break;
+          case 5:
+            this.loading5 = false;
+            break;
         }
         if (result["status"] == 200) {
           switch (type) {
             case 1:
+              // 总数
+              this.printPharmacyTotal = result.totalNum;
               // 隐藏按钮的loading
               this.printPharmacyLoad = false;
               // 查看更多，是否显示
@@ -149,9 +233,9 @@ export class Pharmacy2Component implements OnInit {
                 this.printPharmacyFlag = true;
               }
               // 列表数据合并
-              if(idx === 0){
+              if (idx === 0) {
                 this.printPharmacyList = result["list"];
-              }else{
+              } else {
                 this.printPharmacyList = [
                   ...this.printPharmacyList,
                   ...result["list"],
@@ -159,6 +243,7 @@ export class Pharmacy2Component implements OnInit {
               }
               break;
             case 2:
+              this.waitPharmacyTotal = result.totalNum;
               this.waitPharmacyLoad = false;
               if (result["list"].length < 10) {
                 this.waitPharmacyFlag = false;
@@ -167,9 +252,9 @@ export class Pharmacy2Component implements OnInit {
               } else {
                 this.waitPharmacyFlag = true;
               }
-              if(idx === 0){
+              if (idx === 0) {
                 this.waitPharmacyList = result["list"];
-              }else{
+              } else {
                 this.waitPharmacyList = [
                   ...this.waitPharmacyList,
                   ...result["list"],
@@ -177,6 +262,7 @@ export class Pharmacy2Component implements OnInit {
               }
               break;
             case 3:
+              this.pharmacyTotal = result.totalNum;
               this.pharmacyLoad = false;
               if (result["list"].length < 10) {
                 this.pharmacyFlag = false;
@@ -185,15 +271,47 @@ export class Pharmacy2Component implements OnInit {
               } else {
                 this.pharmacyFlag = true;
               }
-              if(idx === 0){
+              if (idx === 0) {
                 this.pharmacyList = result["list"];
-              }else{
-                this.pharmacyList = [
-                  ...this.pharmacyList,
+              } else {
+                this.pharmacyList = [...this.pharmacyList, ...result["list"]];
+              }
+              break;
+            case 4:
+              this.distributionTotal = result.totalNum;
+              this.distributionLoad = false;
+              if (result["list"].length < 10) {
+                this.distributionFlag = false;
+              } else if (result["list"].length === 0 && idx === 0) {
+                this.distributionFlag = false;
+              } else {
+                this.distributionFlag = true;
+              }
+              if (idx === 0) {
+                this.distributionList = result["list"];
+              } else {
+                this.distributionList = [
+                  ...this.distributionList,
                   ...result["list"],
                 ];
               }
               break;
+            case 5:
+              this.completedTotal = result.totalNum;
+              this.completedLoad = false;
+              if (result["list"].length < 10) {
+                this.completedFlag = false;
+              } else if (result["list"].length === 0 && idx === 0) {
+                this.completedFlag = false;
+              } else {
+                this.completedFlag = true;
+              }
+              if (idx === 0) {
+                this.completedList = result["list"];
+              } else {
+                this.completedList = [...this.completedList, ...result["list"]];
+              }
+              break;
           }
         }
       });
@@ -224,6 +342,20 @@ export class Pharmacy2Component implements OnInit {
         this.pharmacyLoad = true;
         this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
         break;
+      case 4:
+        this.distributionIdx++;
+        this.distributionLoad = true;
+        this.getPharmacyList(
+          this.distributionIdx,
+          type,
+          this.distributionSearchKey
+        );
+        break;
+      case 5:
+        this.completedIdx++;
+        this.completedLoad = true;
+        this.getPharmacyList(this.completedIdx, type, this.completedSearchKey);
+        break;
     }
   }
   // 搜索关键词
@@ -252,6 +384,20 @@ export class Pharmacy2Component implements OnInit {
         this.pharmacyList = []; //列表重置
         this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
         break;
+      case 4:
+        this.distributionIdx = 0; //页码重置
+        this.distributionList = []; //列表重置
+        this.getPharmacyList(
+          this.distributionIdx,
+          type,
+          this.distributionSearchKey
+        );
+        break;
+      case 5:
+        this.completedIdx = 0; //页码重置
+        this.completedList = []; //列表重置
+        this.getPharmacyList(this.completedIdx, type, this.completedSearchKey);
+        break;
     }
   }
   // 退出
@@ -418,4 +564,3 @@ export class Pharmacy2Component implements OnInit {
     }, 1000);
   }
 }
-