药房界面调整

src/app/views/pharmacy/pharmacy.component.html

@@ -20,13 +20,13 @@
   <!-- 头部 end -->
   <!-- 主体部分 start -->
   <div class="pharmacy-main">
-    <!-- 打印二维码 start -->
+    <!-- 待配药 start -->
     <div class="pharmacy-main__list pharmacy-main__print">
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
-        <strong>打印二维码</strong>
-        <button nz-button class="pharmacy-main__printAll" (click)="print()"
-          [disabled]="printPharmacyList.length===0">批量打印</button>
+        <strong>待配药</strong>
+        <!-- <button nz-button class="pharmacy-main__printAll" (click)="print()"
+          [disabled]="printPharmacyList.length===0">批量打印</button> -->
       </div>
       <!-- 标题 end -->
       <!-- 搜索框 start -->
@@ -54,9 +54,9 @@
                 <span>批次&emsp;<em>{{item.batchNo}}</em></span>
               </div>
             </div>
-            <div class="pharmacy-main__selectionPrint">
+            <!-- <div class="pharmacy-main__selectionPrint">
               <div class="pharmacy-main__selectionPrintBtn" (click)="print(item.id)">打印</div>
-            </div>
+            </div> -->
           </div>
           <div class="pharmacy-main__selection pharmacy-main__selection--noData" *ngIf="printPharmacyList.length === 0">
             <img src="./../../assets/images/image_kongbaiye.png" alt="">
@@ -80,12 +80,12 @@
       </overlay-scrollbars>
       <!-- 列表 end -->
     </div>
-    <!-- 打印二维码 end -->
-    <!-- 待配送 start -->
+    <!-- 待配药 end -->
+    <!-- 配药中 start -->
     <div class="pharmacy-main__list pharmacy-main__waitDelivery">
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
-        <strong>待配送</strong>
+        <strong>配药中</strong>
       </div>
       <!-- 标题 end -->
       <!-- 搜索框 start -->
@@ -113,9 +113,9 @@
                 <span>批次&emsp;<em>{{item.batchNo}}</em></span>
               </div>
             </div>
-            <div class="pharmacy-main__selectionPrint">
+            <!-- <div class="pharmacy-main__selectionPrint">
               <div class="pharmacy-main__selectionPrintBtn" (click)="replenishPrint(item.id)">补打</div>
-            </div>
+            </div> -->
           </div>
           <div class="pharmacy-main__selection pharmacy-main__selection--noData" *ngIf="waitPharmacyList.length === 0">
             <img src="./../../assets/images/image_kongbaiye.png" alt="">
@@ -139,12 +139,12 @@
       </overlay-scrollbars>
       <!-- 列表 end -->
     </div>
-    <!-- 待配送 end -->
-    <!-- 已配送 start -->
+    <!-- 配药中 end -->
+    <!-- 核对中 start -->
     <div class="pharmacy-main__list pharmacy-main__delivery">
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
-        <strong>已配送</strong>
+        <strong>核对中</strong>
       </div>
       <!-- 标题 end -->
       <!-- 搜索框 start -->
@@ -195,7 +195,7 @@
       </overlay-scrollbars>
       <!-- 列表 end -->
     </div>
-    <!-- 已配送 end -->
+    <!-- 核对中 end -->
   </div>
   <!-- 主体部分 end -->
   <!-- 二维码打印 -->

src/app/views/pharmacy/pharmacy.component.ts

@@ -25,23 +25,23 @@ export class PharmacyComponent implements OnInit {
   })
   osComponentRef3: OverlayScrollbarsComponent;
   constructor(private mainService: MainService, public router: Router) {}
-  //打印二维码数据
+  //待配药数据
   codes = [];
   // 登录切换效果
   loginFlag = false;
-  // 打印二维码
+  // 待配药
   printPharmacyList = []; //数据列表
   printPharmacyIdx = 0; //页码
   printPharmacyFlag = false; //是否查看更多
   printPharmacySearchKey = ""; //搜索的内容
   printPharmacyLoad = false; //按钮的loading
-  // 待配送列表
+  // 配药中列表
   waitPharmacyList = [];
   waitPharmacyIdx = 0;
   waitPharmacyFlag = false;
   waitPharmacySearchKey = "";
   waitPharmacyLoad = false;
-  // 已配送列表
+  // 核对中列表
   pharmacyList = [];
   pharmacyIdx = 0;
   pharmacyFlag = false;
@@ -51,11 +51,11 @@ export class PharmacyComponent implements OnInit {
   currentDept = "";
 
   ngOnInit() {
-    // 打印二维码列表
+    // 待配药列表
     this.getPharmacyList(this.printPharmacyIdx, 1, this.printPharmacySearchKey);
-    // 待配送列表
+    // 配药中列表
     this.getPharmacyList(this.waitPharmacyIdx, 2, this.waitPharmacySearchKey);
-    // 已配送列表
+    // 核对中列表
     this.getPharmacyList(this.pharmacyIdx, 3, this.pharmacySearchKey);
     //当前登录人所属科室
     this.currentDept = JSON.parse(localStorage.getItem("user")).user.dept.dept;
@@ -63,7 +63,7 @@ export class PharmacyComponent implements OnInit {
     this.initRole();
   }
   // 药房端药房列表查询、搜索
-  // 1为pc待打印状态、2为pc待配送、3为pc已配送
+  // 1为pc待打印状态、2为pc配药中、3为pc核对中
   // searchKey  为搜索的关键字，没有就不传
   loading1 = false;
   loading2 = false;
@@ -229,7 +229,7 @@ export class PharmacyComponent implements OnInit {
   toggleLogin() {
     this.loginFlag = !this.loginFlag;
   }
-  //打印二维码
+  //待配药
   print(id?) {
     let arr = [];
     if (typeof id === "number" && id > 0) {
@@ -257,9 +257,9 @@ export class PharmacyComponent implements OnInit {
             if (data["state"] == 200) {
               this.printPharmacyList = [];
               this.waitPharmacyList = [];
-              // 打印二维码列表
+              // 待配药列表
               this.getPharmacyList(0, 1, this.printPharmacySearchKey);
-              // 待配送列表
+              // 配药中列表
               this.getPharmacyList(0, 2, this.waitPharmacySearchKey);
             }
           });