From dda045dde0a5644611c1ee207242239401014e45 Mon Sep 17 00:00:00 2001
From: A0066811 <961502390@qq.com>
Date: Fri, 7 Nov 2025 14:32:00 +0800
Subject: [PATCH] =?UTF-8?q?hgwms-2098=20fix=20=E9=83=A8=E9=97=A8=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/dept/modal/edit.vue | 133 +++++++++++++++++++---------------
 src/view/dept/modal/info.vue |  15 ++--
 src/view/dept/modal/save.vue | 136 ++++++++++++++++++++---------------
 3 files changed, 162 insertions(+), 122 deletions(-)

diff --git a/src/view/dept/modal/edit.vue b/src/view/dept/modal/edit.vue
index cfaeb27..0f9c2c0 100644
--- a/src/view/dept/modal/edit.vue
+++ b/src/view/dept/modal/edit.vue
@@ -8,14 +8,14 @@
     @cancel="cancel"
   >
     <a-form
-       ref="formRef"
+      ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
+      layout="vertical"
     >
-      <!-- 当前部门为根部门, 则不提供上级部门选择 -->
-      <a-form-item label="上级" name="parent" v-if="formState.parent != 0 ">
+      <a-col :span="12" v-if="formState.parent != 0">
+        <!-- 当前部门为根部门, 则不提供上级部门选择 -->
+        <a-form-item label="上级" name="parent">
           <a-tree-select
             v-model:value="formState.parent"
             style="width: 100%"
@@ -26,27 +26,38 @@
             :replaceFields="replaceFields"
           >
           </a-tree-select>
-      </a-form-item>
-      <a-form-item ref="name" label="名称" name="name">
-        <a-input v-model:value="formState.name" />
-      </a-form-item>
-      <a-form-item ref="sort" label="排序" name="sort">
-        <a-input-number v-model:value="formState.sort" />
-      </a-form-item>
-      <a-form-item label="状态" name="state">
-        <a-switch v-model:checked="formState.enable" />
-      </a-form-item>
-      <a-form-item ref="address" label="地址" name="address">
-        <a-input v-model:value="formState.address" />
-      </a-form-item>
-      <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="formState.remark" />
-      </a-form-item>
+        </a-form-item>
+      </a-col>
+      <a-col :span="24">
+        <a-form-item ref="name" label="名称" name="name">
+          <a-input v-model:value="formState.name" />
+        </a-form-item>
+      </a-col>
+      <a-col :span="24">
+        <a-form-item ref="sort" label="排序" name="sort">
+          <a-input-number style="width: 100%" v-model:value="formState.sort" />
+        </a-form-item>
+      </a-col>
+      <a-col :span="24">
+        <a-form-item ref="address" label="地址" name="address">
+          <a-input v-model:value="formState.address" />
+        </a-form-item>
+      </a-col>
+      <a-col :span="24">
+        <a-form-item label="状态" name="state">
+          <a-switch v-model:checked="formState.enable" />
+        </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-form>
   </a-modal>
 </template>
 <script>
