hgwms-2098 fix 自增序列弹窗修改

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,
       },
     };
   },