From 750bc8593f84eb4fa50576ece308ea62d2ff33c5 Mon Sep 17 00:00:00 2001
From: "AERWEN\\26795" <123456789a>
Date: Thu, 26 Oct 2023 09:40:41 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E8=87=AA=E8=90=A5?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/GoodsManager/Goodss/index.vue     |  5 +++--
 .../components/AddDialog.vue                   | 17 +++++++++++++++++
 .../components/DetailDialog.vue                | 18 +++++++++++++++++-
 .../components/EditDialog.vue                  | 18 +++++++++++++++++-
 .../GoodsManager/ShopGoodsCategorys/index.vue  | 18 +++++++++++++++---
 5 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/src/views/business/GoodsManager/Goodss/index.vue b/src/views/business/GoodsManager/Goodss/index.vue
index 163fe4b..3dcf946 100644
--- a/src/views/business/GoodsManager/Goodss/index.vue
+++ b/src/views/business/GoodsManager/Goodss/index.vue
@@ -12,9 +12,9 @@
       <!-- 搜索框 queryParams.需要搜索的字段 -->
       <el-form :model="queryParams" label-position="left" style="margin:15px;" inline ref="queryForm" v-show="showSearch"
         @submit.prevent>
-        <el-form-item label="店铺名称">
+        <!-- <el-form-item label="类目名称">
           <el-input v-model.number="queryParams.shopName" placeholder="请输入店铺名称" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
+        </el-form-item> -->
         <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 }"
@@ -92,6 +92,7 @@
       <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="goodsCategoryName" width="250" label="类目" align="center" :show-overflow-tooltip="true"/>
       <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"
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/components/AddDialog.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/components/AddDialog.vue
index b4fdb84..10c0203 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/components/AddDialog.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/components/AddDialog.vue
@@ -52,6 +52,14 @@
               :drag="true" />
           </el-form-item>
         </el-col>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="是否为热门" prop="shopGoodsCategoryIsPopular">
+            <el-radio-group v-model="formData.shopGoodsCategoryIsPopular">
+              <el-radio v-for="item in  is_popular " :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                item.dictLabel }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :lg="24">
           <el-form-item :label-width="labelWidth" label="显示状态" prop="shopGoodsCategoryDisplayStatus">
             <el-radio-group v-model="formData.shopGoodsCategoryDisplayStatus">
@@ -98,6 +106,7 @@ const openDialog = async () => {
   formData.shopGoodsCategoryParentGuid = props.data?.shopGoodsCategoryGuid
 
   await getdisplay_status()
+  await getis_popular()
   await getTreeList()
 }
 
@@ -106,6 +115,8 @@ const userid = useUserStore().userId
 const dataList = ref([])
 // 显示状态字典选项列表
 const display_status = ref([]);
+// 是否为热门字典选项列表
+const is_popular = ref([]);
 // 选择店铺弹窗参数
 const ChooseShopDialogVisible = ref(false);
 const ChooseShopDialogRow = ref({});
@@ -117,6 +128,12 @@ async function getdisplay_status() {
     display_status.value = res.data
   })
 }
+// 字典获取
+async function getis_popular() {
+  await proxy.getDicts('is_popular').then((res) => {
+    is_popular.value = res.data
+  })
+}
 
 // 打开选择店铺弹窗
 const handleChooseShop = () => {
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/components/DetailDialog.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/components/DetailDialog.vue
index dc968da..100a62a 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/components/DetailDialog.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/components/DetailDialog.vue
@@ -46,6 +46,14 @@
               :drag="true" />
           </el-form-item>
         </el-col>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="是否为热门" prop="shopGoodsCategoryIsPopular">
+            <el-radio-group v-model="formData.shopGoodsCategoryIsPopular">
+              <el-radio v-for="item in  is_popular " :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                item.dictLabel }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :lg="24">
           <el-form-item :label-width="labelWidth" label="显示状态" prop="shopGoodsCategoryDisplayStatus">
             <el-radio-group v-model="formData.shopGoodsCategoryDisplayStatus">
