hgwms-2098 fix 系统权限弹窗修改

src/view/jobLog/modal/info.vue

@@ -11,9 +11,9 @@
        ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
+      layout="vertical"
-      :wrapper-col="wrapperCol"
     >
+    <a-col :span="24">
       <a-form-item ref="jobName" label="名称" name="jobName">
         <a-input v-model:value="formState.jobName" />
       </a-form-item>
@@ -29,6 +29,7 @@
       <a-form-item label="状态" name="state">
         <a-switch v-model:checked="formState.state" />
       </a-form-item>
+    </a-col>
     </a-form>
   </a-modal>
 </template>

src/view/power/modal/edit.vue

@@ -11,13 +11,14 @@
       ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
+      layout="vertical"
-      :wrapper-col="wrapperCol"
     >
+      <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%;"
+              style="width: 100%"
               :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
               :tree-data="state.powers"
               placeholder="上级权限"
@@ -27,24 +28,55 @@
             >
             </a-tree-select>
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="title" label="名称" name="title">
             <a-input v-model:value="formState.title" />
           </a-form-item>
-      <a-form-item v-if="state.showComponent" ref="component" label="组件" name="component">
+        </a-col>
+        <a-col :span="12">
+          <a-form-item
+            v-if="state.showComponent"
+            ref="component"
+            label="组件"
+            name="component"
+          >
             <a-input v-model:value="formState.component" />
           </a-form-item>
-      <a-form-item v-if="state.showPath" ref="path" label="路径" name="path">
+        </a-col>
+        <a-col :span="12">
+          <a-form-item
+            v-if="state.showPath"
+            ref="path"
+            label="路径"
+            name="path"
+          >
             <a-input v-model:value="formState.path" />
           </a-form-item>
-      <a-form-item v-if="state.showCode" ref="code" label="标识" name="code">
+        </a-col>
+        <a-col :span="12">
+          <a-form-item
+            v-if="state.showCode"
+            ref="code"
+            label="标识"
+            name="code"
+          >
             <a-input v-model:value="formState.code" />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item label="图标" name="icon">
-        <pro-icon-picker v-model:modelValue="formState.icon"></pro-icon-picker>
+            <pro-icon-picker
+              v-model:modelValue="formState.icon"
+            ></pro-icon-picker>
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="i18n" label="i18n" name="i18n">
             <a-input v-model:value="formState.i18n" />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="type" label="类型" name="type">
             <a-select v-model:value="formState.type" @change="change">
               <a-select-option value="0"> 目录 </a-select-option>
