From 1dd076f96a46341135a0b2b508f28879eee486b4 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Mon, 12 Jun 2023 22:20:53 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Shops/components/AddDialog.vue            |   2 +-
 .../Shops/components/DetailDialog.vue         | 149 ++++++++----------
 .../Shops/components/EditDialog.vue           |  47 +-----
 3 files changed, 77 insertions(+), 121 deletions(-)

diff --git a/src/views/business/ShopManager/Shops/components/AddDialog.vue b/src/views/business/ShopManager/Shops/components/AddDialog.vue
index 4e2982e..4eb7ed6 100644
--- a/src/views/business/ShopManager/Shops/components/AddDialog.vue
+++ b/src/views/business/ShopManager/Shops/components/AddDialog.vue
@@ -34,7 +34,7 @@
           <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="parseInt(item.goodsCategoryGuid)"></el-option>
+                :value="item.goodsCategoryGuid"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/business/ShopManager/Shops/components/DetailDialog.vue b/src/views/business/ShopManager/Shops/components/DetailDialog.vue
index f1d941b..96e60e7 100644
--- a/src/views/business/ShopManager/Shops/components/DetailDialog.vue
+++ b/src/views/business/ShopManager/Shops/components/DetailDialog.vue
@@ -6,90 +6,62 @@
  * @LastEditors: (黎文豪)
  * @LastEditTime: (2023-06-09)
 -->
- <template>
+<template>
   <el-dialog v-model="props.modelValue" title="店铺信息详情" width="900px" @closed="closeDialog" @open="openDialog">
     <el-form ref="formRef" :model="formData" :disabled="true">
 
       <el-row :gutter="20">
-	  
-
-    
-    
-    
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="用户id" >
-              <el-input v-model="formData.shopUserId"  />
-            </el-form-item>
-          </el-col>
-    
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="客户guid" >
-              <el-input v-model="formData.shopCustomerGuid"  />
-            </el-form-item>
-          </el-col>
-    
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="经营类目guid" >
-              <el-input v-model="formData.shopBusinessCategoryGuid"  />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="图标" >
-              <UploadImage ref="uploadRef" v-model="formData.shopLogo" :limit="1" :fileSize="5"
-              :drag="true" :isShowTip="false" :isDisabled="true"/>
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="营业执照" >
-              <UploadImage ref="uploadRef" v-model="formData.shopBusinessLicense" :limit="1" :fileSize="5"
-              :drag="true" :isShowTip="false" :isDisabled="true"/>
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="名称" >
-              <el-input v-model="formData.shopName"  />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="24">
-            <el-form-item :label-width="labelWidth" label="简介" >
-              <el-input v-model="formData.shopIntro" type="textarea" :rows="5" placeholder="请输入简介" />
-            </el-form-item>
-          </el-col>
-    
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="排序" >
-              <el-input-number v-model.number="formData.shopSort" controls-position="right" :precision="2" />
-            </el-form-item>
-          </el-col>
-    
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="销售单量" >
-              <el-input-number v-model.number="formData.shopSalesOrderCount" controls-position="right" :precision="2" />
-            </el-form-item>
-          </el-col>
-    
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="审核状态" >
-              <el-select v-model="formData.shopAuditStatus" >
-                <el-option v-for="item in  audit_status " :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-    
-          <el-col :lg="12">
-            <el-form-item :label-width="labelWidth" label="审核人" >
-              <el-input v-model="formData.shopAuditUserGuid"  />
-            </el-form-item>
-          </el-col>
-
-
-
-
 
+        <el-col :lg="12">
+          <el-form-item :label-width="labelWidth" label="用户" prop="userName">
+            <el-input v-model='formData.userName' disabled type="text"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :lg="12">
+          <el-form-item :label-width="labelWidth" label="客户" prop="customerNickname">
+            <el-input v-model='formData.customerNickname' disabled type="text"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :lg="24">
+          <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-form-item>
+        </el-col>
+        <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"
+              :drag="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="12">
+          <el-form-item :label-width="labelWidth" label="营业执照" prop="shopBusinessLicense">
+            <UploadImage ref="uploadRef" v-model="formData.shopBusinessLicense" :data=imgData :limit="1" :fileSize="5"
+              :drag="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="12">
+          <el-form-item :label-width="labelWidth" label="名称" prop="shopName">
+            <el-input v-model="formData.shopName" placeholder="请输入名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="简介" prop="shopIntro">
+            <el-input v-model="formData.shopIntro" type="textarea" :rows="5" placeholder="请输入简介" />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="12">
+          <el-form-item :label-width="labelWidth" label="排序" prop="shopSort">
+            <el-input-number v-model.number="formData.shopSort" controls-position="right" :min="0" />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="12">
+          <el-form-item :label-width="labelWidth" label="销售单量" prop="shopSalesOrderCount">
+            <el-input-number v-model.number="formData.shopSalesOrderCount" controls-position="right" :min="0" />
+          </el-form-item>
+        </el-col>
 
       </el-row>
     </el-form>
