From 91cdea5713b3c5630e9fd92aca5cb814f5276cb2 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 16 Oct 2024 15:57:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95=E5=BD=95?=
 =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=E8=BD=A6=E5=9E=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/inventory/CreateOrder.vue    | 33 ++++++++++++++---
 src/views/waybill/CreateZeroOrder.vue         | 36 +++++++++++++++----
 2 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index b479e8bc..afe530ab 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -421,12 +421,24 @@
               <el-select
                 class="w100"
                 :disabled="!query.isPickUp || !query.pickupCompleteOrNot"
-                v-model="query.pickupVehicleType"
+                v-model="query.pickupVehicleTypeId"
                 filterable
                 clearable
                 placeholder="请选择车型"
                 @change="
                   () => {
+                    let _item = {} as any
+
+                    for (let i = 0; i < details.vehicleTypeArr.length; i++) {
+                      const val = details.vehicleTypeArr[i];
+                      
+                      if (val.dictKey !== query.pickupVehicleTypeId) continue
+                      _item = val
+                      break
+                    }
+
+                    query.pickupVehicleType = _item.dictValue || ''
+
                     details.query.pickupFee = 0;
                     handlePrice(false, 'pickup');
                   }
@@ -466,12 +478,23 @@
               <el-select
                 class="w100"
                 :disabled="!query.trunklineCompleteOrNot"
-                v-model="query.trunklineVehicleType"
+                v-model="query.trunklineVehicleTypeId"
                 filterable
                 clearable
                 placeholder="请选择车型"
                 @change="
                   () => {
+                    let _item = {} as any
+
+                    for (let i = 0; i < details.vehicleTypeArr.length; i++) {
+                      const val = details.vehicleTypeArr[i];
+                      
+                      if (val.dictKey !== query.trunklineVehicleTypeId) continue
+                      _item = val
+                      break
+                    }
+
+                    query.trunklineVehicleType = _item.dictValue || ''
                     details.query.totalFreight = 0;
                     handlePrice(false, 'trunkline');
                   }
@@ -1572,11 +1595,13 @@ const details = reactive<any>({
     /** 是否整车 -- 提货 */
     pickupCompleteOrNot: 0,
     /** 提货整车车型 */
+    pickupVehicleTypeId: '',
     pickupVehicleType: '',
     /** 是否整车 -- 干线 */
     trunklineCompleteOrNot: 0,
     /** 干线整车车型 */
     trunklineVehicleType: '',
+    trunklineVehicleTypeId: '',
     /** 商场编码 */
     dealerCode: '',
     /** 商场名称 */
@@ -3112,7 +3137,7 @@ const handlePickUpPrice = (pickup, template) => {
     for (let i = 0; i < fullVehicle.length; i++) {
       const value = fullVehicle[i];
 
-      if (Number(value.vehicleType) !== Number(details.query.pickupVehicleType)) continue;
+      if (Number(value.vehicleType) !== Number(details.query.pickupVehicleTypeId)) continue;
       item = value;
       break;
     }
@@ -3189,7 +3214,7 @@ const handleTrunkLinePrice = (trunkLine, template) => {
     for (let i = 0; i < fullVehicle.length; i++) {
       const value = fullVehicle[i];
 
-      if (Number(value.vehicleType) !== Number(details.query.trunklineVehicleType)) continue;
+      if (Number(value.vehicleType) !== Number(details.query.trunklineVehicleTypeId)) continue;
       item = value;
       break;
     }
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index c2d89ce0..9b24a11a 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -387,12 +387,23 @@
             <el-select
               class="w100"
               :disabled="!query.isPickUp || !query.pickupCompleteOrNot"
-              v-model="query.pickupVehicleType"
+              v-model="query.pickupVehicleTypeId"
               filterable
               clearable
               placeholder="请选择车型"
               @change="
                 () => {
+                    let _item = {} as any
+
+                    for (let i = 0; i < details.vehicleTypeArr.length; i++) {
+                      const val = details.vehicleTypeArr[i];
+                      
+                      if (val.dictKey !== query.pickupVehicleTypeId) continue
+                      _item = val
+                      break
+                    }
+
+                    query.pickupVehicleType = _item.dictValue || ''
                   details.query.pickupFee = 0;
                   handlePrice(false, 'pickup');
                 }
@@ -432,14 +443,25 @@
             <el-select
               class="w100"
               :disabled="!query.trunklineCompleteOrNot"
-              v-model="query.trunklineVehicleType"
+              v-model="query.trunklineVehicleTypeId"
               filterable
               clearable
               placeholder="请选择车型"
               @change="
                 () => {
-                  details.query.totalFreight = 0;
-                  handlePrice(false, 'trunkline');
+                    let _item = {} as any
+
+                    for (let i = 0; i < details.vehicleTypeArr.length; i++) {
+                      const val = details.vehicleTypeArr[i];
+                      
+                      if (val.dictKey !== query.trunklineVehicleTypeId) continue
+                      _item = val
+                      break
+                    }
+
+                    query.trunklineVehicleType = _item.dictValue || ''
+                    details.query.totalFreight = 0;
+                    handlePrice(false, 'trunkline');
                 }
               "
             >
@@ -1246,10 +1268,12 @@ const details = reactive<any>({
     /** 是否整车 -- 提货 */
     pickupCompleteOrNot: 0,
     /** 提货整车车型 */
+    pickupVehicleTypeId: '',
     pickupVehicleType: '',
     /** 是否整车 -- 干线 */
     trunklineCompleteOrNot: 0,
     /** 干线整车车型 */
+    trunklineVehicleTypeId: '',
     trunklineVehicleType: '',
   },
   /** 价格模板数据 */
@@ -2281,7 +2305,7 @@ const handlePickUpPrice = (pickup, template) => {
     for (let i = 0; i < fullVehicle.length; i++) {
       const value = fullVehicle[i];
 
-      if (Number(value.vehicleType) !== Number(details.query.pickupVehicleType)) continue;
+      if (Number(value.vehicleType) !== Number(details.query.pickupVehicleTypeId)) continue;
       item = value;
       break;
     }
@@ -2356,7 +2380,7 @@ const handleTrunkLinePrice = (trunkLine, template) => {
     for (let i = 0; i < fullVehicle.length; i++) {
       const value = fullVehicle[i];
 
-      if (Number(value.vehicleType) !== Number(details.query.trunklineVehicleType)) continue;
+      if (Number(value.vehicleType) !== Number(details.query.trunklineVehicleTypeId)) continue;
       item = value;
       break;
     }