From f5751c70d93e50e1a21472d610c2b9cd7befa237 Mon Sep 17 00:00:00 2001
From: A0066811 <961502390@qq.com>
Date: Fri, 7 Nov 2025 13:22:40 +0800
Subject: [PATCH] =?UTF-8?q?hgwms-2098=20fix=20=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=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/dict/modal/data/edit.vue | 246 +++++++++++++++++-------------
 src/view/dict/modal/data/save.vue | 119 ++++++++-------
 src/view/dict/modal/edit.vue      | 223 +++++++++++++++------------
 src/view/dict/modal/save.vue      |  82 +++++-----
 4 files changed, 369 insertions(+), 301 deletions(-)

diff --git a/src/view/dict/modal/data/edit.vue b/src/view/dict/modal/data/edit.vue
index 33a3f82..aaf1456 100644
--- a/src/view/dict/modal/data/edit.vue
+++ b/src/view/dict/modal/data/edit.vue
@@ -1,130 +1,158 @@
 <template>
-  <a-modal :open="visible" title="修改字典" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel">
-    <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item ref="label" label="中文标签" name="label">
-        <a-input v-model:value="formState.label" />
-      </a-form-item>
-      <a-form-item ref="value" label="标识" name="value">
-        <a-input v-model:value="formState.value" />
-      </a-form-item>
-      <a-form-item ref="code" label="类型" name="code">
-        <a-input v-model:value="formState.code" />
-      </a-form-item>
-      <a-form-item ref="color" label="颜色" name="color">
-        <a-input v-model:value="formState.color" />
-      </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="enable">
-        <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>
+  <a-modal
+    :open="visible"
+    title="修改字典"
+    cancelText="取消"
+    okText="提交"
+    @ok="submit"
+    @cancel="cancel"
+  >
+    <a-form
+      ref="formRef"
+      :model="formState"
+      :rules="formRules"
+      layout="vertical"
+    >
+      <a-row :gutter="[16, 0]">
+        <a-col :span="12">
+          <a-form-item ref="label" label="中文标签" name="label">
+            <a-input v-model:value="formState.label" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="value" label="标识" name="value">
+            <a-input v-model:value="formState.value" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="code" label="类型" name="code">
+            <a-input v-model:value="formState.code" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="color" label="颜色" name="color">
+            <a-input v-model:value="formState.color" />
+          </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 label="状态" name="enable">
+            <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 {
-    edit
-  } from "@/api/module/dictData";
-  import {
-    defineComponent,
-    reactive,
-    ref,
-    toRaw,
-    watch
-  } from "vue";
-  export default defineComponent({
-    props: {
-      visible: {
-        type: Boolean,
-      },
-      record: {
-        type: Object,
-      }
+import { message } from "@hwork/ant-design-vue";
+import { edit } from "@/api/module/dictData";
+import { defineComponent, reactive, ref, toRaw, watch } from "vue";
+export default defineComponent({
+  props: {
+    visible: {
+      type: Boolean,
     },
-    emit: ["close"],
-    setup(props, context) {
+    record: {
+      type: Object,
+    },
+  },
+  emit: ["close"],
+  setup(props, context) {
+    const formRef = ref();
 
-      const formRef = ref();
+    const formState = reactive({});
 
-      const formState = reactive({});
-
-      const formRules = {
-        name: [{
+    const formRules = {
+      name: [
+        {
           required: true,
-          message: '请输入名称',
-          trigger: 'blur'
-        }, ],
-        code: [{
+          message: "请输入名称",
+          trigger: "blur",
+        },
+      ],
+      code: [
+        {
           required: true,
-          message: '请输入标识',
-          trigger: 'blur'
-        }, ]
-      };
+          message: "请输入标识",
+          trigger: "blur",
+        },
+      ],
+    };
 
-      watch(props, (props) => {
-        formState.id = props.record.id;
-        formState.label = props.record.label;
-        formState.value = props.record.value;
-        formState.color = props.record.color;
-        formState.code = props.record.code;
-        formState.sort = props.record.sort;
-        formState.enable = props.record.enable;
-        formState.remark = props.record.remark;
-      })
+    watch(props, (props) => {
+      formState.id = props.record.id;
+      formState.label = props.record.label;
+      formState.value = props.record.value;
+      formState.color = props.record.color;
+      formState.code = props.record.code;
+      formState.sort = props.record.sort;
+      formState.enable = props.record.enable;
+      formState.remark = props.record.remark;
+    });
 
-      const submit = (e) => {
-        formRef.value
-          .validate()
-          .then(() => {
-            edit(toRaw(formState)).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: '保存成功',
-                  duration: 1
-                }).then(() => {
+    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(() => {
+            } else {
+              message
+                .success({
+                  content: "保存失败",
+                  duration: 1,
+                })
+                .then(() => {
                   cancel();
                 });
-              }
-            });
-          })
-          .catch(error => {
-            console.log('error', error);
+            }
           });
-      };
+        })
+        .catch((error) => {
+          console.log("error", error);
+        });
+    };
 
-      const cancel = (e) => {
-        formRef.value.resetFields();
-        context.emit("close", false);
-      };
+    const cancel = (e) => {
+      formRef.value.resetFields();
+      context.emit("close", false);
+    };
 
-      return {
-        submit,
-        cancel,
-        formRef,
-        formState,
-        formRules,
+    return {
+      submit,
+      cancel,
+      formRef,
+      formState,
+      formRules,
 
-        labelCol: {
-          span: 6
-        },
-        wrapperCol: {
-          span: 18
-        },
-      };
-    },
-  });
+      labelCol: {
+        span: 6,
+      },
+      wrapperCol: {
+        span: 18,
+      },
+    };
+  },
+});
 </script>
