From f5faa054b39cb9125d0c2c7db3f2d8531bad5fa0 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Tue, 18 Jun 2024 15:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=9F=E8=B5=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/tenant/index.vue | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index edf23b70..be245a65 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -19,6 +19,7 @@ import useDictStore from '@/store/modules/dict';
 import { parseDataToTree } from '@/utils/parse-tree-utils';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
+
 const { t } = useI18n();
 const { getDict } = useDictStore();
 
@@ -26,8 +27,11 @@ const { getDict } = useDictStore();
 let dict: {
   /**状态 */
   sysNormalDisable: DictType[];
+  /**租户类型 */
+  sysTenancyType: DictType[];
 } = reactive({
   sysNormalDisable: [],
+  sysTenancyType: [],
 });
 
 /**查询参数 */
@@ -134,13 +138,7 @@ let tableColumns: ColumnsType = [
   },
 ];
 
-const modalStateFromOption = reactive({
-  tenantType: [
-    { label: t('views.system.dept.SDSST'), value: 'SD-SST' },
-    { label: t('views.system.dept.APN'), value: 'APN' },
-    { label: t('views.system.dept.IMSI'), value: 'IMSI' },
-  ],
-});
+
 
 /**表格紧凑型变更操作 */
 function fnTableSize({ key }: MenuInfo) {
@@ -421,10 +419,16 @@ function fnGetList() {
 
 onMounted(() => {
   // 初始字典数据
-  Promise.allSettled([getDict('sys_normal_disable')]).then(resArr => {
+  Promise.allSettled([
+    getDict('sys_normal_disable'),
+    getDict('tenancy_type'),
+  ]).then((resArr: any) => {
     if (resArr[0].status === 'fulfilled') {
       dict.sysNormalDisable = resArr[0].value;
     }
+    if (resArr[1].status === 'fulfilled') {
+      dict.sysTenancyType = resArr[1].value;
+    }
   });
   // 获取列表数据
   fnGetList();
@@ -796,7 +800,7 @@ onMounted(() => {
               <a-select
                 v-model:value="modalState.from.tenancyType"
                 allow-clear
-                :options="modalStateFromOption.tenantType"
+                :options="dict.sysTenancyType"
               >
               </a-select>
             </a-form-item>