From 84633099a936846382cdaa9040ecbfb62e462cc8 Mon Sep 17 00:00:00 2001
From: A0066811 <961502390@qq.com>
Date: Fri, 7 Nov 2025 14:40:27 +0800
Subject: [PATCH] =?UTF-8?q?hgwms-2098=20fix=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=BC=B9=E7=AA=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/user/modal/edit.vue | 200 +++++++++++++++++++--------------
 src/view/user/modal/info.vue | 151 +++++++++++++++----------
 src/view/user/modal/save.vue | 210 +++++++++++++++++++++--------------
 3 files changed, 330 insertions(+), 231 deletions(-)

diff --git a/src/view/user/modal/edit.vue b/src/view/user/modal/edit.vue
index 7c231d1..e0a149a 100644
--- a/src/view/user/modal/edit.vue
+++ b/src/view/user/modal/edit.vue
@@ -1,64 +1,89 @@
 <template>
   <a-modal
     :open="visible"
-    title="新增用户"
+    title="修改用户"
     cancelText="取消"
     okText="提交"
     @ok="submit"
     @cancel="cancel"
   >
     <a-form
-       ref="formRef"
+      ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol">
-      <a-form-item ref="nickname" label="昵称" name="nickname">
-        <a-input v-model:value="formState.nickname" />
-      </a-form-item>
-      <a-form-item ref="username" label="账户" name="username">
-        <a-input v-model:value="formState.username" />
-      </a-form-item>
-      <a-form-item ref="email" label="邮箱" name="email">
-        <a-input v-model:value="formState.email" />
-      </a-form-item>
-      <a-form-item ref="phone" label="电话" name="phone">
-        <a-input v-model:value="formState.phone" />
-      </a-form-item>
-      <a-form-item label="性别" name="gender">
-        <a-radio-group v-model:value="formState.gender">
-          <a-radio value="0">男</a-radio>
-          <a-radio value="1">女</a-radio>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="状态" name="enable">
-        <a-switch v-model:checked="formState.enable" />
-      </a-form-item>
-      <a-form-item label="岗位" name="postId">
-          <a-select v-model:value="formState.postId">
-            <a-select-option :value="post.id" v-bind:key="index" v-for="(post,index) in state.posts">{{post.name}}</a-select-option>
-          </a-select>
-      </a-form-item>
-      <a-form-item label="部门" name="deptId">
-          <a-tree-select
-            v-model:value="formState.deptId"
-            style="width: 100%"
-            :tree-data="state.depts"
-            placeholder="所属部门"
-            replace
-            tree-default-expand-all
-            :replaceFields="replaceFields"
-          >
-          </a-tree-select>
-      </a-form-item>
-      <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="formState.remark" />
-      </a-form-item>
+      layout="vertical"
+    >
+      <a-row :gutter="[16, 0]">
+        <a-col :span="12">
+          <a-form-item ref="nickname" label="昵称" name="nickname">
+            <a-input v-model:value="formState.nickname" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="username" label="账户" name="username">
+            <a-input v-model:value="formState.username" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="email" label="邮箱" name="email">
+            <a-input v-model:value="formState.email" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="phone" label="电话" name="phone">
+            <a-input v-model:value="formState.phone" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="性别" name="gender">
+            <a-radio-group v-model:value="formState.gender">
+              <a-radio value="0">男</a-radio>
+              <a-radio value="1">女</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态" name="enable">
+            <a-switch v-model:checked="formState.enable" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="岗位" name="postId">
+            <a-select v-model:value="formState.postId">
+              <a-select-option
+                :value="post.id"
+                v-bind:key="index"
+                v-for="(post, index) in state.posts"
+                >{{ post.name }}</a-select-option
+              >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="部门" name="deptId">
+            <a-tree-select
+              v-model:value="formState.deptId"
+              style="width: 100%"
+              :tree-data="state.depts"
+              placeholder="所属部门"
+              replace
+              tree-default-expand-all
+              :replaceFields="replaceFields"
+            >
+            </a-tree-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="备注" name="remark">
+            <a-textarea v-model:value="formState.remark" />
+          </a-form-item>
+        </a-col>
+      </a-row>
     </a-form>
   </a-modal>
 </template>
 <script>
