From 2480ae1c0bc608aeaf076067ea06a0a72a326d91 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Thu, 20 Jun 2024 20:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A7=9F=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/tenant/index.vue | 77 ++++++++++++++++---------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 3cbddd6d..6db87ea5 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -88,12 +88,6 @@ let tableColumns: ColumnsType = [
     align: 'left',
     width: 300,
   },
-  {
-    title: t('views.system.dept.key'),
-    dataIndex: 'tenancyKey',
-    align: 'left',
-    width: 200,
-  },
   {
     title: t('views.system.dept.type'),
     dataIndex: 'tenancyType',
@@ -101,6 +95,13 @@ let tableColumns: ColumnsType = [
     align: 'center',
     width: 150,
   },
+  {
+    title: t('views.system.dept.key'),
+    dataIndex: 'tenancyKey',
+    align: 'left',
+    width: 200,
+  },
+
   {
     title: t('views.system.dept.status'),
     dataIndex: 'status',
@@ -716,14 +717,14 @@ onMounted(() => {
       <a-form
         name="modalStateFrom"
         layout="horizontal"
-        :label-col="{ span: 6 }"
+        :label-col="{ span: 8 }"
         :labelWrap="true"
       >
         <a-form-item
           :label="t('views.system.dept.highClass')"
           name="parentId"
           v-bind="modalStateFrom.validateInfos.parentId"
-          :label-col="{ span: 3 }"
+          :label-col="{ span: 4 }"
           :labelWrap="true"
         >
           <a-tree-select
@@ -748,7 +749,7 @@ onMounted(() => {
           :label="t('views.system.dept.className')"
           name="tenantName"
           v-bind="modalStateFrom.validateInfos.tenantName"
-          :label-col="{ span: 3 }"
+          :label-col="{ span: 4 }"
           :labelWrap="true"
         >
           <a-input
@@ -758,6 +759,35 @@ onMounted(() => {
           ></a-input>
         </a-form-item>
 
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item
+              :label="t('views.system.dept.type')"
+              name="type"
+
+              :labelWrap="true"
+            >
+              <a-select
+                v-model:value="modalState.from.tenancyType"
+                allow-clear
+                :options="dict.sysTenancyType"
+              >
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="24" :md="24" :xs="24">
+            <a-form-item
+              :label="t('views.system.dept.key')"
+              name="key"
+              :label-col="{ span: 4 }"
+            >
+              <a-input
+                v-model:value="modalState.from.tenancyKey"
+                allow-clear
+              ></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item :label="t('views.system.dept.status')" name="status">
@@ -783,35 +813,6 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
-
-        <a-row :gutter="16">
-          <a-col :span="12">
-            <a-form-item
-              :label="t('views.system.dept.type')"
-              name="type"
-              :labelWrap="true"
-            >
-              <a-select
-                v-model:value="modalState.from.tenancyType"
-                allow-clear
-                :options="dict.sysTenancyType"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              :label="t('views.system.dept.key')"
-              name="key"
-              :label-col="{ span: 3 }"
-            >
-              <a-input
-                v-model:value="modalState.from.tenancyKey"
-                allow-clear
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
       </a-form>
     </a-modal>
   </PageContainer>