@@ -52,20 +84,31 @@
               <a-select-option value="2"> 按钮 </a-select-option>
             </a-select>
           </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 { edit, tree } from "@/api/module/power";
 import { defineComponent, reactive, ref, toRaw, watch } from "vue";
 export default defineComponent({
@@ -74,17 +117,16 @@ export default defineComponent({
       type: Boolean,
     },
     record: {
-      type: Object
+      type: Object,
-    }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const state = reactive({
       depts: [],
       showComponent: true,
       showPath: true,
-      showCode: false
+      showCode: false,
     });
 
     const formRef = ref();
@@ -107,7 +149,7 @@ export default defineComponent({
       formState.sort = props.record.sort;
       formState.remark = props.record.remark;
       formState.parent = props.record.parent;
-      if(formState.type === '2') {
+      if (formState.type === "2") {
         state.showComponent = false;
         state.showPath = false;
         state.showCode = true;
@@ -116,17 +158,19 @@ export default defineComponent({
         state.showPath = true;
         state.showCode = false;
       }
-    })
+    });
 
     const formRules = {
-      title: [{ required: true, message: '请输入权限名称', trigger: 'blur'}],
+      title: [{ required: true, message: "请输入权限名称", trigger: "blur" }],
-      i18n: [{ required: true, message: '请输入 i18n', trigger: 'blur'}],
+      i18n: [{ required: true, message: "请输入 i18n", trigger: "blur" }],
-      type: [{ required: true, message: '请输入权限类型', trigger: 'blur'}],
+      type: [{ required: true, message: "请输入权限类型", trigger: "blur" }],
-      parent: [{ required: true, message: '请选择上级权限', trigger: 'change'}]
+      parent: [
+        { required: true, message: "请选择上级权限", trigger: "change" },
+      ],
     };
 
     const change = function (val) {
-      if(val === '2') {
+      if (val === "2") {
         state.showComponent = false;
         state.showPath = false;
         state.showCode = true;
@@ -135,7 +179,7 @@ export default defineComponent({
         state.showPath = true;
         state.showCode = false;
       }
-    }
+    };
 
     const submit = (e) => {
       formRef.value
@@ -143,18 +187,18 @@ export default defineComponent({
         .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 => {
+        .catch((error) => {
-          console.log('error', error);
+          console.log("error", error);
         });
     };
 
@@ -165,14 +209,16 @@ export default defineComponent({
 
     const loadPower = () => {
       tree({}).then((response) => {
-        response.data = [{
+        response.data = [
+          {
             id: "0",
             title: "顶级菜单",
-          children: response.data
+            children: response.data,
-        }]
+          },
+        ];
         state.powers = response.data;
-      })
+      });
-    }
+    };
 
     loadPower();
 
@@ -188,7 +234,12 @@ export default defineComponent({
       labelCol: { span: 6 },
       wrapperCol: { span: 18 },
 
-      replaceFields: {children:'children', title:'title', key:'id', value: 'id' }
+      replaceFields: {
+        children: "children",
+        title: "title",
+        key: "id",
+        value: "id",
+      },
     };
   },
 });

src/view/power/modal/info.vue

@@ -11,9 +11,10 @@
       ref="formRef"
       :model="formState"
       :rules="formRules"
-      :label-col="labelCol"
+      layout="vertical"
-      :wrapper-col="wrapperCol"
     >
+      <a-row :gutter="[16, 0]">
+        <a-col :span="12">
           <a-form-item label="上级" name="parent">
             <a-tree-select
               v-model:value="formState.parent"
@@ -26,18 +27,28 @@
             >
             </a-tree-select>
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="title" label="名称" name="title">
             <a-input v-model:value="formState.title" />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="component" label="组件" name="component">
             <a-input v-model:value="formState.component" />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="path" label="路径" name="path">
             <a-input v-model:value="formState.path" />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="i18n" label="i18n" name="i18n">
             <a-input v-model:value="formState.i18n" />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="type" label="类型" name="type">
             <a-select v-model:value="formState.type">
               <a-select-option value="0"> 目录 </a-select-option>
@@ -45,20 +56,28 @@
               <a-select-option value="2"> 按钮 </a-select-option>
             </a-select>
           </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, tree } from "@/api/module/power";
 import { defineComponent, reactive, ref, toRaw, watch } from "vue";
 export default defineComponent({
@@ -67,15 +86,14 @@ export default defineComponent({
       type: Boolean,
     },
     record: {
-      type: Object
+      type: Object,
-    }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const state = reactive({
       depts: [],
-    })
+    });
 
     const formRef = ref();
 
@@ -94,15 +112,19 @@ export default defineComponent({
       formState.i18n = props.record.i18n;
       formState.remark = props.record.remark;
       formState.parent = props.record.parent;
-    })
+    });
 
     const formRules = {
-      title: [{ required: true, message: '请输入权限名称', trigger: 'blur'}],
+      title: [{ required: true, message: "请输入权限名称", trigger: "blur" }],
-      component: [{ required: true, message: '请输入路由组件', trigger: 'blur'}],
+      component: [
-      path: [{ required: true, message: '请输入路由地址', trigger: 'blur'}],
+        { required: true, message: "请输入路由组件", trigger: "blur" },
-      i18n: [{ required: true, message: '请输入 i18n', trigger: 'blur'}],
+      ],
-      type: [{ required: true, message: '请输入权限类型', trigger: 'blur'}],
+      path: [{ required: true, message: "请输入路由地址", trigger: "blur" }],
-      parent: [{ required: true, message: '请选择上级权限', trigger: 'change'}]
+      i18n: [{ required: true, message: "请输入 i18n", trigger: "blur" }],
+      type: [{ required: true, message: "请输入权限类型", trigger: "blur" }],
+      parent: [
+        { required: true, message: "请选择上级权限", trigger: "change" },
+      ],
     };
 
     const submit = (e) => {
@@ -118,8 +140,8 @@ export default defineComponent({
     const loadPower = () => {
       tree({}).then((response) => {
         state.powers = response.data;
-      })
+      });
-    }
+    };
 
     loadPower();
 
@@ -134,7 +156,12 @@ export default defineComponent({
       labelCol: { span: 6 },
       wrapperCol: { span: 18 },
 
-      replaceFields: {children:'children', title:'title', key:'id', value: 'id' }
+      replaceFields: {
+        children: "children",
+        title: "title",
+        key: "id",
+        value: "id",
+      },
     };
   },
 });

src/view/power/modal/save.vue

@@ -1,7 +1,19 @@
 <template>
-  <a-modal :open="visible" title="新增权限" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel">
+  <a-modal
-    <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
+    :open="visible"
-      <a-row :gutter='[1,1]'>
+    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="type" label="类型" name="type">
             <a-select v-model:value="formState.type" @change="change">
@@ -20,58 +32,76 @@
             </a-select>
           </a-form-item>
         </a-col>
-      </a-row>
+        <a-col :span="12">
           <a-form-item label="上级" name="parent">
-        <a-tree-select v-model:value="formState.parent" style="width: 100%;"
+            <a-tree-select
-          :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }" :tree-data="state.powers" placeholder="上级权限"
+              v-model:value="formState.parent"
-          replace tree-default-expand-all :replaceFields="replaceFields">
+              style="width: 100%"
+              :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
+              :tree-data="state.powers"
+              placeholder="上级权限"
+              replace
+              tree-default-expand-all
+              :replaceFields="replaceFields"
+            >
             </a-tree-select>
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="title" label="名称" name="title">
             <a-input v-model:value="formState.title" />
           </a-form-item>
-      <a-form-item v-if="state.showComponent" ref="component" label="组件" name="component">
+        </a-col>
+        <a-col :span="12" v-if="state.showComponent">
+          <a-form-item ref="component" label="组件" name="component">
             <a-input v-model:value="formState.component" />
           </a-form-item>
-      <a-form-item v-if="state.showPath" ref="path" label="路径" name="path">
+        </a-col>
+        <a-col :span="12" v-if="state.showPath">
+          <a-form-item ref="path" label="路径" name="path">
             <a-input v-model:value="formState.path" />
           </a-form-item>
-      <a-form-item v-if="state.showCode" ref="code" label="标识" name="code">
+        </a-col>
+        <a-col :span="12" v-if="state.showCode">
+          <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 label="图标" name="icon">
-        <pro-icon-picker v-model:modelValue="formState.icon"></pro-icon-picker>
+            <pro-icon-picker
+              v-model:modelValue="formState.icon"
+            ></pro-icon-picker>
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="i18n" label="i18n" name="i18n">
             <a-input v-model:value="formState.i18n" />
           </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 {
+import { message } from "@hwork/ant-design-vue";
-    message
+import { save, tree } from "@/api/module/power";
-  } from "@hwork/ant-design-vue";
+import { defineComponent, reactive, ref, toRaw, watch } from "vue";
-  import {
-    save,
-    tree
-  } from "@/api/module/power";
-  import {
-    defineComponent,
-    reactive,
-    ref,
-    toRaw,
-    watch
-  } from "vue";
 export default defineComponent({
   props: {
     visible: {
@@ -80,12 +110,11 @@
   },
   emit: ["close"],
   setup(props, context) {
-
     const state = reactive({
       depts: [],
       showComponent: true,
       showPath: true,
-        showCode: false
+      showCode: false,
     });
 
     const formRef = ref();
@@ -98,31 +127,41 @@
     });
 
     const formRules = {
-        title: [{
+      title: [
+        {
           required: true,
           message: "请输入权限名称",
-          trigger: "blur"
+          trigger: "blur",
-        }],
+        },
-        i18n: [{
+      ],
+      i18n: [
+        {
           required: true,
           message: "请输入 i18n",
-          trigger: "blur"
+          trigger: "blur",
-        }],
+        },
-        type: [{
+      ],
+      type: [
+        {
           required: true,
           message: "请输入权限类型",
-          trigger: "blur"
+          trigger: "blur",
-        }],
+        },
-        clientType: [{
+      ],
+      clientType: [
+        {
           required: true,
           message: "请选择权限终端类型",
-          trigger: "blur"
+          trigger: "blur",
-        }],
+        },
-        parent: [{
+      ],
+      parent: [
+        {
           required: true,
           message: "请选择上级权限",
-          trigger: "change"
+          trigger: "change",
-        }],
+        },
+      ],
     };
 
     const submit = (e) => {
@@ -131,17 +170,21 @@
         .then(() => {
           save(toRaw(formState)).then((response) => {
             if (response.success) {
-                message.success({
+              message
+                .success({
                   content: "保存成功",
-                  duration: 1
+                  duration: 1,
-                }).then(() => {
+                })
+                .then(() => {
                   cancel();
                 });
             } else {
-                message.success({
+              message
+                .success({
                   content: "保存失败",
-                  duration: 1
+                  duration: 1,
-                }).then(() => {
+                })
+                .then(() => {
                   cancel();
                 });
             }
@@ -159,17 +202,19 @@
 
     const loadPower = () => {
       tree({}).then((response) => {
-          response.data = [{
+        response.data = [
+          {
             id: "0",
             title: "顶级菜单",
-            children: response.data
+            children: response.data,
-          }]
+          },
+        ];
         state.powers = response.data;
       });
     };
 
     const change = function (val) {
-        if (val === '2') {
+      if (val === "2") {
         state.showComponent = false;
         state.showPath = false;
         state.showCode = true;
@@ -178,7 +223,7 @@
         state.showPath = true;
         state.showCode = false;
       }
-      }
+    };
 
     loadPower();
 
@@ -192,10 +237,10 @@
       formRules,
 
       labelCol: {
-          span: 6
+        span: 6,
       },
       wrapperCol: {
-          span: 18
+        span: 18,
       },
 
       replaceFields: {

src/view/wms/warehouse/seqNum/modal/edit.vue

@@ -1,24 +1,77 @@
 <template>
-  <a-modal :open="visible" title="编辑" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel">
+  <a-modal
-    <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
+    :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="seqCode" label="值编号" name="seqCode">
-        <a-input v-model:value="formState.seqCode" placeholder="请输入值编号" />
+            <a-input
+              v-model:value="formState.seqCode"
+              placeholder="请输入值编号"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="seqName" label="名称" name="seqName">
-        <a-input v-model:value="formState.seqName" placeholder="请输入名称" />
+            <a-input
+              v-model:value="formState.seqName"
+              placeholder="请输入名称"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="minValue" label="起始值" name="minValue">
-        <a-input-number v-model:value="formState.minValue" placeholder="请输入起始值" style="width: 100%;"/>
+            <a-input-number
+              v-model:value="formState.minValue"
+              placeholder="请输入起始值"
+              style="width: 100%"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="incValue" label="自增值" name="incValue">
-        <a-input-number v-model:value="formState.incValue" placeholder="请输入自增值" style="width: 100%;"/>
+            <a-input-number
+              v-model:value="formState.incValue"
+              placeholder="请输入自增值"
+              style="width: 100%"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="maxValue" label="最大值" name="maxValue">
-        <a-input-number v-model:value="formState.maxValue" placeholder="请输入最大值" style="width: 100%;"/>
+            <a-input-number
+              v-model:value="formState.maxValue"
+              placeholder="请输入最大值"
+              style="width: 100%"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="currValue" label="当前值" name="currValue">
-        <a-input-number v-model:value="formState.currValue" placeholder="请输入当前值" style="width: 100%;"/>
+            <a-input-number
+              v-model:value="formState.currValue"
+              placeholder="请输入当前值"
+              style="width: 100%"
+            />
           </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-item ref="deleted" label="删除" name="deleted">
           <a-select v-model:value="formState.deleted" :options="seqDeleted" placeholder="请选择是或者否" />
         </a-form-item>
@@ -34,26 +87,14 @@
         <a-form-item ref="updateTime" label="修改时间" name="updateTime">
           <a-input v-model:value="formState.updateTime" placeholder="请输入修改时间" />
         </a-form-item> -->
-      <a-form-item label="备注" name="remark">
+      </a-row>
-        <a-textarea v-model:value="formState.remark" />
-      </a-form-item>
     </a-form>
   </a-modal>
 </template>
 <script>
-    import {
+import { message } from "@hwork/ant-design-vue";
-    message
+import { edit } from "@/api/wms/seqNum";
-  } from '@hwork/ant-design-vue';
+import { defineComponent, reactive, ref, toRaw, watch } from "vue";
-  import {
-    edit
-  } from "@/api/wms/seqNum";
-  import {
-    defineComponent,
-    reactive,
-    ref,
-    toRaw,
-    watch
-  } from "vue";
 export default defineComponent({
   props: {
     visible: {
@@ -61,100 +102,117 @@
     },
     record: {
       type: Object,
-      }
+    },
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
     const formState = reactive({});
 
-      const seqDeleted = ref([{
+    const seqDeleted = ref([
-        value: 'false',
+      {
-        label: '否',
+        value: "false",
-      }, {
+        label: "否",
-        value: 'true',
+      },
-        label: '是',
+      {
-      }]);
+        value: "true",
+        label: "是",
+      },
+    ]);
     watch(props, (props) => {
-        formState.id = props.record.id
+      formState.id = props.record.id;
       formState.seqCode = props.record.seqCode;
       formState.sqeName = props.record.seqName;
       formState.minValue = props.record.minValue;
       formState.incValue = props.record.incValue;
       formState.maxValue = props.record.maxValue;
       formState.currValue = props.record.currValue;
-      })
+    });
 
     const formRules = {
-        seqCode: [{
+      seqCode: [
+        {
           required: true,
-          message: '请输入值编号(必填)',
+          message: "请输入值编号(必填)",
-          trigger: 'blur'
+          trigger: "blur",
-        }],
+        },
-        sqeName: [{
+      ],
+      sqeName: [
+        {
           required: true,
-          message: '请输入名称(必填)',
+          message: "请输入名称(必填)",
-          trigger: 'blur'
+          trigger: "blur",
-        }],
+        },
-        minValue: [{
+      ],
+      minValue: [
+        {
           required: true,
-          message: '请输入起始值(必填)',
+          message: "请输入起始值(必填)",
-          trigger: 'blur',
+          trigger: "blur",
-          type:'number'
+          type: "number",
-        }],
+        },
-        incValue: [{
+      ],
+      incValue: [
+        {
           required: true,
-          message: '请输入自增值(必填)',
+          message: "请输入自增值(必填)",
-          trigger: 'blur',
+          trigger: "blur",
-          type:'number'
+          type: "number",
-        }],
+        },
-        maxValue: [{
+      ],
+      maxValue: [
+        {
           required: true,
-          message: '请输入最大值(必填)',
+          message: "请输入最大值(必填)",
-          trigger: 'blur',
+          trigger: "blur",
-          type:'number'
+          type: "number",
-        }],
+        },
-        currValue: [{
+      ],
+      currValue: [
+        {
           required: true,
-          message: '请输入当前值(必填)',
+          message: "请输入当前值(必填)",
-          trigger: 'blur',
+          trigger: "blur",
-          type:'number'
+          type: "number",
-        }],
+        },
+      ],
     };
 
     const editKey = "add";
 
     const submit = (e) => {
       message.loading({
-          content: '提交中...',
+        content: "提交中...",
-          key: editKey
+        key: editKey,
       });
       formRef.value
         .validate()
         .then(() => {
           edit(toRaw(formState)).then((response) => {
             if (response.success) {
-                message.success({
+              message
-                  content: '保存成功',
+                .success({
+                  content: "保存成功",
                   key: editKey,
-                  duration: 1
+                  duration: 1,
-                }).then(() => {
+                })
+                .then(() => {
                   cancel();
                 });
             } else {
-                message.error({
+              message
+                .error({
                   content: response.msg,
                   key: editKey,
-                  duration: 1
+                  duration: 1,
-                }).then(() => {
+                })
-                });
+                .then(() => {});
             }
           });
         })
-          .catch(error => {
+        .catch((error) => {
-            console.log('error', error);
+          console.log("error", error);
         });
     };
 
@@ -164,7 +222,6 @@
     };
 
     return {
-
       submit,
       cancel,
       formRef,
@@ -173,10 +230,10 @@
       seqDeleted,
 
       labelCol: {
-          span: 8
+        span: 8,
       },
       wrapperCol: {
-          span: 12
+        span: 12,
       },
     };
   },

src/view/wms/warehouse/seqNum/modal/save.vue

@@ -1,24 +1,74 @@
 <template>
-  <a-modal :open="visible" title="新增" cancelText="取消" okText="提交" @ok="submit" @cancel="cancel">
+  <a-modal
-    <a-form ref="formRef" :model="formState" :rules="formRules" :label-col="labelCol" :wrapper-col="wrapperCol">
+    :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="seqCode" label="值编号" name="seqCode">
-        <a-input v-model:value="formState.seqCode" placeholder="请输入值编号" />
+            <a-input
+              v-model:value="formState.seqCode"
+              placeholder="请输入值编号"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="seqName" label="名称" name="seqName">
-        <a-input v-model:value="formState.seqName" placeholder="请输入名称" />
+            <a-input
+              v-model:value="formState.seqName"
+              placeholder="请输入名称"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="minValue" label="起始值" name="minValue">
-        <a-input v-model:value="formState.minValue" placeholder="请输入起始值" />
+            <a-input
+              v-model:value="formState.minValue"
+              placeholder="请输入起始值"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="incValue" label="自增值" name="incValue">
-        <a-input v-model:value="formState.incValue" placeholder="请输入自增值" />
+            <a-input
+              v-model:value="formState.incValue"
+              placeholder="请输入自增值"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="maxValue" label="最大值" name="maxValue">
-        <a-input v-model:value="formState.maxValue" placeholder="请输入最大值" />
+            <a-input
+              v-model:value="formState.maxValue"
+              placeholder="请输入最大值"
+            />
           </a-form-item>
+        </a-col>
+        <a-col :span="12">
           <a-form-item ref="currValue" label="当前值" name="currValue">
-        <a-input v-model:value="formState.currValue" placeholder="请输入当前值" />
+            <a-input
+              v-model:value="formState.currValue"
+              placeholder="请输入当前值"
+            />
           </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-item ref="deleted" label="删除" name="deleted">
         <a-select v-model:value="formState.deleted" :options="seqDeleted" placeholder="请选择是或否" />
       </a-form-item>
@@ -34,25 +84,13 @@
       <a-form-item ref="updateTime" label="修改时间" name="updateTime">
         <a-input v-model:value="formState.updateTime" placeholder="请输入修改时间" />
       </a-form-item> -->
-      <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="formState.remark" />
-      </a-form-item>
     </a-form>
   </a-modal>
 </template>
 <script>
-    import {
+import { message } from "@hwork/ant-design-vue";
-    message
+import { save } from "@/api/wms/seqNum";
-  } from '@hwork/ant-design-vue';
+import { defineComponent, reactive, ref, toRaw } from "vue";
-  import {
-    save
-  } from "@/api/wms/seqNum";
-  import {
-    defineComponent,
-    reactive,
-    ref,
-    toRaw
-  } from "vue";
 export default defineComponent({
   props: {
     visible: {
@@ -61,86 +99,102 @@
   },
   emit: ["close"],
   setup(props, context) {
-
     const formRef = ref();
 
     const state = reactive({});
 
     const formState = reactive({});
 
-      const seqDeleted = ref([{
+    const seqDeleted = ref([
-        value: 'false',
+      {
-        label: '否',
+        value: "false",
-      }, {
+        label: "否",
-        value: 'true',
+      },
-        label: '是',
+      {
-      }]);
+        value: "true",
+        label: "是",
+      },
+    ]);
 
     const formRules = {
-        seqCode: [{
+      seqCode: [
+        {
           required: true,
-          message: '请输入值编号(必填)',
+          message: "请输入值编号(必填)",
-          trigger: 'blur'
+          trigger: "blur",
-        }],
+        },
-        sqeName: [{
+      ],
+      sqeName: [
+        {
           required: true,
-          message: '请输入名称(必填)',
+          message: "请输入名称(必填)",
-          trigger: 'blur'
+          trigger: "blur",
-        }],
+        },
-        minValue: [{
+      ],
+      minValue: [
+        {
           required: true,
-          message: '请输入起始值(必填)',
+          message: "请输入起始值(必填)",
-          trigger: 'blur'
+          trigger: "blur",
-        }],
+        },
-        incValue: [{
+      ],
+      incValue: [
+        {
           required: true,
-          message: '请输入自增值(必填)',
+          message: "请输入自增值(必填)",
-          trigger: 'blur'
+          trigger: "blur",
-        }],
+        },
-        maxValue: [{
+      ],
+      maxValue: [
+        {
           required: true,
-          message: '请输入最大值(必填)',
+          message: "请输入最大值(必填)",
-          trigger: 'blur'
+          trigger: "blur",
-        }],
+        },
-        currValue: [{
+      ],
+      currValue: [
+        {
           required: true,
-          message: '请输入当前值(必填)',
+          message: "请输入当前值(必填)",
-          trigger: 'blur'
+          trigger: "blur",
-        }],
+        },
+      ],
     };
 
     const saveKey = "save";
 
-
     const submit = (e) => {
       message.loading({
-          content: '提交中...',
+        content: "提交中...",
-          key: saveKey
+        key: saveKey,
       });
       formRef.value
         .validate()
         .then(() => {
           save(toRaw(formState)).then((response) => {
             if (response.success) {
-                message.success({
+              message
-                  content: '保存成功',
+                .success({
+                  content: "保存成功",
                   key: saveKey,
-                  duration: 1
+                  duration: 1,
-                }).then(() => {
+                })
+                .then(() => {
                   cancel();
                 });
             } else {
-                message.error({
+              message
+                .error({
                   content: response.msg,
                   key: saveKey,
-                  duration: 1
+                  duration: 1,
-                }).then(() => {
+                })
-                });
+                .then(() => {});
             }
           });
         })
-          .catch(error => {
+        .catch((error) => {
-            console.log('error', error);
+          console.log("error", error);
         });
     };
 
@@ -149,7 +203,6 @@
       context.emit("close", false);
     };
 
-
     return {
       state,
       submit,
@@ -160,10 +213,10 @@
       seqDeleted,
 
       labelCol: {
-          span: 8
+        span: 8,
       },
       wrapperCol: {
-          span: 12
+        span: 12,
       },
     };
   },