-import { message } from '@hwork/ant-design-vue';
+import { message } from "@hwork/ant-design-vue";
 import { edit, tree } from "@/api/module/dept";
 import { defineComponent, reactive, ref, toRaw, watch } from "vue";
 export default defineComponent({
@@ -56,56 +67,57 @@ export default defineComponent({
     },
     record: {
       type: Object,
-    }
+    },
   },
   emit: ["close"],
   setup(props, context) {
+    const state = reactive({
+      depts: [],
+    });
 
-    const state = reactive({ 
-      depts: [], 
-    })
-    
     const formRef = ref();
-    
+
     const formState = reactive({
       sort: 0,
       enable: true,
     });
 
-    watch(props,(props) => {
-        formState.id = props.record.id
-        formState.name = props.record.name
-        formState.sort = props.record.sort
-        formState.parent = props.record.parent
-        formState.remark = props.record.remark
-        formState.enable = props.record.enable
-        formState.address = props.record.address
-    })
+    watch(props, (props) => {
+      formState.id = props.record.id;
+      formState.name = props.record.name;
+      formState.sort = props.record.sort;
+      formState.parent = props.record.parent;
+      formState.remark = props.record.remark;
+      formState.enable = props.record.enable;
+      formState.address = props.record.address;
+    });
 
     const formRules = {
-      name: [ { required: true, message: '请输入部门名称', trigger: 'blur'} ],
-      address: [ { required: true, message: '请输入详细地址', trigger: 'blur'} ],
-      parent: [ { required: true, message: '请选择上级部门', trigger: 'change'} ]
+      name: [{ required: true, message: "请输入部门名称", trigger: "blur" }],
+      address: [{ required: true, message: "请输入详细地址", trigger: "blur" }],
+      parent: [
+        { required: true, message: "请选择上级部门", trigger: "change" },
+      ],
     };
 
     const submit = (e) => {
       formRef.value
         .validate()
         .then(() => {
-          edit(toRaw(formState)).then((response)=>{
-              if(response.success){
-                message.success({ content: '保存成功', duration: 1 }).then(()=>{
-                  cancel();
-                });
-              }else{
-                message.success({ content: '保存失败', duration: 1 }).then(()=>{
-                  cancel();
-                });
-              }
+          edit(toRaw(formState)).then((response) => {
+            if (response.success) {
+              message.success({ content: "保存成功", duration: 1 }).then(() => {
+                cancel();
+              });
+            } else {
+              message.success({ content: "保存失败", duration: 1 }).then(() => {
+                cancel();
+              });
+            }
           });
         })
-        .catch(error => {
-          console.log('error', error);
+        .catch((error) => {
+          console.log("error", error);
         });
     };
 
@@ -115,10 +127,10 @@ export default defineComponent({
     };
 
     const loadTree = () => {
-      tree({}).then((response)=>{
+      tree({}).then((response) => {
         state.depts = response.data;
-      })
-    }
+      });
+    };
 
     /// 加载部门
     loadTree();
@@ -130,12 +142,17 @@ export default defineComponent({
       formRef,
       formState,
       formRules,
-      
+
       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/dept/modal/info.vue b/src/view/dept/modal/info.vue
index 43a9d81..3ae8727 100644
--- a/src/view/dept/modal/info.vue
+++ b/src/view/dept/modal/info.vue
@@ -11,11 +11,11 @@
        ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
+      layout="vertical"
     >
+    <a-col :span="12" v-if="formState.parent != 0 ">
       <!-- 当前部门为根部门, 则不提供上级部门选择 -->
-      <a-form-item label="上级" name="parent" v-if="formState.parent != 0 ">
+      <a-form-item label="上级" name="parent" >
           <a-tree-select
             v-model:value="formState.parent"
             style="width: 100%"
@@ -27,18 +27,19 @@
           >
           </a-tree-select>
       </a-form-item>
+    </a-col>
       <a-form-item ref="name" label="名称" name="name">
         <a-input v-model:value="formState.name" />
       </a-form-item>
       <a-form-item ref="sort" label="排序" name="sort">
-        <a-input-number v-model:value="formState.sort" />
-      </a-form-item>
-      <a-form-item label="状态" name="state">
-        <a-switch v-model:checked="formState.enable" />
+        <a-input-number style="width: 100%" v-model:value="formState.sort" />
       </a-form-item>
       <a-form-item ref="address" label="地址" name="address">
         <a-input v-model:value="formState.address" />
       </a-form-item>
+      <a-form-item label="状态" name="state">
+        <a-switch v-model:checked="formState.enable" />
+      </a-form-item>
       <a-form-item label="备注" name="remark">
         <a-textarea v-model:value="formState.remark" />
       </a-form-item>
diff --git a/src/view/dept/modal/save.vue b/src/view/dept/modal/save.vue
index c140e5f..3a90037 100644
--- a/src/view/dept/modal/save.vue
+++ b/src/view/dept/modal/save.vue
@@ -8,44 +8,60 @@
     @cancel="cancel"
   >
     <a-form
-       ref="formRef"
+      ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
+      layout="vertical"
     >
-      <a-form-item label="上级" name="parent">
-          <a-tree-select
-            v-model:value="formState.parent"
-            style="width: 100%"
-            :tree-data="state.depts"
-            placeholder="所属部门"
-            replace
-            tree-default-expand-all
-            :replaceFields="replaceFields"
-          >
-          </a-tree-select>
-      </a-form-item>
-      <a-form-item ref="name" label="名称" name="name">
-        <a-input v-model:value="formState.name" />
-      </a-form-item>
-      <a-form-item ref="sort" label="排序" name="sort">
-        <a-input-number v-model:value="formState.sort" />
-      </a-form-item>
-      <a-form-item label="状态" name="state">
-        <a-switch v-model:checked="formState.enable" />
-      </a-form-item>
-      <a-form-item ref="address" label="地址" name="address">
-        <a-input v-model:value="formState.address" />
-      </a-form-item>
-      <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="formState.remark" />
-      </a-form-item>
+      <a-row :gutter="[16, 0]">
+        <a-col :span="12">
+          <a-form-item label="上级" name="parent">
+            <a-tree-select
+              v-model:value="formState.parent"
+              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="12">
+          <a-form-item ref="name" label="名称" name="name">
+            <a-input v-model:value="formState.name" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="sort" label="排序" name="sort">
+            <a-input-number
+              style="width: 100%"
+              v-model:value="formState.sort"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="address" label="地址" name="address">
+            <a-input v-model:value="formState.address" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态" name="state">
+            <a-switch v-model:checked="formState.enable" />
+          </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 { save, tree } from "@/api/module/dept";
 import { defineComponent, reactive, ref, toRaw } from "vue";
 export default defineComponent({
@@ -56,42 +72,43 @@ export default defineComponent({
   },
   emit: ["close"],
   setup(props, context) {
+    const state = reactive({
+      depts: [],
+    });
 
-    const state = reactive({ 
-      depts: [], 
-    })
-    
     const formRef = ref();
-    
+
     const formState = reactive({
       sort: 0,
       enable: true,
     });
 
     const formRules = {
-      name: [ { required: true, message: '请输入部门名称', trigger: 'blur'} ],
-      address: [ { required: true, message: '请输入详细地址', trigger: 'blur'} ],
-      parent: [ { required: true, message: '请选择上级部门', trigger: 'change'} ]
+      name: [{ required: true, message: "请输入部门名称", trigger: "blur" }],
+      address: [{ required: true, message: "请输入详细地址", trigger: "blur" }],
+      parent: [
+        { required: true, message: "请选择上级部门", trigger: "change" },
+      ],
     };
 
     const submit = (e) => {
       formRef.value
         .validate()
         .then(() => {
-          save(toRaw(formState)).then((response)=>{
-              if(response.success){
-                message.success({ content: '保存成功', duration: 1 }).then(()=>{
-                  cancel();
-                });
-              }else{
-                message.success({ content: '保存失败', duration: 1 }).then(()=>{
-                  cancel();
-                });
-              }
+          save(toRaw(formState)).then((response) => {
+            if (response.success) {
+              message.success({ content: "保存成功", duration: 1 }).then(() => {
+                cancel();
+              });
+            } else {
+              message.success({ content: "保存失败", duration: 1 }).then(() => {
+                cancel();
+              });
+            }
           });
         })
-        .catch(error => {
-          console.log('error', error);
+        .catch((error) => {
+          console.log("error", error);
         });
     };
 
@@ -101,10 +118,10 @@ export default defineComponent({
     };
 
     const loadTree = () => {
-      tree({}).then((response)=>{
+      tree({}).then((response) => {
         state.depts = response.data;
-      })
-    }
+      });
+    };
 
     /// 加载部门
     loadTree();
@@ -116,12 +133,17 @@ export default defineComponent({
       formRef,
       formState,
       formRules,
-      
+
       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>