From dd2aa7c558eae88c171836dd274308656ba41443 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Tue, 27 Jun 2023 15:33:11 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Custom/CustomerAddresses/index.vue        |  7 +--
 src/views/business/Custom/Customers/index.vue |  7 +--
 src/views/business/Custom/Regions/index.vue   |  7 +--
 .../GoodsManager/GoodsCategorys/index.vue     |  7 +--
 .../GoodsManager/GoodsServicess/index.vue     |  7 +--
 .../Goodss/components/AddDialog.vue           |  6 +-
 .../Goodss/components/EditDialog.vue          |  6 +-
 .../business/GoodsManager/Goodss/index.vue    | 62 +++++++++++++++----
 .../GoodsManager/ShopGoodsCategorys/index.vue |  7 +--
 .../LogisticsManage/Deliverys/index.vue       |  7 +--
 .../LogisticsCompanys/index.vue               |  7 +--
 .../ShopManager/ShopAddresss/index.vue        |  7 +--
 .../business/ShopManager/Shops/index.vue      |  7 +--
 13 files changed, 76 insertions(+), 68 deletions(-)

diff --git a/src/views/business/Custom/CustomerAddresses/index.vue b/src/views/business/Custom/CustomerAddresses/index.vue
index 74afc4f..ff10ce0 100644
--- a/src/views/business/Custom/CustomerAddresses/index.vue
+++ b/src/views/business/Custom/CustomerAddresses/index.vue
@@ -213,11 +213,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/Custom/Customers/index.vue b/src/views/business/Custom/Customers/index.vue
index 2539690..cda81fc 100644
--- a/src/views/business/Custom/Customers/index.vue
+++ b/src/views/business/Custom/Customers/index.vue
@@ -236,11 +236,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/Custom/Regions/index.vue b/src/views/business/Custom/Regions/index.vue
index 86d96cd..a343dff 100644
--- a/src/views/business/Custom/Regions/index.vue
+++ b/src/views/business/Custom/Regions/index.vue
@@ -214,11 +214,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/GoodsManager/GoodsCategorys/index.vue b/src/views/business/GoodsManager/GoodsCategorys/index.vue
index 83a7477..2bd0e92 100644
--- a/src/views/business/GoodsManager/GoodsCategorys/index.vue
+++ b/src/views/business/GoodsManager/GoodsCategorys/index.vue
@@ -261,11 +261,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/GoodsManager/GoodsServicess/index.vue b/src/views/business/GoodsManager/GoodsServicess/index.vue
index 1704445..5cfef04 100644
--- a/src/views/business/GoodsManager/GoodsServicess/index.vue
+++ b/src/views/business/GoodsManager/GoodsServicess/index.vue
@@ -227,11 +227,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/GoodsManager/Goodss/components/AddDialog.vue b/src/views/business/GoodsManager/Goodss/components/AddDialog.vue
index 30379c6..3c5ca06 100644
--- a/src/views/business/GoodsManager/Goodss/components/AddDialog.vue
+++ b/src/views/business/GoodsManager/Goodss/components/AddDialog.vue
@@ -29,10 +29,10 @@
 
 
             <el-col :lg="12">
-              <el-form-item :label-width="labelWidth" label="商品类目" prop="goodsCategoryGuid">
+              <el-form-item :label-width="labelWidth" label="商品类目" prop="shopGoodsCategoryGuid">
                 <el-cascader class="w100" :options="dataList"
                   :props="{ checkStrictly: true, value: 'shopGoodsCategoryGuid', label: 'shopGoodsCategoryName', emitPath: false }"
