From cc234ee081881b6cf701d4678b134e32ddce4c20 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 1 Dec 2023 19:26:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 130 ++++++++++++++++++--------------
 1 file changed, 72 insertions(+), 58 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 07966786..4a0889c3 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -135,7 +135,7 @@ let tableColumns: ColumnsType = [
   {
     title: t('views.system.user.permission'),
     key: 'roles',
-    align: 'center',
+    align: 'left',
   },
   {
     title: t('views.system.user.className'),
@@ -1258,7 +1258,12 @@ onMounted(() => {
       @ok="fnModalOk"
       @cancel="fnModalCancel"
     >
-      <a-form name="modalStateFromByEdit" layout="horizontal">
+      <a-form
+        name="modalStateFromByEdit"
+        layout="horizontal"
+        :label-col="{ span: 6 }"
+        :labelWrap="true"
+      >
         <a-row :gutter="16" v-if="!modalState.from.userId">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1309,22 +1314,20 @@ onMounted(() => {
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="6" :xs="24">
-            <a-form-item :label="t('views.system.user.sex')" name="sex">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.system.user.userWork')"
+              name="postIds"
+            >
               <a-select
-                v-model:value="modalState.from.sex"
-                default-value="1"
-                :options="dict.sysUserSex"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="6" :xs="24">
-            <a-form-item :label="t('views.system.user.status')" name="status">
-              <a-select
-                v-model:value="modalState.from.status"
-                default-value="0"
-                :options="dict.sysNormalDisable"
+                v-model:value="modalState.from.postIds"
+                allow-clear
+                mode="multiple"
+                show-search
+                option-filter-prop="postName"
+                option-label-prop="postName"
+                :options="modalState.options.posts"
+                :field-names="{ label: 'postName', value: 'postId' }"
               >
               </a-select>
             </a-form-item>
@@ -1360,7 +1363,53 @@ onMounted(() => {
           </a-col>
         </a-row>
 
-        <a-form-item :label="t('views.system.user.fromClass')" name="deptId">
+        <a-row :gutter="16">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.system.user.sex')" name="sex">
+              <a-select
+                v-model:value="modalState.from.sex"
+                default-value="1"
+                :options="dict.sysUserSex"
+              >
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.system.user.status')" name="status">
+              <a-select
+                v-model:value="modalState.from.status"
+                default-value="0"
+                :options="dict.sysNormalDisable"
+              >
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-form-item
+          :label="t('views.system.user.permission')"
+          name="roleIds"
+          :label-col="{ span: 3 }"
+          v-perms:has="['system:user:editRole']"
+        >
+          <a-select
+            v-model:value="modalState.from.roleIds"
+            :allow-clear="false"
+            mode="multiple"
+            show-search
+            option-filter-prop="roleName"
+            option-label-prop="roleName"
+            :options="modalState.options.roles"
+            :field-names="{ label: 'roleName', value: 'roleId' }"
+          >
+          </a-select>
+        </a-form-item>
+
+        <a-form-item
+          :label="t('views.system.user.fromClass')"
+          name="deptId"
+          :label-col="{ span: 3 }"
+        >
           <a-tree-select
             v-model:value="modalState.from.deptId"
             show-search
@@ -1379,46 +1428,11 @@ onMounted(() => {
           </a-tree-select>
         </a-form-item>
 
-        <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.system.user.userWork')"
-              name="postIds"
-            >
-              <a-select
-                v-model:value="modalState.from.postIds"
-                allow-clear
-                mode="multiple"
-                show-search
-                option-filter-prop="postName"
-                option-label-prop="postName"
-                :options="modalState.options.posts"
-                :field-names="{ label: 'postName', value: 'postId' }"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.system.user.permission')"
-              name="roleIds"
-            >
-              <a-select
-                v-model:value="modalState.from.roleIds"
-                :allow-clear="false"
-                mode="multiple"
-                show-search
-                option-filter-prop="roleName"
-                option-label-prop="roleName"
-                :options="modalState.options.roles"
-                :field-names="{ label: 'roleName', value: 'roleId' }"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-form-item :label="t('views.system.user.userTip')" name="remark">
+        <a-form-item
+          :label="t('views.system.user.userTip')"
+          name="remark"
+          :label-col="{ span: 3 }"
+        >
           <a-textarea
             v-model:value="modalState.from.remark"
             :auto-size="{ minRows: 4, maxRows: 6 }"