seimin 4 mesi fa
parent
commit
968965ea8e
1 ha cambiato i file con 9 aggiunte e 5 eliminazioni
  1. 9 5
      pages/newDrug/list.vue

+ 9 - 5
pages/newDrug/list.vue

@@ -13,12 +13,16 @@
13 13
               <view class="value">总数:{{item.drugsCount}}</view>
14 14
             </view>
15 15
             <view class="bodyColumn">
16
-              <view class="name">收取人:<template v-if="handoverStartObj && handoverStartObj.handoverUserid">{{handoverStartObj.handoverUserid.name}}</template></view>
17
-              <view class="value">收取时间:<template v-if="handoverStartObj && handoverStartObj.handoverUserid">{{handoverStartObj.operationTime}}</template></view>
16
+              <view class="name">收取人:<template v-if="handoverStartObj">{{handoverStartObj.username}}</template></view>
17
+              <view class="value">收取时间:<template v-if="handoverStartObj">{{handoverStartObj.operationTime}}</template></view>
18 18
             </view>
19 19
             <view class="bodyColumn">
20
-              <view class="name">交接人:<template v-if="handoverEndObj && handoverEndObj.handoverUserid">{{handoverEndObj.handoverUserid.name}}</template></view>
21
-              <view class="value">送达时间:<template v-if="handoverEndObj && handoverEndObj.handoverUserid">{{handoverEndObj.operationTime}}</template></view>
20
+              <view class="name">送达人:<template v-if="handoverEndObj">{{handoverEndObj.username}}</template></view>
21
+              <view class="value">送达时间:<template v-if="handoverEndObj">{{handoverEndObj.operationTime}}</template></view>
22
+            </view>
23
+            <view class="bodyColumn">
24
+              <view class="name">收取交接人:<template v-if="handoverStartObj && handoverStartObj.handoverUserid">{{handoverStartObj.handoverUserid.name}}</template></view>
25
+              <view class="name">送达交接人:<template v-if="handoverEndObj && handoverEndObj.handoverUserid">{{handoverEndObj.handoverUserid.name}}</template></view>
22 26
             </view>
23 27
           </view>
24 28
         </view>
@@ -42,7 +46,7 @@
42 46
         workOrder: {}, //工单信息
43 47
         config: {}, //配置
44 48
         handoverStartObj: {}, //收取人
45
-        handoverEndObj: {}, //交接
49
+        handoverEndObj: {}, //送达
46 50
       };
47 51
     },
48 52
     methods: {