@@ -99,11 +71,13 @@
 <script setup>
 import { ElMessage } from 'element-plus'
 import { reactive, ref, watch } from "vue";
+import { getFirstGoodsCategoryList } from '@/api/business/ShopManager/Shops/shop.js';
 
 
 // 打开弹窗时回调
 const openDialog = async () => {
-   await getaudit_status()
+  await getTreeList()
+  await getaudit_status()
 
 }
 
@@ -118,6 +92,11 @@ watch(props, async (v) => {
 // 审核状态字典选项列表
 const audit_status = ref([]);
 
+// 经营类树形列表
+const dataList = ref([])
+
+
+
 // -业务方法
 // 字典获取
 async function getaudit_status() {
@@ -127,6 +106,16 @@ async function getaudit_status() {
 }
 
 
+// 获取经营类树形列表
+async function getTreeList() {
+  getFirstGoodsCategoryList().then((res) => {
+    if (res.code == 200) {
+      dataList.value = res.data
+    }
+  })
+}
+
+
 
 // 基础参数
 const formRef = ref();
diff --git a/src/views/business/ShopManager/Shops/components/EditDialog.vue b/src/views/business/ShopManager/Shops/components/EditDialog.vue
index 1cf4354..20b04b3 100644
--- a/src/views/business/ShopManager/Shops/components/EditDialog.vue
+++ b/src/views/business/ShopManager/Shops/components/EditDialog.vue
@@ -13,27 +13,19 @@
 
         <el-col :lg="12">
           <el-form-item :label-width="labelWidth" label="用户" prop="userName">
-            <el-input v-model='formData.userName' disabled type="text" placeholder='点击选择用户'>
-              <template #append>
-                <div @click="handleChooseUser">选择</div>
-              </template>
-            </el-input>
+            <el-input v-model='formData.userName' disabled type="text"></el-input>
           </el-form-item>
         </el-col>
         <el-col :lg="12">
           <el-form-item :label-width="labelWidth" label="客户" prop="customerNickname">
-            <el-input v-model='formData.customerNickname' disabled type="text" placeholder='点击选择客户'>
-              <template #append>
-                <div @click="handleChooseCustomer">选择</div>
-              </template>
-            </el-input>
+            <el-input v-model='formData.customerNickname' disabled type="text"></el-input>
           </el-form-item>
         </el-col>
         <el-col :lg="24">
-          <el-form-item :label-width="labelWidth" label="经营类目" prop="GoodsCategoryParentGuid">
-            <el-select v-model="formData.customerGender" placeholder="请选择经营类目">
-              <el-option v-for="item in  dataList " :key="item.goodsCategoryId" :label="item.goodsCategoryName"
-                :value="parseInt(item.goodsCategoryGuid)"></el-option>
+          <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-form-item>
         </el-col>
@@ -81,19 +73,13 @@
     </template>
   </el-dialog>
 
-  <!-- 选择用户 -->
-  <ChooseUserDialog v-model="ChooseUserDialogVisible" :data="ChooseUserDialogRow"></ChooseUserDialog>
-  <!-- 选择客户 -->
-  <ChooseCustomerDialog v-model="ChooseCustomerDialogVisible" :data="ChooseCustomerDialogRow"></ChooseCustomerDialog>
 </template>
 
 <script setup>
 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 ChooseCustomerDialog from './ChooseCustomerDialog.vue';
-import ChooseUserDialog from './ChooseUserDialog.vue';
+import { addOrUpdateShop, getFirstGoodsCategoryList } from '@/api/business/ShopManager/Shops/shop.js';
 
 // 打开弹窗时回调
 const openDialog = async () => {
@@ -117,13 +103,6 @@ const audit_status = ref([]);
 // 经营类树形列表
 const dataList = ref([])
 
-// 选择用户弹窗参数
-const ChooseUserDialogVisible = ref(false);
-const ChooseUserDialogRow = ref({});
-// 选择客户弹窗参数
-const ChooseCustomerDialogVisible = ref(false);
-const ChooseCustomerDialogRow = ref({});
-
 
 
 // -业务方法
@@ -143,18 +122,6 @@ async function getTreeList() {
   })
 }
 
-// 打开选择用户弹窗
-const handleChooseUser = () => {
-  ChooseUserDialogVisible.value = true
-  ChooseUserDialogRow.value = formData
-}
-
-// 打开选择客户弹窗
-const handleChooseCustomer = () => {
-  ChooseCustomerDialogVisible.value = true
-  ChooseCustomerDialogRow.value = formData
-}
-
 
 
 // -基础参数