|
@@ -13,16 +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.username}}</template></view>
|
17
|
|
- <view class="value">收取时间:<template v-if="handoverStartObj">{{handoverStartObj.operationTime}}</template></view>
|
|
16
|
+ <view class="name">收取人:<template v-if="item.startLog">{{item.startLog.username}}</template></view>
|
|
17
|
+ <view class="value">收取时间:<template v-if="item.startLog">{{item.startLog.operationTime | formatDate('yyyy-MM-dd hh:mm')}}</template></view>
|
18
|
18
|
</view>
|
19
|
19
|
<view class="bodyColumn">
|
20
|
|
- <view class="name">送达人:<template v-if="handoverEndObj">{{handoverEndObj.username}}</template></view>
|
21
|
|
- <view class="value">送达时间:<template v-if="handoverEndObj">{{handoverEndObj.operationTime}}</template></view>
|
|
20
|
+ <view class="name">送达人:<template v-if="item.endLog">{{item.endLog.username}}</template></view>
|
|
21
|
+ <view class="value">送达时间:<template v-if="item.endLog">{{item.endLog.operationTime | formatDate('yyyy-MM-dd hh:mm')}}</template></view>
|
22
|
22
|
</view>
|
23
|
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>
|
|
24
|
+ <view class="name">收取交接人:<template v-if="item.startLog">{{item.startLog.handoverName}}</template></view>
|
|
25
|
+ <view class="name">送达交接人:<template v-if="item.endLog">{{item.endLog.handoverName}}</template></view>
|
26
|
26
|
</view>
|
27
|
27
|
</view>
|
28
|
28
|
</view>
|
|
@@ -45,8 +45,6 @@
|
45
|
45
|
queryObj: {}, //路由传递过来的数据
|
46
|
46
|
workOrder: {}, //工单信息
|
47
|
47
|
config: {}, //配置
|
48
|
|
- handoverStartObj: {}, //收取人
|
49
|
|
- handoverEndObj: {}, //送达人
|
50
|
48
|
};
|
51
|
49
|
},
|
52
|
50
|
methods: {
|
|
@@ -69,9 +67,6 @@
|
69
|
67
|
if(res.data){
|
70
|
68
|
this.drugsBagList = res.data.drugsBagList || [];
|
71
|
69
|
this.workOrder = res.data.workOrder || {};
|
72
|
|
-
|
73
|
|
- this.handoverStartObj = this.workOrder.record.find(v => v.operation.value == 8);
|
74
|
|
- this.handoverEndObj = this.workOrder.record.find(v => v.operation.value == 10);
|
75
|
70
|
}
|
76
|
71
|
}else{
|
77
|
72
|
uni.showToast({
|