From b8977dde71e8525704ee8f447fce797211d75940 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Mon, 11 Aug 2025 17:20:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(logistics):=20=E5=AD=97=E6=AE=B5=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logistics/commodity/ckspdd.vue | 34 ++++++++++++------------
 src/views/logistics/commodity/index.vue  | 32 +++++++++++-----------
 src/views/logistics/delivery/index.vue   |  8 +++---
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/views/logistics/commodity/ckspdd.vue b/src/views/logistics/commodity/ckspdd.vue
index c5f0856..7c7d75b 100644
--- a/src/views/logistics/commodity/ckspdd.vue
+++ b/src/views/logistics/commodity/ckspdd.vue
@@ -74,22 +74,7 @@
               <el-input v-model="queryParams.phone" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="是否加购" prop="addPurchaseFlag">
-              <el-select
-                v-model="queryParams.addPurchaseFlag"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="(item, index) in addPurchaseFlagList"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="4">
             <el-form-item :label="'商品编号'" prop="commodityCode">
               <el-input
@@ -166,7 +151,22 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <el-col :span="4">
+            <el-form-item label="是否加购" prop="addPurchaseFlag">
+              <el-select
+                v-model="queryParams.addPurchaseFlag"
+                clearable
+                :placeholder="'请选择'"
+              >
+                <el-option
+                  v-for="(item, index) in addPurchaseFlagList"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item :label="'创建日期'">
               <el-date-picker
diff --git a/src/views/logistics/commodity/index.vue b/src/views/logistics/commodity/index.vue
index 7070159..5bd0525 100644
--- a/src/views/logistics/commodity/index.vue
+++ b/src/views/logistics/commodity/index.vue
@@ -55,22 +55,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="是否加购" prop="addPurchaseFlag">
-              <el-select
-                v-model="queryParams.addPurchaseFlag"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="(item, index) in addPurchaseFlagList"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="4">
             <el-form-item :label="'发货方式'" prop="deliveryWay">
               <el-select
@@ -156,6 +140,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="是否加购" prop="addPurchaseFlag">
+                <el-select
+                  v-model="queryParams.addPurchaseFlag"
+                  clearable
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="(item, index) in addPurchaseFlagList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item :label="'创建日期'" prop="teamCode">
                 <el-date-picker
diff --git a/src/views/logistics/delivery/index.vue b/src/views/logistics/delivery/index.vue
index b6e3acb..2e5530e 100644
--- a/src/views/logistics/delivery/index.vue
+++ b/src/views/logistics/delivery/index.vue
@@ -222,7 +222,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <el-form-item label="非在售商品" prop="productIdList">
+                  <el-form-item label="非在售商品" prop="pkWaresList">
                     <el-input
                       v-model="productLists"
                       clearable
@@ -1149,7 +1149,7 @@ export default {
         payTime: [],
         printTime: [], // 打印时间2
         deliverTime: [], // 发货时间2
-        productIdList: []
+        pkWaresList: []
       },
       isActive: true,
       areaData: [],
@@ -1175,7 +1175,7 @@ export default {
   methods: {
     clearProduct() {
       this.selectedProductList = []
-      this.queryParams.productIdList = []
+      this.queryParams.pkWaresList = []
       this.productLists = ''
     },
     openDig() {
@@ -1342,7 +1342,7 @@ export default {
     },
     handleSubmit(products) {
       this.selectedProductList = [...products]
-      this.queryParams.productIdList = products.map((item) => item.pkId).join(',')
+      this.queryParams.pkWaresList = products.map((item) => item.pkId).join(',')
       this.productLists = products.map((item) => item.waresName).join(',')
     }
   }