Commit 87aadf8f76fe482c136dc8988b196449e2e01095
1 parent
5cc12f97
Exists in
master
and in
1 other branch
fix: 货源管理
Showing
2 changed files
with
12 additions
and
6 deletions
Show diff stats
pages/goodSource/grab-record.vue
| @@ -43,8 +43,9 @@ | @@ -43,8 +43,9 @@ | ||
| 43 | <view style="position: absolute; top: 24rpx; right: 24rpx" :style="{ color: statusMap[form.status] }"> | 43 | <view style="position: absolute; top: 24rpx; right: 24rpx" :style="{ color: statusMap[form.status] }"> |
| 44 | <render-dict :value="form.status" dict="FREIGHT_GOODS_SOURCE_BIDDING_STATUS"></render-dict> | 44 | <render-dict :value="form.status" dict="FREIGHT_GOODS_SOURCE_BIDDING_STATUS"></render-dict> |
| 45 | </view> | 45 | </view> |
| 46 | - <view-item title="订单号" v-if="form.code"> | ||
| 47 | - <field-copy class="color-blue" :value="form.code" v-if="form.code">{{ form.code }} </field-copy> | 46 | + <view-item title="订单号" v-if="form.orderCode && form.status === 'ASSIGNED'"> |
| 47 | + <view @click="toDetail(form.orderCode)" class="color-blue">{{ form.orderCode }}</view> | ||
| 48 | + <field-copy :value="form.orderCode"> </field-copy> | ||
| 48 | </view-item> | 49 | </view-item> |
| 49 | <view-item title="抢单司机"> | 50 | <view-item title="抢单司机"> |
| 50 | <field-call :value="form.driverMobile"> | 51 | <field-call :value="form.driverMobile"> |
| @@ -66,10 +67,11 @@ | @@ -66,10 +67,11 @@ | ||
| 66 | <text>{{ form.biddingWeight || '--' }}吨</text> | 67 | <text>{{ form.biddingWeight || '--' }}吨</text> |
| 67 | </view-item> | 68 | </view-item> |
| 68 | <view class="buts"> | 69 | <view class="buts"> |
| 69 | - <view | ||
| 70 | - >总运费：<text class="color-red">{{ form.paidAmount }}</text | ||
| 71 | - >元</view | ||
| 72 | - > | 70 | + <view> |
| 71 | + <text>价格：</text> | ||
| 72 | + <text class="color-red">{{ form.priceType === 'TON' ? form.weightUnitPrice : form.vehicleUnitPrice }}</text> | ||
| 73 | + <text>{{ form.priceType === 'TON' ? '元/吨' : '元/车' }}</text> | ||
| 74 | + </view> | ||
| 73 | <view style="display: flex; gap: 24rpx; justify-content: space-between" v-if="form.status === 'WAIT_ASSIGN'"> | 75 | <view style="display: flex; gap: 24rpx; justify-content: space-between" v-if="form.status === 'WAIT_ASSIGN'"> |
| 74 | <zui-button v-if="$permission('/freightGoodsSource/cancelBidding')" class="zui-button" @click="(cancelCode = form.code), (cancelRemark = ''), (cancelShow = true)" | 76 | <zui-button v-if="$permission('/freightGoodsSource/cancelBidding')" class="zui-button" @click="(cancelCode = form.code), (cancelRemark = ''), (cancelShow = true)" |
| 75 | >取消</zui-button | 77 | >取消</zui-button |
| @@ -255,6 +257,9 @@ export default { | @@ -255,6 +257,9 @@ export default { | ||
| 255 | this.loading = false; | 257 | this.loading = false; |
| 256 | }); | 258 | }); |
| 257 | }, | 259 | }, |
| 260 | + toDetail(code) { | ||
| 261 | + uni.navigateTo({ url: '/pages/order/detail?code=' + code }); | ||
| 262 | + }, | ||
| 258 | }, | 263 | }, |
| 259 | }; | 264 | }; |
| 260 | </script> | 265 | </script> |
pages/order/change-fee.vue
| @@ -205,6 +205,7 @@ export default { | @@ -205,6 +205,7 @@ export default { | ||
| 205 | uni.$u.api.freightOrder.getDetail({ code }).then(res => { | 205 | uni.$u.api.freightOrder.getDetail({ code }).then(res => { |
| 206 | this.item = res.result || {}; | 206 | this.item = res.result || {}; |
| 207 | this.form.paidAmount = this.item.paidAmount; | 207 | this.form.paidAmount = this.item.paidAmount; |
| 208 | + this.form.goodsWeight = this.item.goodsWeight; | ||
| 208 | this.updateAfterAmount(this.item.orderFeePayPlanList); | 209 | this.updateAfterAmount(this.item.orderFeePayPlanList); |
| 209 | }); | 210 | }); |
| 210 | }, | 211 | }, |