From 06a771ef43c61e374a9f68d9752dc9e3a2058be5 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 10 Jul 2024 11:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/inventory/CreateOrder.vue    |  1 +
 src/views/waybill/CreateZeroOrder.vue         | 41 ++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index e76e5fa2..63c98c54 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2540,6 +2540,7 @@ const handleChooseConsigner = (column, prop, order) => {
   if (column.destinationWarehouseId) {
     details.query.destinationWarehouseId = column.destinationWarehouseId;
     details.query.destinationWarehouseName = column.destinationWarehouseName;
+    details.query.queryDestinationWarehouseName = column.destinationWarehouseName;
   }
 
   // 送货方式
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 1018238a..46fcf7b8 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -137,6 +137,32 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="目的仓:" class="el-times" prop="queryDestinationWarehouseName">
+            <el-select
+              class="w100"
+              v-model="query.queryDestinationWarehouseName"
+              filterable
+              remote
+              reserve-keyword
+              placeholder="目的仓"
+              @change="
+                val => {
+                  destinationWarehouseNameChange(val);
+                  handleFindPrice();
+                }
+              "
+              :remote-method="value => debounce(remoteMethod(value), 500)"
+              :loading="details.loadingObj.loading"
+            >
+              <el-option
+                v-for="item in details.options || []"
+                :key="item.value"
+                :label="item.warehouseName"
+                :value="item.warehouseId"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="货号:" prop="goodsCode">
             <el-input v-model="query.goodsCode" placeholder="货号"></el-input>
           </el-form-item>
@@ -1150,6 +1176,7 @@ const details = reactive<any>({
     destinationWarehouseName: '',
     /** 目的仓Id */
     destinationWarehouseId: '',
+    queryDestinationWarehouseName: '',
     /** 货物号 */
     goodsCode: '',
     /** 发货单位id */
@@ -1355,11 +1382,11 @@ const details = reactive<any>({
       },
     ],
     /** 目的站名称 */
-    destinationWarehouseName: [
+    queryDestinationWarehouseName: [
       {
         required: true,
         message: '请选择目的仓',
-        trigger: ['change', 'blur'],
+        trigger: ['blur', 'change'],
       },
     ],
     /** 发货单位 */
@@ -1823,7 +1850,7 @@ const onLoad = async () => {
     }
     // 初始化选择支付方式
     if (details.info.defaultPayWay) {
-      details.info.payWay = details.info.defaultPayWay;
+      details.query.payWay = details.info.defaultPayWay;
     } else {
       details.query.payWay =
         details.info.payWayList.find(val => val.dictValue === '到付').dictKey || '2';
@@ -1954,9 +1981,10 @@ remoteMethod('');
 
 /** 目的仓选择时给目的仓名称赋值 */
 const destinationWarehouseNameChange = val => {
-  details.query.destinationWarehouseName = details.options.find(
-    value => value.warehouseId === val
-  ).warehouseName;
+  const _item = details.options.find(value => value.warehouseId === val);
+  details.query.destinationWarehouseName = _item.warehouseName;
+  details.query.destinationWarehouseId = _item.warehouseId;
+  details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
 };
 
 /** 查询货物 */
@@ -2089,6 +2117,7 @@ const handleChooseConsigner = (column, prop, order) => {
   if (column.destinationWarehouseId) {
     details.query.destinationWarehouseId = column.destinationWarehouseId;
     details.query.destinationWarehouseName = column.destinationWarehouseName;
+    details.query.queryDestinationWarehouseName = column.destinationWarehouseName;
   }
 
   // 送货方式