hgwms-2098 fix 数据字典弹窗修改

src/view/dict/modal/data/edit.vue

@@ -1,44 +1,65 @@
 <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-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 v-model:value="formState.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";
+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: {
@@ -46,26 +67,29 @@
     },
     record: {
       type: Object,
-      }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
     const formState = reactive({});
 
     const formRules = {
-        name: [{
+      name: [
+        {
           required: true,
-          message: '请输入名称',
-          trigger: 'blur'
-        }, ],
-        code: [{
+          message: "请输入名称",
+          trigger: "blur",
+        },
+      ],
+      code: [
+        {
           required: true,
-          message: '请输入标识',
-          trigger: 'blur'
-        }, ]
+          message: "请输入标识",
+          trigger: "blur",
+        },
+      ],
     };
 
     watch(props, (props) => {
@@ -77,7 +101,7 @@
       formState.sort = props.record.sort;
       formState.enable = props.record.enable;
       formState.remark = props.record.remark;
-      })
+    });
 
     const submit = (e) => {
       formRef.value
@@ -85,24 +109,28 @@
         .then(() => {
           edit(toRaw(formState)).then((response) => {
             if (response.success) {
-                message.success({
-                  content: '保存成功',
-                  duration: 1
-                }).then(() => {
+              message
+                .success({
+                  content: "保存成功",
+                  duration: 1,
+                })
+                .then(() => {
                   cancel();
                 });
             } else {
-                message.success({
-                  content: '保存失败',
-                  duration: 1
-                }).then(() => {
+              message
+                .success({
+                  content: "保存失败",
+                  duration: 1,
+                })
+                .then(() => {
                   cancel();
                 });
             }
           });
         })
-          .catch(error => {
-            console.log('error', error);
+        .catch((error) => {
+          console.log("error", error);
         });
     };
 
@@ -119,10 +147,10 @@
       formRules,
 
       labelCol: {
-          span: 6
+        span: 6,
       },
       wrapperCol: {
-          span: 18
+        span: 18,
       },
     };
   },

src/view/dict/modal/data/save.vue

@@ -11,35 +11,53 @@
       ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
+      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 v-model:value="formState.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,11 +67,10 @@ export default defineComponent({
     },
     record: {
       type: Object,
-    }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
     const formState = reactive({
@@ -62,16 +79,12 @@ export default defineComponent({
     });
 
     watch(props, (props) => {
-        formState.code = props.record.code
-    })
+      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) => {
@@ -80,18 +93,18 @@ export default defineComponent({
         .then(() => {
           save(toRaw(formState)).then((response) => {
             if (response.success) {
-                message.success({ content: '保存成功', duration: 1 }).then(()=>{
+              message.success({ content: "保存成功", duration: 1 }).then(() => {
                 cancel();
               });
             } else {
-                message.success({ content: '保存失败', duration: 1 }).then(()=>{
+              message.success({ content: "保存失败", duration: 1 }).then(() => {
                 cancel();
               });
             }
           });
         })
-        .catch(error => {
-          console.log('error', error);
+        .catch((error) => {
+          console.log("error", error);
         });
     };
 

src/view/dict/modal/edit.vue

@@ -1,38 +1,52 @@
 <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-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 v-model:value="formState.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";
+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: {
@@ -40,26 +54,29 @@
     },
     record: {
       type: Object,
-      }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
     const formState = reactive({});
 
     const formRules = {
-        name: [{
+      name: [
+        {
           required: true,
-          message: '请输入名称',
-          trigger: 'blur'
-        }, ],
-        code: [{
+          message: "请输入名称",
+          trigger: "blur",
+        },
+      ],
+      code: [
+        {
           required: true,
-          message: '请输入标识',
-          trigger: 'blur'
-        }, ]
+          message: "请输入标识",
+          trigger: "blur",
+        },
+      ],
     };
 
     watch(props, (props) => {
@@ -69,7 +86,7 @@
       formState.sort = props.record.sort;
       formState.enable = props.record.enable;
       formState.remark = props.record.remark;
-      })
+    });
 
     const submit = (e) => {
       formRef.value
@@ -77,24 +94,28 @@
         .then(() => {
           edit(toRaw(formState)).then((response) => {
             if (response.success) {
-                message.success({
-                  content: '保存成功',
-                  duration: 1
-                }).then(() => {
+              message
+                .success({
+                  content: "保存成功",
+                  duration: 1,
+                })
+                .then(() => {
                   cancel();
                 });
             } else {
-                message.success({
-                  content: '保存失败',
-                  duration: 1
-                }).then(() => {
+              message
+                .success({
+                  content: "保存失败",
+                  duration: 1,
+                })
+                .then(() => {
                   cancel();
                 });
             }
           });
         })
-          .catch(error => {
-            console.log('error', error);
+        .catch((error) => {
+          console.log("error", error);
         });
     };
 
@@ -111,10 +132,10 @@
       formRules,
 
       labelCol: {
-          span: 6
+        span: 6,
       },
       wrapperCol: {
-          span: 18
+        span: 18,
       },
     };
   },

src/view/dict/modal/save.vue

@@ -11,29 +11,40 @@
       ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
+      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 v-model:value="formState.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,12 +63,8 @@ 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) => {
@@ -67,18 +73,18 @@ export default defineComponent({
         .then(() => {
           save(toRaw(formState)).then((response) => {
             if (response.success) {
-                message.success({ content: '保存成功', duration: 1 }).then(()=>{
+              message.success({ content: "保存成功", duration: 1 }).then(() => {
                 cancel();
               });
             } else {
-                message.success({ content: '保存失败', duration: 1 }).then(()=>{
+              message.success({ content: "保存失败", duration: 1 }).then(() => {
                 cancel();
               });
             }
           });
         })
-        .catch(error => {
-          console.log('error', error);
+        .catch((error) => {
+          console.log("error", error);
         });
     };