seimin 2 anos atrás
pai
commit
b01ac5136e

+ 3 - 2
src/app/share/detail-blood/detail-blood.component.html

@@ -18,8 +18,9 @@
18 18
           <div nz-col nzSpan="8">起点科室:{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):''}}</div>
19 19
           <div nz-col nzSpan="8">目标科室:{{endDepts}}</div>
20 20
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
21
-          <div nz-col nzSpan="8">预计接收:{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
22
-          <div nz-col nzSpan="8">实际接收:{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
21
+          <div nz-col nzSpan="8">应收数量:{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:'无'}}</div>
22
+          <div nz-col nzSpan="8">实收数量:{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:'无'}}</div>
23
+          <div nz-col nzSpan="8">送达数量:{{orderInfo.deliveryNum?orderInfo.deliveryNum:'无'}}</div>
23 24
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息:{{orderInfo.workOrderRemark}}
24 25
           </div>
25 26
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">

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

@@ -950,13 +950,13 @@
950 950
         </div>
951 951
         <div class="info" nz-row>
952 952
           <div nz-col nzSpan="6">
953
-            预计接收:{{ orderInfo.expectReceiveNum }}
953
+            应收数量:{{ orderInfo.expectReceiveNum || "无" }}
954 954
           </div>
955 955
           <div nz-col nzSpan="6">
956
-            送达:{{ orderInfo.deliveryNum || "无" }}
956
+            实收数量:{{ orderInfo.actualReceiveNum || "无" }}
957 957
           </div>
958 958
           <div nz-col nzSpan="6">
959
-            实际接收:{{ orderInfo.actualReceiveNum || "无" }}
959
+            送达数量:{{ orderInfo.deliveryNum || "无" }}
960 960
           </div>
961 961
         </div>
962 962
         <div class="info" nz-row>