药房2临时版本

src/app/app-routing.module.ts

@@ -39,6 +39,11 @@ const routes: Routes = [
     loadChildren: () => import('./views/pharmacy/pharmacy.module').then(m => m.PharmacyModule),
     canActivate: [PharmacyGuard]
   },
+  {
+    path: 'pharmacy2',//药房端2
+    loadChildren: () => import('./views/pharmacy2/pharmacy2.module').then(m => m.Pharmacy2Module),
+    canActivate: [PharmacyGuard]
+  },
   { path: '**', redirectTo: 'main/home' }
 
 ];

src/app/views/pharmacy2/pharmacy2-routing.module.ts

@@ -0,0 +1,11 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { Pharmacy2Component } from "./pharmacy2.component";
+
+const routes: Routes = [{ path: "", component: Pharmacy2Component }];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class Pharmacy2RoutingModule {}

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

@@ -0,0 +1,586 @@
+<div class="pharmacy">
+  <!-- 头部 start -->
+  <div class="pharmacy-header">
+    <div class="pharmacy-logo">
+      <img
+        src="./../../assets/images/login_logo.png"
+        class="pharmacy-logo__img"
+        alt=""
+      />
+      <h1 class="pharmacy-logo__name">大势医院输送保障管理平台</h1>
+    </div>
+    <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>
+    </div>
+    <div class="userInfo">
+      <div class="wel">欢迎您：</div>
+      <div class="user">
+        <img src="../../assets/images/icon_keshi.png" alt="" />
+        <span *ngIf="deptDisplay">{{
+          deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept
+        }}</span>
+      </div>
+      <div class="userInfo-wrap">
+        <div class="logOut" (click)="changeKsNow()">切换科室</div>
+        <div class="logOut" (click)="logOut()">退出</div>
+      </div>
+    </div>
+  </div>
+  <!-- 头部 end -->
+  <!-- 主体部分 start -->
+  <div class="pharmacy-main">
+    <!-- 待配药 start -->
+    <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> -->
+        <span class="autoUpdate">{{ logTime }}秒</span>
+      </div>
+      <!-- 标题 end -->
+      <!-- 搜索框 start -->
+      <div class="pharmacy-main__search">
+        <div class="pharmacy-main__searchInput">
+          <input
+            nz-input
+            placeholder="请输入关键字"
+            [(ngModel)]="printPharmacySearchKey"
+          />
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(1)">
+            <i nz-icon nzType="search"></i>
+            <span>搜索</span>
+          </div>
+        </div>
+      </div>
+      <!-- 搜索框 end -->
+      <!-- 列表 start -->
+      <overlay-scrollbars #osComponentRef1 class="pharmacy-main__selectionWrap">
+        <div *ngIf="!loading1" style="height: 100%">
+          <div
+            class="pharmacy-main__selection"
+            *ngFor="let item of printPharmacyList"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <div class="pharmacy-main__selectionItem">
+                <strong>{{ item.target ? item.target.dept : "" }}</strong>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span>单号：{{ item.packid }}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span
+                  >记账时间：<ng-container *ngIf="item.bagTime">{{
+                    item.bagTime | date: "MM-dd HH:mm"
+                  }}</ng-container
+                  ><ng-container *ngIf="!item.bagTime">无</ng-container></span
+                >
+              </div>
+            </div>
+          </div>
+          <div
+            class="pharmacy-main__selection pharmacy-main__selection--noData"
+            *ngIf="printPharmacyList.length === 0"
+          >
+            <img src="./../../assets/images/image_kongbaiye.png" alt="" />
+          </div>
+          <div
+            (click)="loadMore(1)"
+            class="pharmacy-main__selection pharmacy-main__selection--more"
+            *ngIf="printPharmacyFlag"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <i
+                nz-icon
+                nzType="loading"
+                nzTheme="outline"
+                class="pharmacy-main__selection--icon"
+                *ngIf="printPharmacyLoad"
+              ></i
+              >查看更多
+            </div>
+          </div>
+        </div>
+        <div
+          *ngIf="loading1"
+          style="height: calc(100vh - 212px); min-height: 556px"
+        >
+          <div
+            class="loadingFull display_flex justify-content_flex-center align-items_center"
+          >
+            <div class="loadingFullInner">
+              <img src="../../../assets/images/loading.gif" alt="" />
+              <div>加载中...</div>
+            </div>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <!-- 列表 end -->
+    </div>
+    <!-- 待配药 end -->
+    <!-- 配药中 start -->
+    <div class="pharmacy-main__list pharmacy-main__waitDelivery">
+      <!-- 标题 start -->
+      <div class="pharmacy-main__title">
+        <strong>配药中（3）</strong>
+        <span class="autoUpdate">{{ logTime }}秒</span>
+      </div>
+      <!-- 标题 end -->
+      <!-- 搜索框 start -->
+      <div class="pharmacy-main__search">
+        <div class="pharmacy-main__searchInput">
+          <input
+            nz-input
+            placeholder="请输入关键字"
+            [(ngModel)]="waitPharmacySearchKey"
+          />
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(2)">
+            <i nz-icon nzType="search"></i>
+            <span>搜索</span>
+          </div>
+        </div>
+      </div>
+      <!-- 搜索框 end -->
+      <!-- 列表 start -->
+      <overlay-scrollbars #osComponentRef2 class="pharmacy-main__selectionWrap">
+        <div *ngIf="!loading2" style="height: 100%">
+          <div
+            class="pharmacy-main__selection"
+            *ngFor="let item of waitPharmacyList; let i = index"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <div class="pharmacy-main__selectionItem">
+                <strong>{{ item.target ? item.target.dept : "" }}</strong>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span>单号：{{ item.packid }}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span
+                  >记账时间：<ng-container *ngIf="item.bagTime">{{
+                    item.bagTime | date: "MM-dd HH:mm"
+                  }}</ng-container
+                  ><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"
+          >
+            <img src="./../../assets/images/image_kongbaiye.png" alt="" />
+          </div>
+          <div
+            (click)="loadMore(2)"
+            class="pharmacy-main__selection pharmacy-main__selection--more"
+            *ngIf="waitPharmacyFlag"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <i
+                nz-icon
+                nzType="loading"
+                nzTheme="outline"
+                class="pharmacy-main__selection--icon"
+                *ngIf="waitPharmacyLoad"
+              ></i
+              >查看更多
+            </div>
+          </div>
+        </div>
+        <div
+          *ngIf="loading2"
+          style="height: calc(100vh - 212px); min-height: 556px"
+        >
+          <div
+            class="loadingFull display_flex justify-content_flex-center align-items_center"
+          >
+            <div class="loadingFullInner">
+              <img src="../../../assets/images/loading.gif" alt="" />
+              <div>加载中...</div>
+            </div>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <!-- 列表 end -->
+    </div>
+    <!-- 配药中 end -->
+    <!-- 核对中 start -->
+    <div class="pharmacy-main__list pharmacy-main__delivery">
+      <!-- 标题 start -->
+      <div class="pharmacy-main__title">
+        <strong>核对中（3）</strong>
+        <span class="autoUpdate">{{ logTime }}秒</span>
+      </div>
+      <!-- 标题 end -->
+      <!-- 搜索框 start -->
+      <div class="pharmacy-main__search">
+        <div class="pharmacy-main__searchInput">
+          <input
+            nz-input
+            placeholder="请输入关键字"
+            [(ngModel)]="pharmacySearchKey"
+          />
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(3)">
+            <i nz-icon nzType="search"></i>
+            <span>搜索</span>
+          </div>
+        </div>
+      </div>
+      <!-- 搜索框 end -->
+      <!-- 列表 start -->
+      <overlay-scrollbars #osComponentRef3 class="pharmacy-main__selectionWrap">
+        <div *ngIf="!loading3" style="height: 100%">
+          <div
+            class="pharmacy-main__selection"
+            *ngFor="let item of waitPharmacyList; let i = index"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <div class="pharmacy-main__selectionItem">
+                <strong>{{ item.target ? item.target.dept : "" }}</strong>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span>单号：{{ item.packid }}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span
+                  >记账时间：<ng-container *ngIf="item.bagTime">{{
+                    item.bagTime | date: "MM-dd HH:mm"
+                  }}</ng-container
+                  ><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"
+          >
+            <img src="./../../assets/images/image_kongbaiye.png" alt="" />
+          </div>
+          <div
+            (click)="loadMore(3)"
+            class="pharmacy-main__selection pharmacy-main__selection--more"
+            *ngIf="pharmacyFlag"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <i
+                nz-icon
+                nzType="loading"
+                nzTheme="outline"
+                class="pharmacy-main__selection--icon"
+                *ngIf="pharmacyLoad"
+              ></i
+              >查看更多
+            </div>
+          </div>
+        </div>
+        <div
+          *ngIf="loading3"
+          style="height: calc(100vh - 212px); min-height: 556px"
+        >
+          <div
+            class="loadingFull display_flex justify-content_flex-center align-items_center"
+          >
+            <div class="loadingFullInner">
+              <img src="../../../assets/images/loading.gif" alt="" />
+              <div>加载中...</div>
+            </div>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <!-- 列表 end -->
+    </div>
+    <!-- 核对中 end -->
+
+    <!-- 临时增加 start -->
+    <!-- 核对中 start -->
+    <div class="pharmacy-main__list pharmacy-main__delivery">
+      <!-- 标题 start -->
+      <div class="pharmacy-main__title">
+        <strong>配送中（3）</strong>
+        <span class="autoUpdate">{{ logTime }}秒</span>
+      </div>
+      <!-- 标题 end -->
+      <!-- 搜索框 start -->
+      <div class="pharmacy-main__search">
+        <div class="pharmacy-main__searchInput">
+          <input
+            nz-input
+            placeholder="请输入关键字"
+            [(ngModel)]="pharmacySearchKey"
+          />
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(3)">
+            <i nz-icon nzType="search"></i>
+            <span>搜索</span>
+          </div>
+        </div>
+      </div>
+      <!-- 搜索框 end -->
+      <!-- 列表 start -->
+      <overlay-scrollbars #osComponentRef4 class="pharmacy-main__selectionWrap">
+        <div *ngIf="!loading3" style="height: 100%">
+          <div
+            class="pharmacy-main__selection"
+            *ngFor="let item of waitPharmacyList; let i = index"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <div class="pharmacy-main__selectionItem">
+                <strong>{{ item.target ? item.target.dept : "" }}</strong>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span>单号：{{ item.packid }}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span
+                  >记账时间：<ng-container *ngIf="item.bagTime">{{
+                    item.bagTime | date: "MM-dd HH:mm"
+                  }}</ng-container
+                  ><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"
+          >
+            <img src="./../../assets/images/image_kongbaiye.png" alt="" />
+          </div>
+          <div
+            (click)="loadMore(3)"
+            class="pharmacy-main__selection pharmacy-main__selection--more"
+            *ngIf="pharmacyFlag"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <i
+                nz-icon
+                nzType="loading"
+                nzTheme="outline"
+                class="pharmacy-main__selection--icon"
+                *ngIf="pharmacyLoad"
+              ></i
+              >查看更多
+            </div>
+          </div>
+        </div>
+        <div
+          *ngIf="loading3"
+          style="height: calc(100vh - 212px); min-height: 556px"
+        >
+          <div
+            class="loadingFull display_flex justify-content_flex-center align-items_center"
+          >
+            <div class="loadingFullInner">
+              <img src="../../../assets/images/loading.gif" alt="" />
+              <div>加载中...</div>
+            </div>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <!-- 列表 end -->
+    </div>
+    <!-- 核对中 end -->
+    <!-- 核对中 start -->
+    <div class="pharmacy-main__list pharmacy-main__delivery">
+      <!-- 标题 start -->
+      <div class="pharmacy-main__title">
+        <strong>已完成（3）</strong>
+        <span class="autoUpdate">{{ logTime }}秒</span>
+      </div>
+      <!-- 标题 end -->
+      <!-- 搜索框 start -->
+      <div class="pharmacy-main__search">
+        <div class="pharmacy-main__searchInput">
+          <input
+            nz-input
+            placeholder="请输入关键字"
+            [(ngModel)]="pharmacySearchKey"
+          />
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle(3)">
+            <i nz-icon nzType="search"></i>
+            <span>搜索</span>
+          </div>
+        </div>
+      </div>
+      <!-- 搜索框 end -->
+      <!-- 列表 start -->
+      <overlay-scrollbars #osComponentRef5 class="pharmacy-main__selectionWrap">
+        <div *ngIf="!loading3" style="height: 100%">
+          <div
+            class="pharmacy-main__selection"
+            *ngFor="let item of waitPharmacyList; let i = index"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <div class="pharmacy-main__selectionItem">
+                <strong>{{ item.target ? item.target.dept : "" }}</strong>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span>单号：{{ item.packid }}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span
+                  >记账时间：<ng-container *ngIf="item.bagTime">{{
+                    item.bagTime | date: "MM-dd HH:mm"
+                  }}</ng-container
+                  ><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"
+          >
+            <img src="./../../assets/images/image_kongbaiye.png" alt="" />
+          </div>
+          <div
+            (click)="loadMore(3)"
+            class="pharmacy-main__selection pharmacy-main__selection--more"
+            *ngIf="pharmacyFlag"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <i
+                nz-icon
+                nzType="loading"
+                nzTheme="outline"
+                class="pharmacy-main__selection--icon"
+                *ngIf="pharmacyLoad"
+              ></i
+              >查看更多
+            </div>
+          </div>
+        </div>
+        <div
+          *ngIf="loading3"
+          style="height: calc(100vh - 212px); min-height: 556px"
+        >
+          <div
+            class="loadingFull display_flex justify-content_flex-center align-items_center"
+          >
+            <div class="loadingFullInner">
+              <img src="../../../assets/images/loading.gif" alt="" />
+              <div>加载中...</div>
+            </div>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <!-- 列表 end -->
+    </div>
+    <!-- 核对中 end -->
+    <!-- 临时增加 end -->
+  </div>
+  <!-- 主体部分 end -->
+  <!-- 二维码打印 -->
+  <div id="report" style="display: none">
+    <div style="display: inline-block" *ngFor="let img of codes">
+      <img style="width: 200px; height: 200px" [src]="img.base64" alt="" />
+      <div
+        style="
+          text-align: center;
+          font-size: 12px;
+          width: 200px;
+          font-weight: bold;
+          color: #0a0a0a;
+        "
+      >
+        {{ img.target }}
+      </div>
+      <div
+        style="
+          text-align: center;
+          font-size: 12px;
+          width: 200px;
+          font-weight: bold;
+          color: #0a0a0a;
+        "
+      >
+        {{ img.creatTime | date: "MM-dd HH:mm" }}
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 药房端科室切换提示框 -->
+<app-hs-prompt-modal
+  [changeShow]="changeShow"
+  [closeTime]="closeTime"
+  [closeTimeFlag]="closeTimeFlag"
+  [show]="hsPromptModalShow"
+  (closeModelHs)="closeModelHs($event)"
+  (clearModelHs)="clearModelHs($event)"
+  deptType="pharmacy"
+>
+  <!-- 返回系统按钮 -->
+  <!-- 右侧悬浮框 -->
+  <div id="fixedMenu" class="fixed" *ngIf="mainRole">
+    <div class="right">
+      <div class="fixedMenu hujiaozhongxin">
+        <div class="menuItems">
+          <div class="item">快捷菜单</div>
+        </div>
+      </div>
+      <div class="fixedMenu">
+        <div class="menuItems">
+          <div
+            class="others"
+            [ngStyle]="{
+              height: showLastItems
+                ? mainRole
+                  ? 35 * 2 + 'px'
+                  : 35 * 1 + 'px'
+                : 0
+            }"
+          >
+            <div
+              [ngClass]="{ item: true, checked: fixedTab == 'back' }"
+              *ngIf="mainRole"
+              (click)="checkFixedTab('toSystem')"
+            >
+              返回系统
+            </div>
+          </div>
+        </div>
+        <div class="arrow" *ngIf="!showLastItems" (click)="fixedMenuXiala()">
+          <i class="icon_transport transport-xiala2-01"></i>
+        </div>
+        <div class="arrow" *ngIf="showLastItems" (click)="fixedMenuShangla()">
+          <i class="icon_transport transport-shangla-"></i>
+        </div>
+      </div>
+    </div>
+    <div
+      *ngIf="showLastItems && fixedTab != ''"
+      (click)="fixedMenuShangla()"
+      class="fixedMark"
+    ></div>
+  </div>
+</app-hs-prompt-modal>

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

