From 22e8a57b31acfcc8aa84b96b797a055a0445af41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 18 Nov 2024 23:47:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=B0=86?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AD=97=E5=85=B8=E5=8A=9F=E8=83=BD=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=E7=A7=9F=E6=88=B7=E7=AE=A1=E7=90=86=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/index.vue   | 14 +-------------
 src/views/system/tenant/index.vue | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 4ad70d0..9eead48 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -49,9 +49,6 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
@@ -112,15 +109,11 @@
 
 <script setup name="Dict" lang="ts">
 import useDictStore from '@/store/modules/dict';
-import useUserStore from "@/store/modules/user";
 import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
 import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
-import { syncTenantDict } from "@/api/system/tenant";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-const userStore = useUserStore();
-const userId = ref(userStore.userId);
 const typeList = ref<DictTypeVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -246,12 +239,7 @@ const handleRefreshCache = async () => {
   proxy?.$modal.msgSuccess('刷新成功');
   useDictStore().cleanDict();
 };
-/**同步租户字典*/
-const handleSyncTenantDict = async () => {
-  await proxy?.$modal.confirm('确认要同步所有租户字典吗？');
-  let res = await syncTenantDict();
-  proxy?.$modal.msgSuccess(res.msg);
-};
+
 
 onMounted(() => {
   getList();
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index fabe18d..e2cec99 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -44,6 +44,9 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:tenant:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
@@ -141,13 +144,16 @@
 </template>
 
 <script setup name="Tenant" lang="ts">
-import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage } from '@/api/system/tenant';
+import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus, syncTenantPackage, syncTenantDict } from '@/api/system/tenant';
 import { selectTenantPackage } from '@/api/system/tenantPackage';
+import useUserStore from '@/store/modules/user';
 import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
 import { TenantPkgVO } from '@/api/system/tenantPackage/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const userStore = useUserStore();
+const userId = ref(userStore.userId);
 const tenantList = ref<TenantVO[]>([]);
 const packageList = ref<TenantPkgVO[]>([]);
 const buttonLoading = ref(false);
@@ -343,6 +349,13 @@ const handleExport = () => {
   );
 };
 
+/**同步租户字典*/
+const handleSyncTenantDict = async () => {
+  await proxy?.$modal.confirm('确认要同步所有租户字典吗？');
+  let res = await syncTenantDict();
+  proxy?.$modal.msgSuccess(res.msg);
+};
+
 onMounted(() => {
   getList();
 });