-import { message } from '@hwork/ant-design-vue';
+import { message } from "@hwork/ant-design-vue";
 import { list } from "@/api/module/post";
 import { edit } from "@/api/module/user";
 import { tree } from "@/api/module/dept";
@@ -70,61 +95,63 @@ export default defineComponent({
     },
     record: {
       type: Object,
-    }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
-    const state = reactive({ 
+    const state = reactive({
       posts: [],
-      depts: [], 
-    })
-    
+      depts: [],
+    });
+
     const formState = reactive({
       enable: true,
-      gender:  "0",
+      gender: "0",
     });
 
     const formRules = {
-      username: [ { required: true, message: '请输入账户', trigger: 'blur'} ],
-      nickname: [ { required: true, message: '请输入昵称', trigger: 'blur'} ],
-      password: [ { required: true, message: '请输入密码', trigger: 'blur'} ],
-      email: [ { required: true, message: '请输入邮箱', trigger: 'blur'} ],
-      phone: [ { required: true, message: '请输入电话', trigger: 'blur'} ],
-      postId: [ { required: true, message: '请选择岗位', trigger: 'blur'} ],
-      deptId: [ { required: true, message: '请选择部门', trigger: 'blur'} ],
+      username: [{ required: true, message: "请输入账户", trigger: "blur" }],
+      nickname: [{ required: true, message: "请输入昵称", trigger: "blur" }],
+      password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+      email: [{ required: true, message: "请输入邮箱", trigger: "blur" }],
+      phone: [{ required: true, message: "请输入电话", trigger: "blur" }],
+      postId: [{ required: true, message: "请选择岗位", trigger: "blur" }],
+      deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
     };
 
     const loadPost = () => {
-      list({}).then((response)=>{
+      list({}).then((response) => {
         state.posts = response.data;
-      }) 
-    }
+      });
+    };
 
     const loadTree = () => {
-      tree({}).then((response)=>{
+      tree({}).then((response) => {
         state.depts = response.data;
-      })
-    }
+      });
+    };
 
     const submit = (e) => {
-        formRef.value.validate().then(() => {
-          edit(toRaw(formState)).then((response)=>{
-            if(response.success){
-                message.success({ content: '保存成功', duration: 1 }).then(()=>{
-                  cancel();
-                });
-            }else{
-                message.error({ content: '保存失败', duration: 1 }).then(()=>{
-                  cancel();
-                });
+      formRef.value
+        .validate()
+        .then(() => {
+          edit(toRaw(formState)).then((response) => {
+            if (response.success) {
+              message.success({ content: "保存成功", duration: 1 }).then(() => {
+                cancel();
+              });
+            } else {
+              message.error({ content: "保存失败", duration: 1 }).then(() => {
+                cancel();
+              });
             }
-          })
-      }).catch(error => {
-          console.log('error', error);
-      });
+          });
+        })
+        .catch((error) => {
+          console.log("error", error);
+        });
     };
 
     const cancel = (e) => {
@@ -137,7 +164,7 @@ export default defineComponent({
     /// 加载部门
     loadTree();
 
-    watch(props,(props) => {
+    watch(props, (props) => {
       formState.id = props.record.id;
       formState.username = props.record.username;
       formState.nickname = props.record.nickname;
@@ -148,7 +175,7 @@ export default defineComponent({
       formState.deptId = props.record.deptId;
       formState.enable = props.record.enable;
       formState.remark = props.record.remark;
-    })
+    });
 
     return {
       state,
@@ -161,8 +188,13 @@ export default defineComponent({
       labelCol: { span: 6 },
       wrapperCol: { span: 18 },
 
-      replaceFields: {children:'children', title:'name', key:'id', value: 'id' }
+      replaceFields: {
+        children: "children",
+        title: "name",
+        key: "id",
+        value: "id",
+      },
     };
   },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/user/modal/info.vue b/src/view/user/modal/info.vue
index 8f116ee..e378bdc 100644
--- a/src/view/user/modal/info.vue
+++ b/src/view/user/modal/info.vue
@@ -8,52 +8,77 @@
     @cancel="cancel"
   >
     <a-form
-       ref="formRef"
+      ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol">
-      <a-form-item ref="nickname" label="昵称" name="nickname">
-        <a-input v-model:value="formState.nickname" />
-      </a-form-item>
-      <a-form-item ref="username" label="账户" name="username">
-        <a-input v-model:value="formState.username" />
-      </a-form-item>
-      <a-form-item ref="email" label="邮箱" name="email">
-        <a-input v-model:value="formState.email" />
-      </a-form-item>
-      <a-form-item ref="phone" label="电话" name="phone">
-        <a-input v-model:value="formState.phone" />
-      </a-form-item>
-      <a-form-item label="性别" name="gender">
-        <a-radio-group v-model:value="formState.gender">
-          <a-radio value="0">男</a-radio>
-          <a-radio value="1">女</a-radio>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="状态" name="enable">
-        <a-switch v-model:checked="formState.enable" />
-      </a-form-item>
-      <a-form-item label="岗位" name="postId">
-          <a-select v-model:value="formState.postId">
-            <a-select-option :value="post.id" v-bind:key="index" v-for="(post,index) in state.posts">{{post.name}}</a-select-option>
-          </a-select>
-      </a-form-item>
-      <a-form-item label="部门" name="deptId">
-          <a-tree-select
-            v-model:value="formState.deptId"
-            style="width: 100%"
-            :tree-data="state.depts"
-            placeholder="所属部门"
-            replace
-            tree-default-expand-all
-            :replaceFields="replaceFields"
-          >
-          </a-tree-select>
-      </a-form-item>
-      <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="formState.remark" />
-      </a-form-item>
+      layout="vertical"
+    >
+      <a-row :gutter="[16, 0]">
+        <a-col :span="12">
+          <a-form-item ref="nickname" label="昵称" name="nickname">
+            <a-input v-model:value="formState.nickname" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="username" label="账户" name="username">
+            <a-input v-model:value="formState.username" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="email" label="邮箱" name="email">
+            <a-input v-model:value="formState.email" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="phone" label="电话" name="phone">
+            <a-input v-model:value="formState.phone" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="性别" name="gender">
+            <a-radio-group v-model:value="formState.gender">
+              <a-radio value="0">男</a-radio>
+              <a-radio value="1">女</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态" name="enable">
+            <a-switch v-model:checked="formState.enable" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="岗位" name="postId">
+            <a-select v-model:value="formState.postId">
+              <a-select-option
+                :value="post.id"
+                v-bind:key="index"
+                v-for="(post, index) in state.posts"
+                >{{ post.name }}</a-select-option
+              >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="部门" name="deptId">
+            <a-tree-select
+              v-model:value="formState.deptId"
+              style="width: 100%"
+              :tree-data="state.depts"
+              placeholder="所属部门"
+              replace
+              tree-default-expand-all
+              :replaceFields="replaceFields"
+            >
+            </a-tree-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="备注" name="remark">
+            <a-textarea v-model:value="formState.remark" />
+          </a-form-item>
+        </a-col>
+      </a-row>
     </a-form>
   </a-modal>
 </template>
@@ -68,36 +93,35 @@ export default defineComponent({
     },
     record: {
       type: Object,
-    }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
-    const state = reactive({ 
+    const state = reactive({
       posts: [],
-      depts: [], 
-    })
-    
+      depts: [],
+    });
+
     const formState = reactive({
       enable: true,
-      gender:  "0",
+      gender: "0",
     });
 
     const formRules = {};
 
     const loadPost = () => {
-      list({}).then((response)=>{
+      list({}).then((response) => {
         state.posts = response.data;
-      }) 
-    }
+      });
+    };
 
     const loadTree = () => {
-      tree({}).then((response)=>{
+      tree({}).then((response) => {
         state.depts = response.data;
-      })
-    }
+      });
+    };
 
     const submit = (e) => {
       formRef.value.resetFields();
@@ -114,7 +138,7 @@ export default defineComponent({
     /// 加载部门
     loadTree();
 
-    watch(props,(props) => {
+    watch(props, (props) => {
       formState.id = props.record.id;
       formState.username = props.record.username;
       formState.nickname = props.record.nickname;
@@ -125,7 +149,7 @@ export default defineComponent({
       formState.deptId = props.record.deptId;
       formState.enable = props.record.enable;
       formState.remark = props.record.remark;
-    })
+    });
 
     return {
       state,
@@ -138,8 +162,13 @@ export default defineComponent({
       labelCol: { span: 6 },
       wrapperCol: { span: 18 },
 
-      replaceFields: {children:'children', title:'name', key:'id', value: 'id' }
+      replaceFields: {
+        children: "children",
+        title: "name",
+        key: "id",
+        value: "id",
+      },
     };
   },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/user/modal/save.vue b/src/view/user/modal/save.vue
index 5158d8f..567fe2b 100644
--- a/src/view/user/modal/save.vue
+++ b/src/view/user/modal/save.vue
@@ -8,60 +8,91 @@
     @cancel="cancel"
   >
     <a-form
-       ref="formRef"
+      ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol">
-      <a-form-item ref="nickname" label="昵称" name="nickname">
-        <a-input v-model:value="formState.nickname" />
-      </a-form-item>
-      <a-form-item ref="username" label="账户" name="username">
-        <a-input v-model:value="formState.username" />
-      </a-form-item>
-      <a-form-item ref="password" label="密码" name="password">
-        <a-input v-model:value="formState.password" />
-      </a-form-item>
-      <a-form-item ref="email" label="邮箱" name="email">
-        <a-input v-model:value="formState.email" />
-      </a-form-item>
-      <a-form-item ref="phone" label="电话" name="phone">
-        <a-input v-model:value="formState.phone" />
-      </a-form-item>
-      <a-form-item label="性别" name="gender">
-        <a-radio-group v-model:value="formState.gender">
-          <a-radio value="0">男</a-radio>
-          <a-radio value="1">女</a-radio>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="状态" name="enable">
-        <a-switch v-model:checked="formState.enable" />
-      </a-form-item>
-      <a-form-item label="岗位" name="postId">
-          <a-select v-model:value="formState.postId">
-            <a-select-option :value="post.id" v-bind:key="index" v-for="(post,index) in state.posts">{{post.name}}</a-select-option>
-          </a-select>
-      </a-form-item>
-      <a-form-item label="部门" name="deptId">
-          <a-tree-select
-            v-model:value="formState.deptId"
-            style="width: 100%"
-            :tree-data="state.depts"
-            placeholder="所属部门"
-            replace
-            tree-default-expand-all
-            :replaceFields="replaceFields"
-          >
-          </a-tree-select>
-      </a-form-item>
-      <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="formState.remark" />
-      </a-form-item>
+      layout="vertical"
+    >
+      <a-row :gutter="[16, 0]">
+        <a-col :span="12">
+          <a-form-item ref="nickname" label="昵称" name="nickname">
+            <a-input v-model:value="formState.nickname" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="username" label="账户" name="username">
+            <a-input v-model:value="formState.username" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="password" label="密码" name="password">
+            <a-input v-model:value="formState.password" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="email" label="邮箱" name="email">
+            <a-input v-model:value="formState.email" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="phone" label="电话" name="phone">
+            <a-input v-model:value="formState.phone" />
+          </a-form-item>
+        </a-col>
+
+        <a-col :span="12">
+          <a-form-item label="岗位" name="postId">
+            <a-select v-model:value="formState.postId">
+              <a-select-option
+                :value="post.id"
+                v-bind:key="index"
+                v-for="(post, index) in state.posts"
+                >{{ post.name }}</a-select-option
+              >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="部门" name="deptId">
+            <a-tree-select
+              v-model:value="formState.deptId"
+              style="width: 100%"
+              :tree-data="state.depts"
+              placeholder="所属部门"
+              replace
+              tree-default-expand-all
+              :replaceFields="replaceFields"
+            >
+            </a-tree-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="[16, 0]">
+        <a-col :span="12">
+          <a-form-item label="状态" name="enable">
+            <a-switch v-model:checked="formState.enable" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="性别" name="gender">
+            <a-radio-group v-model:value="formState.gender">
+              <a-radio value="0">男</a-radio>
+              <a-radio value="1">女</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+
+        <a-col :span="24">
+          <a-form-item label="备注" name="remark">
+            <a-textarea v-model:value="formState.remark" />
+          </a-form-item>
+        </a-col>
+      </a-row>
     </a-form>
   </a-modal>
 </template>
 <script>
-import { message } from '@hwork/ant-design-vue';
+import { message } from "@hwork/ant-design-vue";
 import { list } from "@/api/module/post";
 import { save } from "@/api/module/user";
 import { tree } from "@/api/module/dept";
@@ -74,60 +105,62 @@ export default defineComponent({
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
-    const state = reactive({ 
+    const state = reactive({
       posts: [],
-      depts: [], 
-    })
-    
+      depts: [],
+    });
+
     const formState = reactive({
       enable: true,
-      gender:  "0",
+      gender: "0",
     });
 
     const formRules = {
-      username: [ { required: true, message: '请输入账户', trigger: 'blur'} ],
-      nickname: [ { required: true, message: '请输入昵称', trigger: 'blur'} ],
-      password: [ { required: true, message: '请输入密码', trigger: 'blur'} ],
-      email: [ { required: true, message: '请输入邮箱', trigger: 'blur'} ],
-      phone: [ { required: true, message: '请输入电话', trigger: 'blur'} ],
-      postId: [ { required: true, message: '请选择岗位', trigger: 'blur'} ],
-      deptId: [ { required: true, message: '请选择部门', trigger: 'blur'} ],
-      tenantId: [ { required: true, message: '请选择租户', trigger: 'blur'} ]
+      username: [{ required: true, message: "请输入账户", trigger: "blur" }],
+      nickname: [{ required: true, message: "请输入昵称", trigger: "blur" }],
+      password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+      email: [{ required: true, message: "请输入邮箱", trigger: "blur" }],
+      phone: [{ required: true, message: "请输入电话", trigger: "blur" }],
+      postId: [{ required: true, message: "请选择岗位", trigger: "blur" }],
+      deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
+      tenantId: [{ required: true, message: "请选择租户", trigger: "blur" }],
     };
 
     const loadPost = () => {
-      list({}).then((response)=>{
+      list({}).then((response) => {
         state.posts = response.data;
-      }) 
-    }
+      });
+    };
 
     const loadTree = () => {
-      tree({}).then((response)=>{
+      tree({}).then((response) => {
         state.depts = response.data;
-      })
-    }
-  
-    const submit = (e) => {
-        formRef.value.validate().then(() => {
-          save(toRaw(formState)).then((response)=>{
-            if(response.success){
-                message.success({ content: '保存成功', duration: 1 }).then(()=>{
-                  cancel();
-                });
-            }else{
-                message.error({ content: '保存失败', duration: 1 }).then(()=>{
-                  cancel();
-                });
-            }
-          })
-      }).catch(error => {
-          console.log('error', error);
       });
     };
 
+    const submit = (e) => {
+      formRef.value
+        .validate()
+        .then(() => {
+          save(toRaw(formState)).then((response) => {
+            if (response.success) {
+              message.success({ content: "保存成功", duration: 1 }).then(() => {
+                cancel();
+              });
+            } else {
+              message.error({ content: "保存失败", duration: 1 }).then(() => {
+                cancel();
+              });
+            }
+          });
+        })
+        .catch((error) => {
+          console.log("error", error);
+        });
+    };
+
     const cancel = (e) => {
       formRef.value.resetFields();
       context.emit("close", false);
@@ -149,8 +182,13 @@ export default defineComponent({
       labelCol: { span: 6 },
       wrapperCol: { span: 18 },
 
-      replaceFields: {children:'children', title:'name', key:'id', value: 'id' }
+      replaceFields: {
+        children: "children",
+        title: "name",
+        key: "id",
+        value: "id",
+      },
     };
   },
 });
-</script>
\ No newline at end of file
+</script>