Merge branch 'master' into 下单加保险

lxf
2 parents 072a553f 01e87291
Showing 3 changed files with 22 additions and 14 deletions Show diff stats
common/api.js
pages/goodSource/grab-record.vue
pages/order/change-fee.vue
@@ -178,7 +178,7 @@ module.exports = (vm) =&gt; {
       getDetail: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/getDetail', {params}),
       add: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/add', data,{custom: {toast:true}}),
       addOrder: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/addOrder', data,{custom: {toast:true}}),
-      modify: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/modify', data),
+      modify: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/modify', data,{custom: {toast:true}}),
       complete: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/complete', data),
       cancel: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancel', data),
       cancelBidding: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancelBidding', data),
@@ -43,8 +43,9 @@
             <view style="position: absolute; top: 24rpx; right: 24rpx" :style="{ color: statusMap[form.status] }">
               <render-dict :value="form.status" dict="FREIGHT_GOODS_SOURCE_BIDDING_STATUS"></render-dict>
             </view>
-            <view-item title="订单号" v-if="form.code">
-              <field-copy class="color-blue" :value="form.code" v-if="form.code">{{ form.code }} </field-copy>
+            <view-item title="订单号" v-if="form.orderCode && form.status === 'ASSIGNED'">
+              <view @click="toDetail(form.orderCode)" class="color-blue">{{ form.orderCode }}</view>
+              <field-copy :value="form.orderCode"> </field-copy>
             </view-item>
             <view-item title="抢单司机">
               <field-call :value="form.driverMobile">
@@ -66,10 +67,11 @@
               <text>{{ form.biddingWeight || '--' }}吨</text>
             </view-item>
             <view class="buts">
-              <view
-                >总运费：<text class="color-red">{{ form.paidAmount }}</text
-                >元</view
-              >
+              <view>
+                <text>价格：</text>
+                <text class="color-red">{{ form.priceType === 'TON' ? form.weightUnitPrice : form.vehicleUnitPrice }}</text>
+                <text>{{ form.priceType === 'TON' ? '元/吨' : '元/车' }}</text>
+              </view>
               <view style="display: flex; gap: 24rpx; justify-content: space-between" v-if="form.status === 'WAIT_ASSIGN'">
                 <zui-button v-if="$permission('/freightGoodsSource/cancelBidding')" class="zui-button" @click="(cancelCode = form.code), (cancelRemark = ''), (cancelShow = true)"
                   >取消</zui-button
@@ -255,6 +257,9 @@ export default {
           this.loading = false;
         });
     },
+    toDetail(code) {
+      uni.navigateTo({ url: '/pages/order/detail?code=' + code });
+    },
   },
 };
 </script>
@@ -205,6 +205,7 @@ export default {
       uni.$u.api.freightOrder.getDetail({ code }).then(res => {
         this.item = res.result || {};
         this.form.paidAmount = this.item.paidAmount;
+        this.form.goodsWeight = this.item.goodsWeight;
         this.updateAfterAmount(this.item.orderFeePayPlanList);
       });
     },
@@ -267,13 +268,15 @@ export default {
         { ...this.arrivalPay, afterAmount: this.form.deliveryAmount === '' ? '0' : this.form.deliveryAmount },
         { ...this.final, afterAmount: this.form.balancePaymentAmount === '' ? '0' : this.form.balancePaymentAmount },
       ];
-      uni.$u.api.freightOrder.adjustAmount({ feeList: params, code: this.item.code, paidAmount: this.form.paidAmount, freightAdjustRemark: this.form.freightAdjustRemark }).then(res => {
-        if (res.success) {
-          uni.showToast({ title: '操作成功', icon: 'none' });
-          this.getOpenerEventChannel().emit('refreshData');
-          setTimeout(() => uni.navigateBack(), 500);
-        }
-      });
+      uni.$u.api.freightOrder
+        .adjustAmount({ feeList: params, code: this.item.code, paidAmount: this.form.paidAmount, freightAdjustRemark: this.form.freightAdjustRemark, goodsWeight: this.form.goodsWeight })
+        .then(res => {
+          if (res.success) {
+            uni.showToast({ title: '操作成功', icon: 'none' });
+            this.getOpenerEventChannel().emit('refreshData');
+            setTimeout(() => uni.navigateBack(), 500);
+          }
+        });
     },
   },
 };
	@@ -178,7 +178,7 @@ module.exports = (vm) => {		@@ -178,7 +178,7 @@ module.exports = (vm) => {
178	getDetail: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/getDetail', {params}),	178	getDetail: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/getDetail', {params}),
179	add: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/add', data,{custom: {toast:true}}),	179	add: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/add', data,{custom: {toast:true}}),
180	addOrder: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/addOrder', data,{custom: {toast:true}}),	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	complete: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/complete', data),	182	complete: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/complete', data),
183	cancel: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancel', data),	183	cancel: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancel', data),
184	cancelBidding: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancelBidding', data),	184	cancelBidding: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancelBidding', data),