样式优化

src/app/share/order-detail/order-detail.component.html

@@ -73,18 +73,22 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">工单日期：{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
             <div nz-col nzSpan="6">总耗时：{{orderInfo.showTimeNum}}</div>
-            <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
-            <div nz-col nzSpan="4">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
+            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+            <div nz-col nzSpan="6">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
           </div>
           <div class="info" nz-row>
-            <div nz-col nzSpan="4">申请科室：{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
+            <div nz-col nzSpan="6">预计接收：{{orderInfo.expectReceiveNum}}</div>
+            <div nz-col nzSpan="6">送达：{{orderInfo.deliveryNum||'无'}}</div>
+            <div nz-col nzSpan="6">实际接收：{{orderInfo.actualReceiveNum||'无'}}</div>
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="24">申请科室：{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
             </div>
-            <div nz-col nzSpan="9">
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="24">
               目标科室：{{endDepts}}
             </div>
-            <div nz-col nzSpan="4">预计接收：{{orderInfo.expectReceiveNum}}</div>
-            <div nz-col nzSpan="3">送达：{{orderInfo.deliveryNum}}</div>
-            <div nz-col nzSpan="4">实际接收：{{orderInfo.actualReceiveNum}}</div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
             <div nz-col nzSpan="8">
@@ -244,7 +248,8 @@
     </overlay-scrollbars>
     <!-- 药品/静配配送类型工单信息 -->
     <overlay-scrollbars #osComponentRef6 style="max-height: 400px;">
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='drugsBag'||orderInfo.taskType.associationType.value=='jPBag')"
+      <div
+        *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='drugsBag'||orderInfo.taskType.associationType.value=='jPBag')"
         class="content orders">
         <div class="top">
           <div class="num">
@@ -353,7 +358,8 @@
     </overlay-scrollbars>
     <!-- 患者陪检/患者转运类型工单信息 -->
     <overlay-scrollbars #osComponentRef1 style="max-height: 400px;">
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='inspect'||orderInfo.taskType.associationType.value=='patientTransport')"
+      <div
+        *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='inspect'||orderInfo.taskType.associationType.value=='patientTransport')"
         class="content orders">
         <div class="top">
           <div class="num">

src/app/share/order-detail/order-detail.component.less

@@ -142,7 +142,7 @@
                   color: #e5e9ed;
 
                   &.green {
-                    color: #bee1a7;
+                    color: @primary-color;
                   }
                 }
               }