药房

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

@@ -58,13 +58,13 @@
                 <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>
+                <span class="green">配送人员：<ng-container *ngIf="item.deliveryUser">{{item.deliveryUser.name}}（{{item.deliveryUser.phone}}）</ng-container><ng-container *ngIf="!item.deliveryUser">无</ng-container></span>
+                <span [ngStyle]="{color:item.isCreatOder === 'YES' ? '#49b856' : 'red'}">{{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><ng-container *ngIf="!item.bagTime">无</ng-container></span>
+                <span>记账时间：<ng-container *ngIf="item.bagTime">{{item.bagTime|date:'MM-dd HH:mm'}}</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|date:'MM-dd HH:mm'}}</ng-container><ng-container *ngIf="!item.startDispensingTime">无</ng-container></span>
               </div>
             </div>
             <!-- <div class="pharmacy-main__selectionPrint">
@@ -123,13 +123,13 @@
                 <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>
+                <span class="green">配送人员：<ng-container *ngIf="item.deliveryUser">{{item.deliveryUser.name}}（{{item.deliveryUser.phone}}）</ng-container><ng-container *ngIf="!item.deliveryUser">无</ng-container></span>
+                <span [ngStyle]="{color:item.isCreatOder === 'YES' ? '#49b856' : 'red'}">{{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>记账时间：<ng-container *ngIf="item.bagTime">{{item.bagTime|date:'MM-dd HH:mm'}}</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><ng-container *ngIf="!item.startDispensingTime">无</ng-container></span>
+                <span>开始配药时间：<ng-container *ngIf="item.startDispensingTime">{{item.startDispensingTime|date:'MM-dd HH:mm'}}</ng-container><ng-container *ngIf="!item.startDispensingTime">无</ng-container></span>
               </div>
             </div>
             <!-- <div class="pharmacy-main__selectionPrint">
@@ -188,8 +188,13 @@
                 <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></span>
+                <span class="green">配送人员：<ng-container *ngIf="item.deliveryUser">{{item.deliveryUser.name}}（{{item.deliveryUser.phone}}）</ng-container><ng-container *ngIf="!item.deliveryUser">无</ng-container></span>
+                <span [ngStyle]="{color:item.isCreatOder === 'YES' ? '#49b856' : 'red'}">{{item.isCreatOder === 'YES' ? '已建单' : '未建单'}}</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>
+                <!-- <span>批次&emsp;<em>{{item.batchNo}}</em></span> -->
+                <span>开始配药时间：<ng-container *ngIf="item.startDispensingTime">{{item.startDispensingTime|date:'MM-dd HH:mm'}}</ng-container><ng-container *ngIf="!item.startDispensingTime">无</ng-container></span>
               </div>
             </div>
           </div>

src/app/views/pharmacy/pharmacy.component.less

@@ -6,6 +6,14 @@
     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,