From 67b238e11d8fc81b546409a1ea0d4c2a5ba4618a Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 17 Jun 2025 13:27:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(commodity):=20=E5=95=86=E5=93=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=9A=B6=E5=B1=9E=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logistics/commodity/ckspdd.vue | 32 ++++++++++++--
 src/views/logistics/commodity/index.vue  | 54 ++++++++++++++++++------
 2 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/src/views/logistics/commodity/ckspdd.vue b/src/views/logistics/commodity/ckspdd.vue
index a2b368e..90c1d8d 100644
--- a/src/views/logistics/commodity/ckspdd.vue
+++ b/src/views/logistics/commodity/ckspdd.vue
@@ -54,6 +54,21 @@
               <el-input v-model="queryParams.memberName" clearable />
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'隶属体系'" prop="vertexId">
+              <el-select
+                v-model="queryParams.vertexId"
+                clearable
+              >
+                <el-option
+                  v-for="item in vertexList"
+                  :key="item.pkId"
+                  :label="item.vertexName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item :label="'联系方式'" prop="phone">
               <el-input v-model="queryParams.phone" clearable />
@@ -321,6 +336,12 @@
             prop="memberName"
             :label="'会员姓名'"
           />
+          <el-table-column
+            align="center"
+            prop="vertexName"
+            :label="'隶属体系'"
+            min-width="120"
+          />
           <el-table-column
             align="center"
             min-width="120px"
@@ -475,7 +496,7 @@ import topBar from '@/components/topBar'
 import * as log from '@/api/logistics'
 import * as del from '@/api/delivery'
 import { getStatus } from '@/api/notice'
-
+import { getVartexList } from '@/api/affiliatedteam'
 export default {
   name: 'Ckspdd',
   components: {
@@ -507,14 +528,16 @@ export default {
         pageNum: 1,
         pageSize: 50,
         orderCode: '',
-        orderStatus: ''
+        orderStatus: '',
+        vertexId: ''
       },
       orderStatusList: [],
       tableData: [],
       orderTypeList: [],
       shippingTypeList: [],
       payTypeList: [],
-      total: 0
+      total: 0,
+      vertexList: []
     }
   },
   created() {
@@ -522,6 +545,9 @@ export default {
     this.getOthers()
     this.getSearch()
     this.getOrderStatus()
+    getVartexList().then((res) => {
+      this.vertexList = res.data
+    })
   },
   methods: {
     getOrderStatus() {
diff --git a/src/views/logistics/commodity/index.vue b/src/views/logistics/commodity/index.vue
index ef8f1ab..bd64976 100644
--- a/src/views/logistics/commodity/index.vue
+++ b/src/views/logistics/commodity/index.vue
@@ -19,7 +19,21 @@
               <el-input v-model="queryParams.memberName" clearable />
             </el-form-item>
           </el-col>
-
+          <el-col :span="4">
+            <el-form-item :label="'隶属体系'" prop="vertexId">
+              <el-select
+                v-model="queryParams.vertexId"
+                clearable
+              >
+                <el-option
+                  v-for="item in vertexList"
+                  :key="item.pkId"
+                  :label="item.vertexName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item :label="'联系方式'" prop="phone">
               <el-input v-model="queryParams.phone" clearable />
@@ -58,8 +72,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+
           <el-col :span="4">
             <el-form-item :label="'收货人'" prop="recName">
               <el-input v-model="queryParams.recName" clearable />
@@ -97,20 +110,21 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item
-              :label="`${'购买人' + '姓名'}`"
-              prop="buyMemberName"
-            >
-              <el-input
-                v-model="queryParams.buyMemberName"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
+
         </el-row>
         <el-collapse-transition>
           <el-row v-show="isActive">
+            <el-col :span="4">
+              <el-form-item
+                :label="`${'购买人' + '姓名'}`"
+                prop="buyMemberName"
+              >
+                <el-input
+                  v-model="queryParams.buyMemberName"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item :label="'支付方式'" prop="payType">
                 <el-select
@@ -236,6 +250,12 @@
             prop="memberCode"
             :label="'会员编号'"
           />
+          <el-table-column
+            align="center"
+            prop="vertexName"
+            :label="'隶属体系'"
+            min-width="120"
+          />
           <el-table-column
             v-if="dataList[3].key"
             align="center"
@@ -410,6 +430,7 @@
 import topBar from '@/components/topBar'
 import * as log from '@/api/logistics'
 import * as api from '@/api/site.js'
+import { getVartexList } from '@/api/affiliatedteam'
 import { getRoleMenu, roleDetails, getStatus } from '@/api/notice'
 export default {
   name: 'Spdd',
@@ -419,6 +440,7 @@ export default {
   data() {
     return {
       moren: 'spdd',
+      vertexList: [],
       dataList: [
         {
           name: 'orderCode',
@@ -523,6 +545,7 @@ export default {
 
       multipleSelection: [],
       queryParams: {
+        vertexId: '',
         pageNum: 1,
         pageSize: 50,
         shoppingAddress: [],
@@ -623,6 +646,9 @@ export default {
       log.getOrderPayType().then((res) => {
         this.paywayList = res.data
       })
+      getVartexList().then((res) => {
+        this.vertexList = res.data
+      })
     },
     // 展开折叠
     changeActive() {