浏览代码

样式优化

seimin 3 年之前
父节点
当前提交
ca1cefc6cf

+ 15 - 9
src/app/share/order-detail/order-detail.component.html

@@ -73,18 +73,22 @@
73 73
           <div class="info" nz-row>
74 74
             <div nz-col nzSpan="6">工单日期:{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
75 75
             <div nz-col nzSpan="6">总耗时:{{orderInfo.showTimeNum}}</div>
76
-            <div nz-col nzSpan="8">申请类型:{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
77
-            <div nz-col nzSpan="4">支助人员信息:{{orderInfo.worker?orderInfo.worker.name:''}}</div>
76
+            <div nz-col nzSpan="6">申请类型:{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
77
+            <div nz-col nzSpan="6">支助人员信息:{{orderInfo.worker?orderInfo.worker.name:''}}</div>
78 78
           </div>
79 79
           <div class="info" nz-row>
80
-            <div nz-col nzSpan="4">申请科室:{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
80
+            <div nz-col nzSpan="6">预计接收:{{orderInfo.expectReceiveNum}}</div>
81
+            <div nz-col nzSpan="6">送达:{{orderInfo.deliveryNum||'无'}}</div>
82
+            <div nz-col nzSpan="6">实际接收:{{orderInfo.actualReceiveNum||'无'}}</div>
83
+          </div>
84
+          <div class="info" nz-row>
85
+            <div nz-col nzSpan="24">申请科室:{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
81 86
             </div>
82
-            <div nz-col nzSpan="9">
87
+          </div>
88
+          <div class="info" nz-row>
89
+            <div nz-col nzSpan="24">
83 90
               目标科室:{{endDepts}}
84 91
             </div>
85
-            <div nz-col nzSpan="4">预计接收:{{orderInfo.expectReceiveNum}}</div>
86
-            <div nz-col nzSpan="3">送达:{{orderInfo.deliveryNum}}</div>
87
-            <div nz-col nzSpan="4">实际接收:{{orderInfo.actualReceiveNum}}</div>
88 92
           </div>
89 93
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
90 94
             <div nz-col nzSpan="8">
@@ -244,7 +248,8 @@
244 248
     </overlay-scrollbars>
245 249
     <!-- 药品/静配配送类型工单信息 -->
246 250
     <overlay-scrollbars #osComponentRef6 style="max-height: 400px;">
247
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='drugsBag'||orderInfo.taskType.associationType.value=='jPBag')"
251
+      <div
252
+        *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='drugsBag'||orderInfo.taskType.associationType.value=='jPBag')"
248 253
         class="content orders">
249 254
         <div class="top">
250 255
           <div class="num">
@@ -353,7 +358,8 @@
353 358
     </overlay-scrollbars>
354 359
     <!-- 患者陪检/患者转运类型工单信息 -->
355 360
     <overlay-scrollbars #osComponentRef1 style="max-height: 400px;">
356
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='inspect'||orderInfo.taskType.associationType.value=='patientTransport')"
361
+      <div
362
+        *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='inspect'||orderInfo.taskType.associationType.value=='patientTransport')"
357 363
         class="content orders">
358 364
         <div class="top">
359 365
           <div class="num">

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

@@ -142,7 +142,7 @@
142 142
                   color: #e5e9ed;
143 143
 
144 144
                   &.green {
145
-                    color: #bee1a7;
145
+                    color: @primary-color;
146 146
                   }
147 147
                 }
148 148
               }