frontend / freight-ma

Download as
Browse Code »

Commit ec5a0352f6f8e316cf3d4409f3867208ad056c8f

Authored by lxf
2 parents 072a553f 01e87291
Exists in master and in 1 other branch 宁夏邮政-定制

Merge branch 'master' into 下单加保险

Showing 3 changed files with 22 additions and 14 deletions   Show diff stats
common/api.js
  Diff comments   View file @ec5a035
... ... @@ -178,7 +178,7 @@ module.exports = (vm) => {
178 178 getDetail: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/getDetail', {params}),
179 179 add: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/add', data,{custom: {toast:true}}),
180 180 addOrder: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/addOrder', data,{custom: {toast:true}}),
181   - modify: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/modify', data),
  181 + modify: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/modify', data,{custom: {toast:true}}),
182 182 complete: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/complete', data),
183 183 cancel: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancel', data),
184 184 cancelBidding: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancelBidding', data),
... ...
pages/goodSource/grab-record.vue
  Diff comments   View file @ec5a035
... ... @@ -43,8 +43,9 @@
43 43 <view style="position: absolute; top: 24rpx; right: 24rpx" :style="{ color: statusMap[form.status] }">
44 44 <render-dict :value="form.status" dict="FREIGHT_GOODS_SOURCE_BIDDING_STATUS"></render-dict>
45 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 49 </view-item>
49 50 <view-item title="抢单司机">
50 51 <field-call :value="form.driverMobile">
... ... @@ -66,10 +67,11 @@
66 67 <text>{{ form.biddingWeight || '--' }}吨</text>
67 68 </view-item>
68 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 75 <view style="display: flex; gap: 24rpx; justify-content: space-between" v-if="form.status === 'WAIT_ASSIGN'">
74 76 <zui-button v-if="$permission('/freightGoodsSource/cancelBidding')" class="zui-button" @click="(cancelCode = form.code), (cancelRemark = ''), (cancelShow = true)"
75 77 >取消</zui-button
... ... @@ -255,6 +257,9 @@ export default {
255 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 265 </script>
... ...
pages/order/change-fee.vue
  Diff comments   View file @ec5a035
... ... @@ -205,6 +205,7 @@ export default {
205 205 uni.$u.api.freightOrder.getDetail({ code }).then(res => {
206 206 this.item = res.result || {};
207 207 this.form.paidAmount = this.item.paidAmount;
  208 + this.form.goodsWeight = this.item.goodsWeight;
208 209 this.updateAfterAmount(this.item.orderFeePayPlanList);
209 210 });
210 211 },
... ... @@ -267,13 +268,15 @@ export default {
267 268 { ...this.arrivalPay, afterAmount: this.form.deliveryAmount === '' ? '0' : this.form.deliveryAmount },
268 269 { ...this.final, afterAmount: this.form.balancePaymentAmount === '' ? '0' : this.form.balancePaymentAmount },
269 270 ];
270   - uni.$u.api.freightOrder.adjustAmount({ feeList: params, code: this.item.code, paidAmount: this.form.paidAmount, freightAdjustRemark: this.form.freightAdjustRemark }).then(res => {
271   - if (res.success) {
272   - uni.showToast({ title: '操作成功', icon: 'none' });
273   - this.getOpenerEventChannel().emit('refreshData');
274   - setTimeout(() => uni.navigateBack(), 500);
275   - }
276   - });
  271 + uni.$u.api.freightOrder
  272 + .adjustAmount({ feeList: params, code: this.item.code, paidAmount: this.form.paidAmount, freightAdjustRemark: this.form.freightAdjustRemark, goodsWeight: this.form.goodsWeight })
  273 + .then(res => {
  274 + if (res.success) {
  275 + uni.showToast({ title: '操作成功', icon: 'none' });
  276 + this.getOpenerEventChannel().emit('refreshData');
  277 + setTimeout(() => uni.navigateBack(), 500);
  278 + }
  279 + });
277 280 },
278 281 },
279 282 };
... ...