From a317ea2213b5b46b0f0f42b293a16c694e0d0ae7 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Thu, 15 Jun 2023 21:27:26 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E7=BB=8F=E8=90=A5=E7=B1=BB=E7=9B=AE=E4=B8=BA=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?(=E4=BA=8C=E7=BA=A7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GoodsManager/GoodsCategorys/index.vue     |  2 +-
 .../Shops/components/AddDialog.vue            | 25 +++++++++++++------
 .../Shops/components/DetailDialog.vue         | 23 ++++++++++++-----
 .../Shops/components/EditDialog.vue           | 24 ++++++++++++------
 4 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/src/views/business/GoodsManager/GoodsCategorys/index.vue b/src/views/business/GoodsManager/GoodsCategorys/index.vue
index 73c637c..1fcda6d 100644
--- a/src/views/business/GoodsManager/GoodsCategorys/index.vue
+++ b/src/views/business/GoodsManager/GoodsCategorys/index.vue
@@ -59,7 +59,7 @@
 	<el-table v-loading="loading" :data="dataList" ref="tableRef" highlight-current-row @selection-change="handleSelectionChange" v-if="refreshTable" :default-expand-all="isExpandAll" row-key="goodsCategoryGuid" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column type="selection" width="50" align="center" />
 	  
-      <el-table-column prop="goodsCategoryName" label="名称" align="center" :show-overflow-tooltip="true" />
+      <el-table-column prop="goodsCategoryName" label="名称" align="left" :show-overflow-tooltip="true" />
       <el-table-column prop="goodsCategoryImg" label="图片" align="center">
         <template #default="scope">
           <el-image preview-teleported :hide-on-click-modal="true" lazy class="table-td-thumb" fit="contain" :src="scope.row.goodsCategoryImg?.split(',')[0]" :preview-src-list="scope.row.goodsCategoryImg?.split(',')">
diff --git a/src/views/business/ShopManager/Shops/components/AddDialog.vue b/src/views/business/ShopManager/Shops/components/AddDialog.vue
index 4eb7ed6..65030e9 100644
--- a/src/views/business/ShopManager/Shops/components/AddDialog.vue
+++ b/src/views/business/ShopManager/Shops/components/AddDialog.vue
@@ -30,14 +30,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :lg="24">
+      </el-row>
+
+      <el-row>
+        <el-col :lg="12">
           <el-form-item :label-width="labelWidth" label="经营类目" prop="shopBusinessCategoryGuid">
-            <el-select v-model="formData.shopBusinessCategoryGuid" placeholder="请选择经营类目">
-              <el-option v-for="item in  dataList " :key="item.goodsCategoryGuid" :label="item.goodsCategoryName"
-                :value="item.goodsCategoryGuid"></el-option>
-            </el-select>
+            <el-cascader class="w100" :options="dataList"
+              :props="{ checkStrictly: false, value: 'goodsCategoryGuid', label: 'goodsCategoryName', emitPath: false }"
+              placeholder="请选择经营类目" clearable v-model="formData.shopBusinessCategoryGuid">
+              <template #default="{ node, data }">
+                <span>{{ data.goodsCategoryName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+              </template>
+            </el-cascader>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row>
         <el-col :lg="12">
           <el-form-item :label-width="labelWidth" label="图标" prop="shopLogo">
             <UploadImage ref="uploadRef" v-model="formData.shopLogo" :data=imgData :limit="1" :fileSize="5"
@@ -93,7 +103,8 @@
 import { reactive, ref, watch } from "vue";
 import { ElMessage } from 'element-plus'
 import modal from '@/plugins/modal.js'
-import { addOrUpdateShop,getFirstGoodsCategoryList } from '@/api/business/ShopManager/Shops/shop.js';
+import { addOrUpdateShop, getFirstGoodsCategoryList } from '@/api/business/ShopManager/Shops/shop.js';
+import { goodsCategoryTreeList } from '@/api/business/GoodsManager/GoodsCategorys/goodsCategory.js';
 import ChooseCustomerDialog from './ChooseCustomerDialog.vue';
 import ChooseUserDialog from './ChooseUserDialog.vue';
 
@@ -131,7 +142,7 @@ async function getaudit_status() {
 
 // 获取经营类树形列表
 async function getTreeList() {
-  getFirstGoodsCategoryList().then((res) => {
+  goodsCategoryTreeList().then((res) => {
     if (res.code == 200) {
       dataList.value = res.data
     }
diff --git a/src/views/business/ShopManager/Shops/components/DetailDialog.vue b/src/views/business/ShopManager/Shops/components/DetailDialog.vue
index 96e60e7..30fba5a 100644
--- a/src/views/business/ShopManager/Shops/components/DetailDialog.vue
+++ b/src/views/business/ShopManager/Shops/components/DetailDialog.vue
@@ -22,14 +22,24 @@
             <el-input v-model='formData.customerNickname' disabled type="text"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :lg="24">
+      </el-row>
+
+      <el-row>
+        <el-col :lg="12">
           <el-form-item :label-width="labelWidth" label="经营类目" prop="shopBusinessCategoryGuid">
-            <el-select v-model="formData.shopBusinessCategoryGuid" placeholder="请选择经营类目">
-              <el-option v-for="item in  dataList " :key="item.goodsCategoryGuid" :label="item.goodsCategoryName"
-                :value="item.goodsCategoryGuid"></el-option>
-            </el-select>
+            <el-cascader class="w100" :options="dataList"
+              :props="{ checkStrictly: false, value: 'goodsCategoryGuid', label: 'goodsCategoryName', emitPath: false }"
+              clearable v-model="formData.shopBusinessCategoryGuid">
+              <template #default="{ node, data }">
+                <span>{{ data.goodsCategoryName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+              </template>
+            </el-cascader>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row>
         <el-col :lg="12">
           <el-form-item :label-width="labelWidth" label="图标" prop="shopLogo">
             <UploadImage ref="uploadRef" v-model="formData.shopLogo" :data=imgData :limit="1" :fileSize="5"
@@ -72,6 +82,7 @@
 import { ElMessage } from 'element-plus'
 import { reactive, ref, watch } from "vue";
 import { getFirstGoodsCategoryList } from '@/api/business/ShopManager/Shops/shop.js';
+import { goodsCategoryTreeList } from '@/api/business/GoodsManager/GoodsCategorys/goodsCategory.js';
 
 
 // 打开弹窗时回调
@@ -108,7 +119,7 @@ async function getaudit_status() {
 
 // 获取经营类树形列表
 async function getTreeList() {
-  getFirstGoodsCategoryList().then((res) => {
+  goodsCategoryTreeList().then((res) => {
     if (res.code == 200) {
       dataList.value = res.data
     }
diff --git a/src/views/business/ShopManager/Shops/components/EditDialog.vue b/src/views/business/ShopManager/Shops/components/EditDialog.vue
index 20b04b3..a5753cc 100644
--- a/src/views/business/ShopManager/Shops/components/EditDialog.vue
+++ b/src/views/business/ShopManager/Shops/components/EditDialog.vue
@@ -21,14 +21,24 @@
             <el-input v-model='formData.customerNickname' disabled type="text"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :lg="24">
+      </el-row>
+
+      <el-row>
+        <el-col :lg="12">
           <el-form-item :label-width="labelWidth" label="经营类目" prop="shopBusinessCategoryGuid">
-            <el-select v-model="formData.shopBusinessCategoryGuid" placeholder="请选择经营类目">
-              <el-option v-for="item in  dataList " :key="item.goodsCategoryGuid" :label="item.goodsCategoryName"
-                :value="item.goodsCategoryGuid"></el-option>
-            </el-select>
+            <el-cascader class="w100" :options="dataList"
+              :props="{ checkStrictly: false, value: 'goodsCategoryGuid', label: 'goodsCategoryName', emitPath: false }"
+              placeholder="请选择经营类目" clearable v-model="formData.shopBusinessCategoryGuid">
+              <template #default="{ node, data }">
+                <span>{{ data.goodsCategoryName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+              </template>
+            </el-cascader>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row>
         <el-col :lg="12">
           <el-form-item :label-width="labelWidth" label="图标" prop="shopLogo">
             <UploadImage ref="uploadRef" v-model="formData.shopLogo" :data=imgData :limit="1" :fileSize="5"
@@ -72,7 +82,6 @@
       </div>
     </template>
   </el-dialog>
-
 </template>
 
 <script setup>
@@ -80,6 +89,7 @@ import { ElMessage } from 'element-plus'
 import modal from '@/plugins/modal.js'
 import { reactive, ref, watch } from "vue";
 import { addOrUpdateShop, getFirstGoodsCategoryList } from '@/api/business/ShopManager/Shops/shop.js';
+import { goodsCategoryTreeList } from '@/api/business/GoodsManager/GoodsCategorys/goodsCategory.js';
 
 // 打开弹窗时回调
 const openDialog = async () => {
@@ -115,7 +125,7 @@ async function getaudit_status() {
 
 // 获取经营类树形列表
 async function getTreeList() {
-  getFirstGoodsCategoryList().then((res) => {
+  goodsCategoryTreeList().then((res) => {
     if (res.code == 200) {
       dataList.value = res.data
     }