diff --git a/src/view/dict/modal/data/save.vue b/src/view/dict/modal/data/save.vue
index 96f7b45..4900eb3 100644
--- a/src/view/dict/modal/data/save.vue
+++ b/src/view/dict/modal/data/save.vue
@@ -8,38 +8,56 @@
     @cancel="cancel"
   >
     <a-form
-       ref="formRef"
+      ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
+      layout="vertical"
     >
-      <a-form-item ref="label" label="中文标签" name="label">
-        <a-input v-model:value="formState.label" />
-      </a-form-item>
-      <a-form-item ref="value" label="标识" name="value">
-        <a-input v-model:value="formState.value" />
-      </a-form-item>
-      <a-form-item ref="code" label="类型" name="code">
-        <a-input v-model:value="formState.code" />
-      </a-form-item>
-      <a-form-item ref="color" label="颜色" name="color">
-        <a-input v-model:value="formState.color" />
-      </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="enable">
-        <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>
+      <a-row :gutter="[16, 0]">
+        <a-col :span="12">
+          <a-form-item ref="label" label="中文标签" name="label">
+            <a-input v-model:value="formState.label" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="value" label="标识" name="value">
+            <a-input v-model:value="formState.value" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="code" label="类型" name="code">
+            <a-input v-model:value="formState.code" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="color" label="颜色" name="color">
+            <a-input v-model:value="formState.color" />
+          </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 label="状态" name="enable">
+            <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 } from "@/api/module/dictData";
 import { defineComponent, reactive, ref, toRaw, watch } from "vue";
 export default defineComponent({
@@ -49,49 +67,44 @@ export default defineComponent({
     },
     record: {
       type: Object,
-    }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
-    
+
     const formState = reactive({
-        sort: 0,
-        enable: "true",
+      sort: 0,
+      enable: "true",
     });
 
-    watch(props,(props)=>{
-        formState.code = props.record.code
-    })
+    watch(props, (props) => {
+      formState.code = props.record.code;
+    });
 
     const formRules = {
-      name: [
-        { required: true, message: '请输入名称', trigger: 'blur'},
-      ],
-      code: [
-        { required: true, message: '请输入标识', trigger: 'blur'},
-      ]
+      name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+      code: [{ required: true, message: "请输入标识", trigger: "blur" }],
     };
 
     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);
         });
     };
 
@@ -106,10 +119,10 @@ export default defineComponent({
       formRef,
       formState,
       formRules,
-      
+
       labelCol: { span: 6 },
       wrapperCol: { span: 18 },
     };
   },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/dict/modal/edit.vue b/src/view/dict/modal/edit.vue
index 2ecce9d..5a4d9b6 100644
--- a/src/view/dict/modal/edit.vue
+++ b/src/view/dict/modal/edit.vue
@@ -1,122 +1,143 @@
 <template>
