药房

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

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