diff --git a/pages/order/add.vue b/pages/order/add.vue
index d77b6b3..f1c42a2 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -181,7 +181,7 @@
- 下单并指派
+ 下单并指派
@@ -198,6 +198,9 @@
>
+
+
+
(showCar = e)" @confirm="carConfirm" v-model="carNumber">
@@ -212,6 +215,8 @@ export default {
components: { UTextarea, PopupPlatenumber, payee },
data() {
return {
+ exceed: false,
+ exceedStr: '',
openExternalInsuranceFlag: true,
eventCode: '',
loading: false,
@@ -661,20 +666,22 @@ export default {
}
});
},
- submitAddFun() {
+ submitAddFun(confirmAddFlag = false) {
+ this.exceed = false;
if (this.loading) return;
this.loading = true;
let totalAmount = Number(this.form.paidAmount || 0) + Number(this.form.serviceAmount || 0) + Number(this.form.securityServiceAmount || 0);
let addFun = this.eventCode ? uni.$u.api.freightGoodsSourceV2.addOrder : uni.$u.api.freightOrder.add;
- addFun({ ...this.form, totalAmount, payeeId: this.payeeModel.driverId })
+ addFun({ ...this.form, totalAmount, payeeId: this.payeeModel.driverId, confirmAddFlag })
.then(res => {
- if (res.success) {
- // this.form = {};
+ if (res.result) {
+ this.loading = false;
+ this.exceedStr = res.result;
+ this.exceed = true;
+ } else {
uni.showToast({ title: '下单成功', icon: 'none' });
this.getOpenerEventChannel().emit('refreshData');
setTimeout(() => uni.navigateBack(), 1500);
- } else {
- this.loading = false;
}
})
.catch(e => {
diff --git a/pages/order/again-assign.vue b/pages/order/again-assign.vue
index 73adbb0..539dff8 100644
--- a/pages/order/again-assign.vue
+++ b/pages/order/again-assign.vue
@@ -65,8 +65,11 @@
- 确认更改
+ 确认更改
+
+
+
(showCar = e)" @confirm="carConfirm" v-model="carNumber">
@@ -80,6 +83,8 @@ export default {
components: { PopupPlatenumber, Payee },
data() {
return {
+ exceed: false,
+ exceedStr: '',
typeCar: '',
carNumber: '',
showCar: false,
@@ -201,9 +206,13 @@ export default {
this.showCar = false;
this.vehicleChange(v);
},
- submit() {
- uni.$u.api.freightOrder.assignVehicle({ ...this.form, code: this.item.code, payeeId: this.payeeModel.driverId }).then(res => {
- if (res.success) {
+ submit(confirmAssignFlag = false) {
+ this.exceed = false;
+ uni.$u.api.freightOrder.assignVehicle({ ...this.form, code: this.item.code, payeeId: this.payeeModel.driverId, confirmAssignFlag }).then(res => {
+ if (res.result) {
+ this.exceedStr = res.result;
+ this.exceed = true;
+ } else {
uni.showToast({ title: '操作成功', icon: 'none' });
this.getOpenerEventChannel().emit('refreshData');
setTimeout(() => uni.navigateBack(), 500);
diff --git a/pages/order/change-fee.vue b/pages/order/change-fee.vue
index ecfaa79..f819560 100644
--- a/pages/order/change-fee.vue
+++ b/pages/order/change-fee.vue
@@ -132,8 +132,11 @@
- 确定更改
+ 确定更改
+
+
+