@@ -75,6 +83,7 @@ import { shopGoodsCategoryTreeList } from "@/api/business/GoodsManager/ShopGoods
 // 打开弹窗时回调
 const openDialog = async () => {
   await getdisplay_status()
+  await getis_popular()
 
   await getTreeList()
 }
@@ -91,6 +100,8 @@ const userid = useUserStore().userId
 const dataList = ref([])
 // 显示状态字典选项列表
 const display_status = ref([]);
+// 是否为热门字典选项列表
+const is_popular = ref([]);
 
 // -业务方法
 // 字典获取
@@ -99,7 +110,12 @@ async function getdisplay_status() {
     display_status.value = res.data
   })
 }
-
+// 字典获取
+async function getis_popular() {
+  await proxy.getDicts('is_popular').then((res) => {
+    is_popular.value = res.data
+  })
+}
 
 
 // 基础参数
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/components/EditDialog.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/components/EditDialog.vue
index 6dd32b8..303f58a 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/components/EditDialog.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/components/EditDialog.vue
@@ -46,6 +46,14 @@
               :drag="true" />
           </el-form-item>
         </el-col>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="是否为热门" prop="shopGoodsCategoryIsPopular">
+            <el-radio-group v-model="formData.shopGoodsCategoryIsPopular">
+              <el-radio v-for="item in  is_popular " :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                item.dictLabel }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :lg="24">
           <el-form-item :label-width="labelWidth" label="显示状态" prop="shopGoodsCategoryDisplayStatus">
             <el-radio-group v-model="formData.shopGoodsCategoryDisplayStatus">
@@ -83,6 +91,7 @@ import { shopGoodsCategoryTreeList, addOrUpdateShopGoodsCategory } from "@/api/b
 // 打开弹窗时回调
 const openDialog = async () => {
   await getdisplay_status()
+  await getis_popular()
 
   await getTreeList()
 }
@@ -100,6 +109,8 @@ const userid = useUserStore().userId
 const dataList = ref([])
 // 显示状态字典选项列表
 const display_status = ref([]);
+// 是否为热门字典选项列表
+const is_popular = ref([]);
 
 // -业务方法
 //字典获取
@@ -108,7 +119,12 @@ async function getdisplay_status() {
     display_status.value = res.data
   })
 }
-
+// 字典获取
+async function getis_popular() {
+  await proxy.getDicts('is_popular').then((res) => {
+    is_popular.value = res.data
+  })
+}
 
 
 // -基础参数
diff --git a/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue b/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
index ff73b3b..bf28ab8 100644
--- a/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
+++ b/src/views/business/GoodsManager/ShopGoodsCategorys/index.vue
@@ -70,6 +70,11 @@
           </el-image>
         </template>
       </el-table-column>
+      <el-table-column prop="shopGoodsCategoryIsPopular" label="是否为热门" align="center">
+        <template #default="scope">
+          <dict-tag :options=" is_popular " :value="scope.row.shopGoodsCategoryIsPopular" />
+        </template>
+      </el-table-column>
       <el-table-column prop="shopGoodsCategoryDisplayStatus" label="显示状态" align="center">
         <template #default="scope">
           <dict-tag :options=" display_status " :value="scope.row.shopGoodsCategoryDisplayStatus" />
@@ -136,7 +141,7 @@ const total = ref(0)
 // 是否加载
 const loading = ref(true)
 // 是否展开，默认全部折叠
-const isExpandAll = ref(false)
+const isExpandAll = ref(true)
 const refreshTable = ref(true)
 
 const data = reactive({
@@ -160,7 +165,14 @@ async function getdisplay_status() {
   })
 }
 getdisplay_status()
-
+// 字典获取
+const is_popular = ref([]);
+async function getis_popular() {
+  await proxy.getDicts('is_popular').then((res) => {
+    is_popular.value = res.data
+  })
+}
+getis_popular()
 
 
 
@@ -190,7 +202,7 @@ function getList() {
       loading.value = false
 
       if (queryParams.value.shopGoodsCategoryName == undefined) {
-        isExpandAll.value = false
+        // isExpandAll.value = false
         dataList.value = res.data
       } else {
         dataList.value = []