-                  placeholder="请选择商品类目" clearable v-model="formData.goodsCategoryGuid">
+                  placeholder="请选择商品类目" clearable v-model="formData.shopGoodsCategoryGuid">
                   <template #default="{ node, data }">
                     <span>{{ data.shopGoodsCategoryName }}</span>
                     <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -539,7 +539,7 @@ const imgData = ref({
 // 验证
 const rules = reactive({
   shopGuid: [{ required: true, message: "店铺不能为空", trigger: "blur" }],
-  goodsCategoryGuid: [{ required: true, message: "商品类目不能为空", trigger: "blur" }],
+  shopGoodsCategoryGuid: [{ required: true, message: "商品类目不能为空", trigger: "blur" }],
   goodsSpecType: [{ required: true, message: "规格类型不能为空", trigger: "blur" }],
   deliveryGuid: [{ required: true, message: "配送模板不能为空", trigger: "blur" }],
   goodsName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
diff --git a/src/views/business/GoodsManager/Goodss/components/EditDialog.vue b/src/views/business/GoodsManager/Goodss/components/EditDialog.vue
index ac18cea..d72d402 100644
--- a/src/views/business/GoodsManager/Goodss/components/EditDialog.vue
+++ b/src/views/business/GoodsManager/Goodss/components/EditDialog.vue
@@ -25,10 +25,10 @@
 
 
             <el-col :lg="12">
-              <el-form-item :label-width="labelWidth" label="商品类目" prop="goodsCategoryGuid">
+              <el-form-item :label-width="labelWidth" label="商品类目" prop="shopGoodsCategoryGuid">
                 <el-cascader class="w100" :options="dataList"
                   :props="{ checkStrictly: true, value: 'shopGoodsCategoryGuid', label: 'shopGoodsCategoryName', emitPath: false }"
-                  placeholder="请选择商品类目" clearable v-model="formData.goodsCategoryGuid">
+                  placeholder="请选择商品类目" clearable v-model="formData.shopGoodsCategoryGuid">
                   <template #default="{ node, data }">
                     <span>{{ data.shopGoodsCategoryName }}</span>
                     <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -524,7 +524,7 @@ const imgData = ref({
 // 验证
 const rules = reactive({
   shopGuid: [{ required: true, message: "店铺不能为空", trigger: "blur" }],
-  goodsCategoryGuid: [{ required: true, message: "商品类目不能为空", trigger: "blur" }],
+  shopGoodsCategoryGuid: [{ required: true, message: "商品类目不能为空", trigger: "blur" }],
   goodsSpecType: [{ required: true, message: "规格类型不能为空", trigger: "blur" }],
   deliveryGuid: [{ required: true, message: "配送模板不能为空", trigger: "blur" }],
   goodsName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
diff --git a/src/views/business/GoodsManager/Goodss/index.vue b/src/views/business/GoodsManager/Goodss/index.vue
index 8c16769..d870d79 100644
--- a/src/views/business/GoodsManager/Goodss/index.vue
+++ b/src/views/business/GoodsManager/Goodss/index.vue
@@ -15,9 +15,25 @@
         <el-form-item label="店铺名称">
           <el-input v-model.number="queryParams.shopName" placeholder="请输入店铺名称" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="商品类目guid" prop="goodsCategoryGuid">
-          <el-input v-model.number="queryParams.goodsCategoryGuid" placeholder="请输入选择商品类目" clearable
-            @keyup.enter="handleQuery" />
+        <el-form-item label="经营类目" prop="goodsCategoryGuid" v-if="userid == 1">
+          <el-cascader class="w100" :options="goodsCategoryTreeListData"
+            :props="{ checkStrictly: true, value: 'goodsCategoryGuid', label: 'goodsCategoryName', emitPath: false }"
+            placeholder="请选择经营类目" clearable v-model="queryParams.goodsCategoryGuid" @change="handleQuery">
+            <template #default="{ node, data }">
+              <span>{{ data.goodsCategoryName }}</span>
+              <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+            </template>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="商品类目" prop="goodsCategoryGuid" v-else>
+          <el-cascader class="w100" :options="shopGoodsCategoryTreeListData"
+            :props="{ checkStrictly: true, value: 'shopGoodsCategoryGuid', label: 'shopGoodsCategoryName', emitPath: false }"
+            placeholder="请选择商品类目" clearable v-model="queryParams.shopGoodsCategoryGuid" @change="handleQuery">
+            <template #default="{ node, data }">
+              <span>{{ data.shopGoodsCategoryName }}</span>
+              <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+            </template>
+          </el-cascader>
         </el-form-item>
         <el-form-item label="商品名称" prop="goodsName">
           <el-input v-model="queryParams.goodsName" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
@@ -64,7 +80,8 @@
       <el-table-column type="selection" width="50" align="center" />
 
       <el-table-column prop="goodsId" width="100" label="商品ID" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="shopName" width="150" label="店铺名称" align="center" :show-overflow-tooltip="true" v-if="userid == 1" />
+      <el-table-column prop="shopName" width="150" label="店铺名称" align="center" :show-overflow-tooltip="true"
+        v-if="userid == 1" />
       <el-table-column prop="goodsPicture" label="图片" align="center">
         <template #default="scope">
           <el-image preview-teleported :hide-on-click-modal="true" lazy class="table-td-thumb" fit="contain"
@@ -75,7 +92,7 @@
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column prop="goodsName" label="商品名称" width="500" align="center" :show-overflow-tooltip="true" />
+      <el-table-column prop="goodsName" label="商品名称" width="450" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="goodsPriceLowest" label="价格" align="center" />
       <el-table-column prop="goodsSalesActual" label="实际销量" align="center" />
       <el-table-column prop="goodsTotalInventory" label="库存总量" align="center" />
@@ -85,7 +102,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="goodsSort" label="排序" align="center" />
-      <el-table-column prop="createTime" label="添加时间" align="center" />
+      <el-table-column prop="createTime" label="添加时间" width="150" align="center" />
 
       <el-table-column label="操作" width="250" fixed="right" align="center">
         <template #default="scope">
@@ -115,6 +132,8 @@
 import { ElMessageBox } from 'element-plus'
 import modal from '@/plugins/modal.js'
 import { exportGoods, goodsList, delGoods } from '@/api/business/GoodsManager/Goodss/goods.js'
+import { goodsCategoryTreeList } from '@/api/business/GoodsManager/GoodsCategorys/goodsCategory.js'
+import { shopGoodsCategoryTreeList } from '@/api/business/GoodsManager/ShopGoodsCategorys/shopGoodsCategory.js'
 import AddDialog from "./components/AddDialog.vue";
 import EditDialog from "./components/EditDialog.vue";
 import DetailDialog from "./components/DetailDialog.vue";
@@ -219,7 +238,27 @@ async function getshelf_status() {
 getshelf_status()
 
 
+// 获取商品类目树形列表
+const shopGoodsCategoryTreeListData = ref([])
+async function getShopGoodsCategoryTreeList() {
+  shopGoodsCategoryTreeList().then((res) => {
+    if (res.code == 200) {
+      shopGoodsCategoryTreeListData.value = res.data
+    }
+  })
+}
+getShopGoodsCategoryTreeList()
 
+// 获取经营类目树形列表
+const goodsCategoryTreeListData = ref([])
+async function getGoodsCategoryTreeList() {
+  goodsCategoryTreeList().then((res) => {
+    if (res.code == 200) {
+      goodsCategoryTreeListData.value = res.data
+    }
+  })
+}
+getGoodsCategoryTreeList()
 
 //基础方法
 
@@ -240,6 +279,7 @@ function getList() {
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
+  console.log(selection,'检查 selection 中的内容'); // 检查 selection 中的内容
   ids.value = selection.map((item) => item.goodsId)
   single.value = selection.length != 1
   multiple.value = !selection.length
@@ -277,15 +317,13 @@ function handleDelete(row) {
 function handleExport(row) {
   const Ids = row.goodsId || ids.value
   const name = ref("所有")
-
+  console.log(Ids,'ids是什么呢');
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
+    console.log(queryParams.value,'搜索内容');
   }
 
   ElMessageBox.confirm('是否确认导出' + name.value + '数据?', '警告', {
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
index c7c055a..a03363b 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
@@ -245,11 +245,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/LogisticsManage/Deliverys/index.vue b/src/views/business/LogisticsManage/Deliverys/index.vue
index f0864de..3c79d9d 100644
--- a/src/views/business/LogisticsManage/Deliverys/index.vue
+++ b/src/views/business/LogisticsManage/Deliverys/index.vue
@@ -205,11 +205,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/LogisticsManage/LogisticsCompanys/index.vue b/src/views/business/LogisticsManage/LogisticsCompanys/index.vue
index df7a3d8..7fff223 100644
--- a/src/views/business/LogisticsManage/LogisticsCompanys/index.vue
+++ b/src/views/business/LogisticsManage/LogisticsCompanys/index.vue
@@ -192,11 +192,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/ShopManager/ShopAddresss/index.vue b/src/views/business/ShopManager/ShopAddresss/index.vue
index 64b3d65..2297fe4 100644
--- a/src/views/business/ShopManager/ShopAddresss/index.vue
+++ b/src/views/business/ShopManager/ShopAddresss/index.vue
@@ -203,11 +203,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }
diff --git a/src/views/business/ShopManager/Shops/index.vue b/src/views/business/ShopManager/Shops/index.vue
index baaedd8..151cedf 100644
--- a/src/views/business/ShopManager/Shops/index.vue
+++ b/src/views/business/ShopManager/Shops/index.vue
@@ -230,11 +230,8 @@ function handleExport(row) {
   const name = ref("所有")
 
   if (Ids.length != 0) {
-    let str = ''
-    for (const key in Ids) {
-      str += Ids[key] + ','
-    }
-    str = str.slice(0, str.length - 1)
+    const ids = Object.values(Ids).map(value => String(value));
+    const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
   }