药房优化

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

@@ -58,7 +58,8 @@
                 <span>{{item.drugsState?item.drugsState.name:''}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>记账时间：{{item.creatTime|dateTransform}}</span>
+                <!-- <span>记账：{{item.bagTime|dateTransform}}</span> -->
+                <span><ng-container *ngIf="item.bagTime">记账时间：{{item.bagTime}}</ng-container></span>
                 <!-- <span>批次&emsp;<em>{{item.batchNo}}</em></span> -->
               </div>
             </div>
@@ -118,8 +119,9 @@
                 <span>{{item.drugsState?item.drugsState.name:''}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>记账时间：{{item.creatTime|dateTransform}}</span>
+                <span><ng-container *ngIf="item.bagTime">记账时间：{{item.bagTime}}</ng-container></span>
                 <!-- <span>批次&emsp;<em>{{item.batchNo}}</em></span> -->
+                <span><ng-container *ngIf="item.startDispensingTime">开始配药时间：{{item.startDispensingTime}}</ng-container></span>
               </div>
             </div>
             <!-- <div class="pharmacy-main__selectionPrint">
@@ -178,7 +180,7 @@
                 <span>{{item.drugsState?item.drugsState.name:''}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>配送人员：{{item.deliveryUser?item.deliveryUser.name:''}}（{{item.deliveryUser?item.deliveryUser.phone:''}}）</span>
+                <span *ngIf="item.deliveryUser">配送人员：{{item.deliveryUser.name}}（{{item.deliveryUser.phone}}）</span>
                 <span></span>
               </div>
             </div>

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

@@ -139,10 +139,14 @@ export class PharmacyComponent implements OnInit {
                 this.printPharmacyFlag = true;
               }
               // 列表数据合并
-              this.printPharmacyList = [
-                ...this.printPharmacyList,
-                ...result["list"],
-              ];
+              if(idx === 0){
+                this.printPharmacyList = result["list"];
+              }else{
+                this.printPharmacyList = [
+                  ...this.printPharmacyList,
+                  ...result["list"],
+                ];
+              }
               break;
             case 2:
               this.waitPharmacyLoad = false;
@@ -153,10 +157,14 @@ export class PharmacyComponent implements OnInit {
               } else {
                 this.waitPharmacyFlag = true;
               }
-              this.waitPharmacyList = [
-                ...this.waitPharmacyList,
-                ...result["list"],
-              ];
+              if(idx === 0){
+                this.waitPharmacyList = result["list"];
+              }else{
+                this.waitPharmacyList = [
+                  ...this.waitPharmacyList,
+                  ...result["list"],
+                ];
+              }
               break;
             case 3:
               this.pharmacyLoad = false;
@@ -167,7 +175,14 @@ export class PharmacyComponent implements OnInit {
               } else {
                 this.pharmacyFlag = true;
               }
-              this.pharmacyList = [...this.pharmacyList, ...result["list"]];
+              if(idx === 0){
+                this.pharmacyList = result["list"];
+              }else{
+                this.pharmacyList = [
+                  ...this.pharmacyList,
+                  ...result["list"],
+                ];
+              }
               break;
           }
         }