@@ -0,0 +1,498 @@
+@import "../../../../src/theme.less";
+:host {
+	width: 100%;
+  background-color: #f9fafb;
+  .ant-btn[disabled]{
+    color: rgba(0, 0, 0, 0.25)!important;
+    background-color: #f5f5f5!important;
+  }
+  .red{
+    color: red!important;
+    font-weight: bold!important;
+  }
+  .green{
+    color: @primary-color!important;
+    font-weight: bold!important;
+  }
+
+	h1,
+	h2,
+	h3,
+	p {
+		margin: 0;
+	}
+	em {
+		font-style: normal;
+  }
+  .pharmacy{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+
+	// 头部 start
+	.pharmacy-header {
+		height: 88px;
+		background-color: #fff;
+		border-bottom: 1px solid #e5e9ed;
+		box-sizing: border-box;
+		display: flex;
+
+		.pharmacy-logo {
+			width: 221px;
+			background-color: #0f2e3b;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.pharmacy-logo__img {
+				width: 32px;
+			}
+
+			.pharmacy-logo__name {
+				font-size: 14px;
+				color: #fff;
+			}
+		}
+
+		.pharmacy-name {
+      flex: 1;
+			border-right: 1px solid #e5e9ed;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+			.pharmacy-name__title {
+				font-size: 22px;
+				color: #333;
+				margin-left: 43px;
+				line-height: 87px;
+			}
+      .pharmacy-name__total{
+        margin-right: 16px;
+        font-size: 16px;
+      }
+		}
+
+		.pharmacy-operate {
+			width: 211px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: relative;
+			.pharmacy-operatePop {
+        cursor: pointer;
+        border: 1px solid #e5e9ed;
+				background-color: #fff;
+				position: absolute;
+				left: 0;
+				top: 100%;
+				width: 100%;
+				height: 34px;
+				line-height: 34px;
+				text-align: center;
+				font-size: 14px;
+				color: @primary-color;
+			}
+
+			&:after {
+				content: '';
+				display: block;
+				width: 0;
+				height: 0;
+				border-left: 7px solid transparent;
+				border-right: 7px solid transparent;
+				border-top: 10px solid #666;
+			}
+
+			.pharmacy-operate__img {
+				max-height: 40px;
+				margin-right: 8px;
+			}
+
+			.pharmacy-operate__title {
+				font-size: 20px;
+				color: #666;
+				padding-right: 24px;
+				cursor: pointer;
+			}
+		}
+	}
+  .userInfo {
+    width: 336px;
+    height: 100%;
+    float: right;
+    padding: 8px;
+    box-sizing: border-box;
+    font-size: 14px;
+    border-left: 1px solid #e5e9ed;
+
+    .wel {
+      line-height: 15px;
+    }
+
+    .user {
+      font-size: 20px;
+      height: 36px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      line-height: normal;
+
+      img {
+        height: 100%;
+        margin-right: 8px;
+      }
+    }
+    .userInfo-wrap {
+      display: flex;
+      justify-content: flex-end;
+      .logOut {
+        display: inline-block;
+        text-align: right;
+        color: @primary-color;
+        line-height: 20px;
+        cursor: pointer;
+        margin-right: 8px;
+      }
+    }
+  }
+	// 头部 end
+	// 主体部分 start
+	.pharmacy-main {
+    height: calc(100vh - 88px);
+    min-height: 680px;
+    flex: 1;
+		padding: 16px;
+		display: flex;
+		justify-content: space-between;
+		.pharmacy-main__list {
+      display: flex;
+      flex-direction: column;
+			background-color: #f9fafb;
+			flex: 1;
+      margin: 0 4px;
+			box-sizing: border-box;
+			border: 1px solid #e5e9ed;
+			// 标题 start
+			.pharmacy-main__title {
+				height: 40px;
+				background-color: #fff;
+				font-size: 16px;
+				color: #333;
+				font-weight: 700;
+				padding-left: 8px;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				border-bottom: 1px solid #e5e9ed;
+        .autoUpdate{
+          font-size: 14px;
+          color: #49b856;
+          margin-right: 8px;
+        }
+				.pharmacy-main__printAll {
+					// width: 80px;
+					height: 28px;
+					line-height: 28px;
+					margin-right: 16px;
+					background-color: @primary-color;
+					font-size: 14px;
+					color: #fff;
+					border-radius: 4px;
+          text-align: center;
+          display: flex;
+          justify-content: center;
+				}
+			}
+			// 标题 end
+			// 搜索框 start
+			.pharmacy-main__search {
+				padding: 8px;
+				position: relative;
+				.pharmacy-main__searchInput {
+					border-radius: 100px;
+					padding-right: 82px;
+					border: 1px solid #e5e9ed;
+					background-color: #fff;
+					overflow: hidden;
+					input {
+						border: none;
+					}
+					.ant-input:focus {
+						border-color: #fff;
+						outline: 0;
+						box-shadow: 0 0 0 2px #fff;
+					}
+					.pharmacy-main__searchText {
+						cursor: pointer;
+						position: absolute;
+						top: 13px;
+						right: 8px;
+						width: 74px;
+						height: 22px;
+						border-left: 1px solid #e5e9ed;
+						color: #999;
+						padding-left: 8px;
+						box-sizing: border-box;
+						span {
+							color: @primary-color;
+							margin-left: 8px;
+						}
+					}
+				}
+			}
+			// 搜索框 end
+			// 列表 start
+			.pharmacy-main__selectionWrap {
+        flex: 1;
+				// height: 630px;
+				overflow: auto;
+				&:first-child {
+					border-top: 1px solid #e5e9ed;
+				}
+				.pharmacy-main__selection {
+					box-sizing: border-box;
+					border-bottom: 1px solid #e5e9ed;
+          display: flex;
+          &.pharmacy-main__selection--more{
+            color: @primary-color;
+            height: 34px;
+            cursor: pointer;
+            .pharmacy-main__selectionInfo{
+              justify-content: center;
+              align-items: center;
+              flex-direction: row;
+              .pharmacy-main__selection--icon{
+                margin-right: 8px;
+              }
+            }
+          }
+          &.pharmacy-main__selection--noData{
+            height: calc(100vh - 212px);
+            min-height: 556px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            img{
+              width: 100px;
+            }
+          }
+					.pharmacy-main__selectionInfo {
+						padding: 8px;
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						.pharmacy-main__selectionItem {
+							display: flex;
+              justify-content: space-between;
+              padding: 0 8px;
+							span {
+								color: #666;
+                font-size: 12px;
+							}
+							strong {
+								color: #333;
+								font-weight: 700;
+								font-size: 14px;
+							}
+						}
+					}
+					.pharmacy-main__selectionPrint {
+						width: 90px;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						border-left: 1px solid #e5e9ed;
+						.pharmacy-main__selectionPrintBtn {
+							width: 60px;
+							height: 28px;
+							line-height: 28px;
+							border-radius: 4px;
+							border: 1px solid @primary-color;
+							color: @primary-color;
+							text-align: center;
+							cursor: pointer;
+						}
+					}
+				}
+			}
+			// 列表 end
+		}
+	}
+	// 主体部分 end
+
+
+
+
+
+
+
+
+
+
+
+  // 右侧悬浮菜单
+  .fixed {
+    position: fixed;
+    top: 40%;
+    right: 0;
+    z-index: 99;
+    border-radius: 5px 0 0 5px;
+
+    .fixedMark {
+      position: fixed;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      background: rgba(0, 0, 0, .2);
+      z-index: 88;
+    }
+
+    // overflow: hidden;
+    &>.left {
+      width: 480px;
+      // height: 280px;
+      float: left;
+      background: #fff;
+      padding: 16px;
+      border-radius: 5px;
+      border: 1px solid #e5e9ed;
+      // box-shadow: -8px 5px 15px #eae9e9;
+      position: relative;
+      z-index: 98;
+
+      .con {
+        background: #f9fafb;
+        width: 100%;
+        height: 100%;
+        border-radius: 5px;
+        border: 1px solid #e5e9ed;
+        padding: 16px 20px;
+
+        &.tableCon {
+          padding: 0;
+
+          .table {
+            font-size: 14px;
+
+            tr {
+              td {
+                padding: 15px 6px;
+                text-align: center;
+
+                &>.tdiv {
+                  overflow: hidden;
+
+                  .name {
+                    float: left;
+                  }
+
+                  .num {
+                    float: right;
+                    font-size: 12px;
+
+                    span {
+                      color: @primary-color;
+                      font-size: 14px;
+                    }
+                  }
+                }
+
+                .notOpen {
+                  color: #666;
+                  font-size: 12px;
+
+                  img {
+                    margin-bottom: 8px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        .title {
+          color: #333;
+          text-align: center;
+        }
+
+        .conditions {
+          &>.ant-row {
+            margin: 8px 0;
+
+            .ant-row {
+              .ant-col-6 {
+                margin: 2px 0;
+              }
+            }
+
+            .checkAll {
+              width: 100%;
+              border-bottom: 1px solid rgb(233, 233, 233);
+              color: @primary-color;
+            }
+          }
+        }
+
+        .btns {
+          padding: 5px 20px 0 20px;
+        }
+      }
+    }
+
+    .right {
+      // opacity: .5;
+      width: 80px;
+      float: left;
+      background: rgba(255, 255, 255, .5);
+      border-radius: 5px 0 0 5px;
+      position: relative;
+      z-index: 98;
+
+      .fixedMenu {
+        border: 1px solid #e5e9ed;
+        color: rgba(0, 128, 0, .5);
+        background: rgba(255, 255, 255, .5);
+        text-align: center;
+        border-radius: 5px 0 0 5px;
+        // box-shadow: -3px 4px 15px rgba(234, 233, 233, .5);
+
+        &.hujiaozhongxin {
+          margin-bottom: 5px;
+        }
+
+        .menuItems {
+          .item {
+            height: 35px;
+            line-height: 35px;
+            padding: 0 6px;
+            cursor: default;
+            border-bottom: 1px solid #e5e9ed;
+            user-select: none;
+
+            &.checked {
+              background: #fff;
+              color: #52ab77;
+              opacity: 1;
+              box-shadow: -3px 4px 7px #eae9e9;
+            }
+          }
+
+          .others {
+            transition: height .4s linear;
+            overflow: hidden;
+          }
+        }
+
+        .arrow {
+          cursor: pointer;
+        }
+      }
+
+    }
+  }
+
+}

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

@@ -0,0 +1,421 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { Router } from "@angular/router";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+
+@Component({
+  selector: "app-pharmacy2",
+  templateUrl: "./pharmacy2.component.html",
+  styleUrls: ["./pharmacy2.component.less"],
+})
+export class Pharmacy2Component implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef3: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef4", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef4: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef5", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef5: OverlayScrollbarsComponent;
+  constructor(private mainService: MainService, public router: Router) {}
+  //待配药数据
+  codes = [];
+  // 待配药
+  printPharmacyList = []; //数据列表
+  printPharmacyIdx = 0; //页码
+  printPharmacyFlag = false; //是否查看更多
+  printPharmacySearchKey = ""; //搜索的内容
+  printPharmacyLoad = false; //按钮的loading
+  // 配药中列表
+  waitPharmacyList = [];
+  waitPharmacyIdx = 0;
+  waitPharmacyFlag = false;
+  waitPharmacySearchKey = "";
+  waitPharmacyLoad = false;
+  // 核对中列表
+  pharmacyList = [];
+  pharmacyIdx = 0;
+  pharmacyFlag = false;
+  pharmacySearchKey = "";
+  pharmacyLoad = false;
+
+  // other
+  loginUser: any = localStorage.getItem("user")
+    ? JSON.parse(localStorage.getItem("user")).user
+    : null; //登录人信息
+
+  logTimer = null; //定时器
+  logTime = 0; //自动刷新秒数
+  logTimeConst = 60; //自动刷新秒数
+
+  ngOnInit() {
+    this.changeKs();
+    // 待配药列表
+    this.getPharmacyList(this.printPharmacyIdx, 1, this.printPharmacySearchKey);
+    // 配药中列表
+    this.getPharmacyList(this.waitPharmacyIdx, 2, this.waitPharmacySearchKey);
+    // 核对中列表
+    this.getPharmacyList(this.pharmacyIdx, 3, this.pharmacySearchKey);
+    this.initRole();
+    // 自动刷新倒计时 start
+    this.autoUpdate();
+    // 自动刷新倒计时 end
+  }
+  // 自动刷新倒计时
+  autoUpdate(){
+    this.logTime = this.logTimeConst;
+    clearInterval(this.logTimer);
+    this.logTimer = setInterval(() => {
+      this.logTime--;
+      if (this.logTime === 0) {
+        this.logTime = this.logTimeConst;
+        // 待配药列表
+        this.getPharmacyList(0, 1, this.printPharmacySearchKey);
+        // 配药中列表
+        this.getPharmacyList(0, 2, this.waitPharmacySearchKey);
+        // 核对中列表
+        this.getPharmacyList(0, 3, this.pharmacySearchKey);
+      }
+    }, 1000);
+  }
+  // 药房端药房列表查询、搜索
+  // 1为pc待打印状态、2为pc配药中、3为pc核对中
+  // searchKey  为搜索的关键字，没有就不传
+  loading1 = false;
+  loading2 = false;
+  loading3 = false;
+  getPharmacyList(idx, type, searchKey) {
+    let launch = {
+      id: JSON.parse(localStorage.getItem("user")).user.dept.id,
+    };
+    switch (type) {
+      case 1:
+        this.loading1 = true;
+        break;
+      case 2:
+        this.loading2 = true;
+        break;
+      case 3:
+        this.loading3 = true;
+        break;
+    }
+    let postData = {
+      idx,
+      sum: 10,
+      drugsBag: { searchType: type, searchKey, launch },
+    };
+    this.mainService
+      .getFetchDataList("api", "drugsBag", postData)
+      .subscribe((result) => {
+        switch (type) {
+          case 1:
+            this.loading1 = false;
+            break;
+          case 2:
+            this.loading2 = false;
+            break;
+          case 3:
+            this.loading3 = false;
+            break;
+        }
+        if (result["status"] == 200) {
+          switch (type) {
+            case 1:
+              // 隐藏按钮的loading
+              this.printPharmacyLoad = false;
+              // 查看更多，是否显示
+              if (result["list"].length < 10) {
+                this.printPharmacyFlag = false;
+              } else if (result["list"].length === 0 && idx === 0) {
+                this.printPharmacyFlag = false;
+              } else {
+                this.printPharmacyFlag = true;
+              }
+              // 列表数据合并
+              if(idx === 0){
+                this.printPharmacyList = result["list"];
+              }else{
+                this.printPharmacyList = [
+                  ...this.printPharmacyList,
+                  ...result["list"],
+                ];
+              }
+              break;
+            case 2:
+              this.waitPharmacyLoad = false;
+              if (result["list"].length < 10) {
+                this.waitPharmacyFlag = false;
+              } else if (result["list"].length === 0 && idx === 0) {
+                this.waitPharmacyFlag = false;
+              } else {
+                this.waitPharmacyFlag = true;
+              }
+              if(idx === 0){
+                this.waitPharmacyList = result["list"];
+              }else{
+                this.waitPharmacyList = [
+                  ...this.waitPharmacyList,
+                  ...result["list"],
+                ];
+              }
+              break;
+            case 3:
+              this.pharmacyLoad = false;
+              if (result["list"].length < 10) {
+                this.pharmacyFlag = false;
+              } else if (result["list"].length === 0 && idx === 0) {
+                this.pharmacyFlag = false;
+              } else {
+                this.pharmacyFlag = true;
+              }
+              if(idx === 0){
+                this.pharmacyList = result["list"];
+              }else{
+                this.pharmacyList = [
+                  ...this.pharmacyList,
+                  ...result["list"],
+                ];
+              }
+              break;
+          }
+        }
+      });
+  }
+  // 加载更多
+  loadMore(type) {
+    switch (type) {
+      case 1:
+        this.printPharmacyIdx++;
+        this.printPharmacyLoad = true;
+        this.getPharmacyList(
+          this.printPharmacyIdx,
+          type,
+          this.printPharmacySearchKey
+        );
+        break;
+      case 2:
+        this.waitPharmacyIdx++;
+        this.waitPharmacyLoad = true;
+        this.getPharmacyList(
+          this.waitPharmacyIdx,
+          type,
+          this.waitPharmacySearchKey
+        );
+        break;
+      case 3:
+        this.pharmacyIdx++;
+        this.pharmacyLoad = true;
+        this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
+        break;
+    }
+  }
+  // 搜索关键词
+  searchKeyHandle(type) {
+    switch (type) {
+      case 1:
+        this.printPharmacyIdx = 0; //页码重置
+        this.printPharmacyList = []; //列表重置
+        this.getPharmacyList(
+          this.printPharmacyIdx,
+          type,
+          this.printPharmacySearchKey
+        );
+        break;
+      case 2:
+        this.waitPharmacyIdx = 0; //页码重置
+        this.waitPharmacyList = []; //列表重置
+        this.getPharmacyList(
+          this.waitPharmacyIdx,
+          type,
+          this.waitPharmacySearchKey
+        );
+        break;
+      case 3:
+        this.pharmacyIdx = 0; //页码重置
+        this.pharmacyList = []; //列表重置
+        this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
+        break;
+    }
+  }
+  // 退出
+  logOut(): void {
+    // 假退出
+    localStorage.removeItem("user");
+    localStorage.removeItem("menu");
+    localStorage.removeItem("phones");
+    localStorage.removeItem("index");
+    this.router.navigateByUrl("login");
+    // 假退出
+    this.mainService.logOut().subscribe((data) => {
+      if (data.status == 200) {
+        localStorage.removeItem("user");
+        localStorage.removeItem("menu");
+        localStorage.removeItem("phones");
+        localStorage.removeItem("index");
+        this.router.navigateByUrl("login");
+      }
+    });
+  }
+  //待配药
+  print(id?) {
+    let arr = [];
+    if (typeof id === "number" && id > 0) {
+      //单个二维码
+      arr.push(id);
+    } else {
+      //批量二维码
+      arr = this.printPharmacyList.map((item) => item.id);
+    }
+    this.mainService.printRequisition(arr).subscribe((data) => {
+      if (data["status"] == 200) {
+        this.codes = data["data"];
+        setTimeout(function () {
+          const printContent = document.getElementById("report");
+          const WindowPrt = window.open("", "", "width=700,height=900");
+          WindowPrt.document.write(printContent.innerHTML);
+          WindowPrt.print();
+          WindowPrt.close();
+        }, 100);
+        // 待打印变为待配药接口
+        let loginName = JSON.parse(localStorage.getItem("user")).user.name;
+        this.mainService
+          .changeToDispensing(arr, loginName)
+          .subscribe((data) => {
+            if (data["state"] == 200) {
+              this.printPharmacyList = [];
+              this.waitPharmacyList = [];
+              // 待配药列表
+              this.getPharmacyList(0, 1, this.printPharmacySearchKey);
+              // 配药中列表
+              this.getPharmacyList(0, 2, this.waitPharmacySearchKey);
+            }
+          });
+      }
+    });
+  }
+
+  //补打二维码
+  replenishPrint(id?) {
+    let arr = [];
+    if (typeof id === "number" && id > 0) {
+      //单个二维码
+      arr.push(id);
+    } else {
+      //批量二维码
+      arr = this.printPharmacyList.map((item) => item.id);
+    }
+    this.mainService.printRequisition(arr).subscribe((data) => {
+      if (data["status"] == 200) {
+        this.codes = data["data"];
+        setTimeout(function () {
+          const printContent = document.getElementById("report");
+          const WindowPrt = window.open("", "", "width=700,height=900");
+          WindowPrt.document.write(printContent.innerHTML);
+          WindowPrt.print();
+          WindowPrt.close();
+        }, 100);
+      }
+    });
+  }
+
+  // 右侧菜单
+  showLastItems: boolean = false;
+  // 下拉
+  fixedMenuXiala() {
+    this.showLastItems = true;
+  }
+
+  // 上拉
+  fixedMenuShangla() {
+    this.showLastItems = false;
+  }
+
+  mainRole: boolean = false; //回到系统管理权限
+  initRole() {
+    // let roles = JSON.parse(localStorage.getItem('user')).user.role;
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    let that = this;
+    console.log("菜单数量" + menus.length);
+    if (menus.length >= 2) {
+      that.mainRole = true;
+      return;
+    }
+  }
+
+  // 切换右侧菜单Tab
+  fixedTab: string = "";
+  checkFixedTab(type: string) {
+    if (type == "toSystem") {
+      this.router.navigateByUrl("main");
+    }
+    if (this.fixedTab == type) {
+      this.fixedTab = "";
+    } else {
+      this.fixedTab = type;
+    }
+  }
+  //药房端科室切换
+  changeShow = true;
+  closeTime = 3;
+  closeTimeFlag = 0;
+  hsPromptModalShow: boolean = true; //科室切换提示框是否展示
+  timerCloseTime = null;
+  deptDisplay = 1; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  //子传父接收
+  closeModelHs(e) {
+    this.hsPromptModalShow = JSON.parse(e).show;
+    this.changeShow = JSON.parse(e).changeShow;
+  }
+  //子传父接收
+  clearModelHs(e) {
+    if (JSON.parse(e).clear === true) {
+      clearInterval(this.timerCloseTime);
+    }
+    this.changeShow = JSON.parse(e).changeShow;
+  }
+  // 头部切换科室
+  changeKsNow() {
+    this.hsPromptModalShow = true;
+    clearInterval(this.timerCloseTime);
+    this.changeShow = false;
+  }
+  // 切换科室
+  changeKs() {
+    this.hsPromptModalShow = true;
+    // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+    // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+    // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+    if (this.closeTimeFlag === 0) {
+      return;
+    }
+    this.closeTime = Math.abs(this.closeTimeFlag);
+    clearInterval(this.timerCloseTime);
+    this.timerCloseTime = setInterval(() => {
+      this.closeTime = Math.max(--this.closeTime, 0);
+      if (this.closeTime === 0) {
+        if (this.closeTimeFlag <= 0) {
+          this.hsPromptModalShow = false;
+        }
+        clearInterval(this.timerCloseTime);
+      }
+    }, 1000);
+  }
+}
+

src/app/views/pharmacy2/pharmacy2.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { Pharmacy2RoutingModule } from './pharmacy2-routing.module';
+import { Pharmacy2Component } from './pharmacy2.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [Pharmacy2Component],
+  imports: [
+    CommonModule,
+    Pharmacy2RoutingModule,
+    ShareModule
+  ]
+})
+export class Pharmacy2Module { }