-  <a-modal :open="visible" title="修改字典" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel">
-    <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item ref="name" label="名称" name="name">
-        <a-input v-model:value="formState.name" />
-      </a-form-item>
-      <a-form-item ref="code" label="标识" name="code">
-        <a-input v-model:value="formState.code" />
-      </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="enable">
-        <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>
+  <a-modal
+    :open="visible"
+    title="修改字典"
+    cancelText="取消"
+    okText="提交"
+    @ok="submit"
+    @cancel="cancel"
+  >
+    <a-form
+      ref="formRef"
+      :model="formState"
+      :rules="formRules"
+      layout="vertical"
+    >
+      <a-row :gutter="[16, 0]">
+        <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="code" label="标识" name="code">
+            <a-input v-model:value="formState.code" />
+          </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 label="状态" name="enable">
+            <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 {
-    edit
-  } from "@/api/module/dict";
-  import {
-    defineComponent,
-    reactive,
-    ref,
-    toRaw,
-    watch
-  } from "vue";
-  export default defineComponent({
-    props: {
-      visible: {
-        type: Boolean,
-      },
-      record: {
-        type: Object,
-      }
+import { message } from "@hwork/ant-design-vue";
+import { edit } from "@/api/module/dict";
+import { defineComponent, reactive, ref, toRaw, watch } from "vue";
+export default defineComponent({
+  props: {
+    visible: {
+      type: Boolean,
     },
-    emit: ["close"],
-    setup(props, context) {
+    record: {
+      type: Object,
+    },
+  },
+  emit: ["close"],
+  setup(props, context) {
+    const formRef = ref();
 
-      const formRef = ref();
+    const formState = reactive({});
 
-      const formState = reactive({});
-
-      const formRules = {
-        name: [{
+    const formRules = {
+      name: [
+        {
           required: true,
-          message: '请输入名称',
-          trigger: 'blur'
-        }, ],
-        code: [{
+          message: "请输入名称",
+          trigger: "blur",
+        },
+      ],
+      code: [
+        {
           required: true,
-          message: '请输入标识',
-          trigger: 'blur'
-        }, ]
-      };
+          message: "请输入标识",
+          trigger: "blur",
+        },
+      ],
+    };
 
-      watch(props, (props) => {
-        formState.id = props.record.id;
-        formState.name = props.record.name;
-        formState.code = props.record.code;
-        formState.sort = props.record.sort;
-        formState.enable = props.record.enable;
-        formState.remark = props.record.remark;
-      })
+    watch(props, (props) => {
+      formState.id = props.record.id;
+      formState.name = props.record.name;
+      formState.code = props.record.code;
+      formState.sort = props.record.sort;
+      formState.enable = props.record.enable;
+      formState.remark = props.record.remark;
+    });
 
-      const submit = (e) => {
-        formRef.value
-          .validate()
-          .then(() => {
-            edit(toRaw(formState)).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: '保存成功',
-                  duration: 1
-                }).then(() => {
+    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(() => {
+            } else {
+              message
+                .success({
+                  content: "保存失败",
+                  duration: 1,
+                })
+                .then(() => {
                   cancel();
                 });
-              }
-            });
-          })
-          .catch(error => {
-            console.log('error', error);
+            }
           });
-      };
+        })
+        .catch((error) => {
+          console.log("error", error);
+        });
+    };
 
-      const cancel = (e) => {
-        formRef.value.resetFields();
-        context.emit("close", false);
-      };
+    const cancel = (e) => {
+      formRef.value.resetFields();
+      context.emit("close", false);
+    };
 
-      return {
-        submit,
-        cancel,
-        formRef,
-        formState,
-        formRules,
+    return {
+      submit,
+      cancel,
+      formRef,
+      formState,
+      formRules,
 
-        labelCol: {
-          span: 6
-        },
-        wrapperCol: {
-          span: 18
-        },
-      };
-    },
-  });
+      labelCol: {
+        span: 6,
+      },
+      wrapperCol: {
+        span: 18,
+      },
+    };
+  },
+});
 </script>
diff --git a/src/view/dict/modal/save.vue b/src/view/dict/modal/save.vue
index 5fefc0c..8c8a9a9 100644
--- a/src/view/dict/modal/save.vue
+++ b/src/view/dict/modal/save.vue
@@ -8,32 +8,43 @@
     @cancel="cancel"
   >
     <a-form
-       ref="formRef"
+      ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
+      layout="vertical"
     >
-      <a-form-item ref="name" label="名称" name="name">
-        <a-input v-model:value="formState.name" />
-      </a-form-item>
-      <a-form-item ref="code" label="标识" name="code">
-        <a-input v-model:value="formState.code" />
-      </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="enable">
-        <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>
+      <a-row :gutter="[16, 0]">
+        <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="code" label="标识" name="code">
+            <a-input v-model:value="formState.code" />
+          </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 label="状态" name="enable">
+            <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 } from "@/api/module/dict";
 import { defineComponent, reactive, ref, toRaw } from "vue";
 export default defineComponent({
@@ -44,7 +55,6 @@ export default defineComponent({
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
     const formState = reactive({
@@ -53,32 +63,28 @@ export default defineComponent({
     });
 
     const formRules = {
-      name: [
-        { required: true, message: '请输入名称', trigger: 'blur'},
-      ],
-      code: [
-        { required: true, message: '请输入标识', trigger: 'blur'},
-      ]
+      name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+      code: [{ required: true, message: "请输入标识", trigger: "blur" }],
     };
 
     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);
         });
     };