From 4064fd15fdd46cc977714a56e860adfdf40ad462 Mon Sep 17 00:00:00 2001
From: lxf <xunfeng1122@163.com>
Date: Wed, 4 Dec 2024 09:12:43 +0800
Subject: [PATCH] fix: 发车到达-异常提示，再来一单收款人

---
 common/api.js               |  4 ++--
 pages/order/add.vue         | 25 ++++++++++++++++++++++++-
 pages/order/arrival-car.vue | 24 +++++++++++++++++-------
 pages/order/start-car.vue   | 24 +++++++++++++++++-------
 4 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/common/api.js b/common/api.js
index 3f88ae4..22a7e51 100644
--- a/common/api.js
+++ b/common/api.js
@@ -127,8 +127,8 @@ module.exports = (vm) => {
       downloadStartCar: params => vm.$u.http.get( freightAPI + '/freightOrder/orderDepartAndArriveDownload', params), // 模板下载
       importStartCar: params => vm.$u.http.get( freightAPI + '/freightOrder/importOrderDepartAndArrive', params), // 导入
       import: params => vm.$u.http.get( freightAPI + '/freightOrder/import', params), // 导入
-      depart: params => vm.$u.http.post( freightAPI + '/freightOrder/depart', params), // 发车
-      arrive: params => vm.$u.http.post( freightAPI + '/freightOrder/arrive', params), // 到达
+      depart: params => vm.$u.http.post( freightAPI + '/freightOrder/depart', params,{custom: {toast:true}}), // 发车
+      arrive: params => vm.$u.http.post( freightAPI + '/freightOrder/arrive', params,{custom: {toast:true}}), // 到达
       sign: params => vm.$u.http.get( freightAPI + '/freightOrder/sign', params), // 签收
       cancel: params => vm.$u.http.post( freightAPI + '/freightOrder/cancel', params), // 取消
       delete: params => vm.$u.http.post( freightAPI + '/freightOrder/delete', params), // 删除
diff --git a/pages/order/add.vue b/pages/order/add.vue
index a36a442..cd9a944 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -281,9 +281,32 @@ export default {
     initData(code) {
       uni.$u.api.freightOrder.getDetail({ code }).then(res => {
         let detail = res.result || {};
-        ['goodsName', 'waypoints', 'allowDriverSeeFreightAmountNode', 'projectCode', 'projectName'].forEach(key => {
+        ['goodsName', 'waypoints', 'allowDriverSeeFreightAmountNode', 'projectCode', 'projectName', 'remark', 'goodsPiece', 'goodsWeight', 'goodsVolume'].forEach(key => {
           this.form[key] = detail[key];
         });
+        if (detail.vehicleLicenseNum) {
+          this.typeCar = 'licenseNumber';
+          this.form.licenseNumber = detail.vehicleLicenseNum;
+          this.vehicleChange(detail.vehicleLicenseNum);
+        }
+        if (detail.trailerLicenseNum) {
+          setTimeout(() => {
+            this.typeCar = 'trailerNumber';
+            this.form.trailerNumber = detail.trailerLicenseNum;
+            this.vehicleChange(detail.trailerLicenseNum);
+          }, 500);
+        }
+        this.form.mobile = detail.driverMobile;
+        this.form.driverId = detail.driverId;
+        this.form.driverName = detail.driverName;
+        this.form.driverMobile = detail.driverMobile;
+        this.payeeModel = {
+          driverId: detail.payeeId,
+          dueBank: detail.dueBank,
+          openingBank: detail.openingBank,
+          dueBankCardNo: detail.dueBankCardNo,
+        };
+        this.$refs.payee.setItem(this.payeeModel);
         this.computedDistance();
       });
     },
diff --git a/pages/order/arrival-car.vue b/pages/order/arrival-car.vue
index 2468edc..b9e9358 100644
--- a/pages/order/arrival-car.vue
+++ b/pages/order/arrival-car.vue
@@ -26,6 +26,7 @@
     <template #footer>
       <u-button type="primary" @tap="submit">确认到达</u-button>
     </template>
+    <u-toast ref="uToast"></u-toast>
     <u-datetime-picker :show="showLoadTime" :value="loadTimeDef" @cancel="showLoadTime = false" @close="showLoadTime = false" @confirm="loadTimeFormat"></u-datetime-picker>
   </Page>
 </template>
@@ -87,13 +88,22 @@ export default {
         uni.showToast({ title: '到达时间不能小于发车时间', icon: 'none' });
         return;
       }
-      uni.$u.api.freightOrder.arrive({ codeList: [this.item.code], ...this.form }).then(res => {
-        if (res.success) {
-          uni.showToast({ title: '操作成功', icon: 'none' });
-          this.getOpenerEventChannel().emit('refreshData');
-          setTimeout(() => uni.navigateBack(), 500);
-        }
-      });
+      uni.$u.api.freightOrder
+        .arrive({ codeList: [this.item.code], ...this.form })
+        .then(res => {
+          if (res.success) {
+            uni.showToast({ title: '操作成功', icon: 'none' });
+            this.getOpenerEventChannel().emit('refreshData');
+            setTimeout(() => uni.navigateBack(), 500);
+          }
+        })
+        .catch(e => {
+          this.loading = false;
+          this.$refs.uToast.show({
+            type: 'default',
+            message: e,
+          });
+        });
     },
   },
 };
diff --git a/pages/order/start-car.vue b/pages/order/start-car.vue
index 0b7b137..251fefd 100644
--- a/pages/order/start-car.vue
+++ b/pages/order/start-car.vue
@@ -22,6 +22,7 @@
     <template #footer>
       <u-button type="primary" @tap="submit">确认发车</u-button>
     </template>
+    <u-toast ref="uToast"></u-toast>
   </Page>
 </template>
 
@@ -71,13 +72,22 @@ export default {
         uni.showToast({ title: '发车时间不能大于当前时间', icon: 'none' });
         return;
       }
-      uni.$u.api.freightOrder.depart({ codeList: [this.item.code], ...this.form }).then(res => {
-        if (res.success) {
-          uni.showToast({ title: '操作成功', icon: 'none' });
-          this.getOpenerEventChannel().emit('refreshData');
-          setTimeout(() => uni.navigateBack(), 500);
-        }
-      });
+      uni.$u.api.freightOrder
+        .depart({ codeList: [this.item.code], ...this.form })
+        .then(res => {
+          if (res.success) {
+            uni.showToast({ title: '操作成功', icon: 'none' });
+            this.getOpenerEventChannel().emit('refreshData');
+            setTimeout(() => uni.navigateBack(), 500);
+          }
+        })
+        .catch(e => {
+          this.loading = false;
+          this.$refs.uToast.show({
+            type: 'default',
+            message: e,
+          });
+        });
     },
   },
 };
--
libgit2 0.21.0