From 87e3bdf9338f04d1d11624491fdd3caf8ef868a9 Mon Sep 17 00:00:00 2001
From: A0066811 <961502390@qq.com>
Date: Fri, 7 Nov 2025 09:56:41 +0800
Subject: [PATCH] =?UTF-8?q?hgwms-2098=20fix=20=E7=89=A9=E6=96=99=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=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

---
 .../wms/baseInfo/skuCategory/modal/edit.vue   | 275 ++++++++-------
 .../wms/baseInfo/skuCategory/modal/save.vue   | 330 ++++++++++--------
 2 files changed, 352 insertions(+), 253 deletions(-)

diff --git a/src/view/wms/baseInfo/skuCategory/modal/edit.vue b/src/view/wms/baseInfo/skuCategory/modal/edit.vue
index dd79b21..7096c93 100644
--- a/src/view/wms/baseInfo/skuCategory/modal/edit.vue
+++ b/src/view/wms/baseInfo/skuCategory/modal/edit.vue
@@ -1,138 +1,179 @@
 <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="categoryCode" label="种类编号" name="categoryCode">
-      <a-input v-model:value="formState.categoryCode"  placeholder="请输入种类编号"/>
-    </a-form-item>
-    <a-form-item ref="categoryName" label="种类名称" name="categoryName">
-      <a-input v-model:value="formState.categoryName"  placeholder="请输入种类名称"/>
-    </a-form-item>
-    <a-form-item ref="categoryDesc" label="种类描述" name="categoryDesc">
-       <a-input v-model:value="formState.categoryDesc" placeholder="请输入种类描述"/>
-     </a-form-item>
-     <a-form-item ref="treeLevel" label="树层级" name="treeLevel">
-       <a-input v-model:value="formState.treeLevel" placeholder="请输入树层级"/>
-     </a-form-item>
-     <a-form-item ref="treeCode" label="树编号" name="treeCode">
-       <a-input v-model:value="formState.treeCode" placeholder="请输入树编号"/>
-     </a-form-item>
-     <a-form-item ref="isActive" label="是否有效" name="isActive">
-       <a-select v-model:value="formState.isActive"  :options="skuCategoryIsActive"  laceholder="请选择是否有效"/>
-     </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="categoryCode" label="种类编号" name="categoryCode">
+            <a-input
+              v-model:value="formState.categoryCode"
+              placeholder="请输入种类编号"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="categoryName" label="种类名称" name="categoryName">
+            <a-input
+              v-model:value="formState.categoryName"
+              placeholder="请输入种类名称"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="categoryDesc" label="种类描述" name="categoryDesc">
+            <a-input
+              v-model:value="formState.categoryDesc"
+              placeholder="请输入种类描述"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="treeLevel" label="树层级" name="treeLevel">
+            <a-input
+              v-model:value="formState.treeLevel"
+              placeholder="请输入树层级"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="treeCode" label="树编号" name="treeCode">
+            <a-input
+              v-model:value="formState.treeCode"
+              placeholder="请输入树编号"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="isActive" label="是否有效" name="isActive">
+            <a-select
+              v-model:value="formState.isActive"
+              :options="skuCategoryIsActive"
+              laceholder="请选择是否有效"
+            />
+          </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/wms/skuCategory";
-  import {
-    defineComponent,
-    reactive,
-    ref,
-    toRaw,
-    watch
-  } from "vue";
-  export default defineComponent({
-    props: {
-      visible: {
-        type: Boolean,
+import { message } from "@hwork/ant-design-vue";
+import { edit } from "@/api/wms/skuCategory";
+import { defineComponent, reactive, ref, toRaw, watch } from "vue";
+export default defineComponent({
+  props: {
+    visible: {
+      type: Boolean,
+    },
+    record: {
+      type: Object,
+    },
+  },
+  emit: ["close"],
+  setup(props, context) {
+    const formRef = ref();
+
+    const formState = reactive({});
+    const skuCategoryIsActive = ref([
+      {
+        value: "1",
+        label: "是",
       },
-      record: {
-        type: Object,
-      }
-    },
-    emit: ["close"],
-    setup(props, context) {
+      {
+        value: "0",
+        label: "否",
+      },
+    ]);
 
-      const formRef = ref();
+    watch(props, (props) => {
+      formState.id = props.record.id;
+      formState.categoryName = props.record.categoryName;
+      formState.categoryDesc = props.record.categoryDesc;
+      formState.categoryCode = props.record.categoryCode;
+      formState.treeLevel = props.record.treeLevel;
+      formState.treeCode = props.record.treeCode;
+      formState.fullTreeCode = props.record.fullTreeCode;
+      formState.isActive = props.record.isActive;
+      formState.remark = props.record.remark;
+    });
 
-      const formState = reactive({});
-      const skuCategoryIsActive = ref([{
-        value: '1',
-        label: '是',
-      }, {
-        value: '0',
-        label: '否',
-      }, ]);
+    const formRules = {};
 
-      watch(props, (props) => {
-        formState.id = props.record.id
-        formState.categoryName = props.record.categoryName
-        formState.categoryDesc = props.record.categoryDesc
-        formState.categoryCode = props.record.categoryCode
-        formState.treeLevel = props.record.treeLevel
-        formState.treeCode = props.record.treeCode
-        formState.fullTreeCode = props.record.fullTreeCode
-        formState.isActive = props.record.isActive
-        formState.remark = props.record.remark
-      })
+    const editKey = "add";
 
-      const formRules = {
-      };
-
-      const editKey = "add";
-
-      const submit = (e) => {
-        message.loading({
-          content: '提交中...',
-          key: editKey
-        });
-        formRef.value
-          .validate()
-          .then(() => {
-            edit(toRaw(formState)).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: '保存成功',
+    const submit = (e) => {
+      message.loading({
+        content: "提交中...",
+        key: editKey,
+      });
+      formRef.value
+        .validate()
+        .then(() => {
+          edit(toRaw(formState)).then((response) => {
+            if (response.success) {
+              message
+                .success({
+                  content: "保存成功",
                   key: editKey,
-                  duration: 1
-                }).then(() => {
+                  duration: 1,
+                })
+                .then(() => {
                   cancel();
                 });
-              } else {
-                message.success({
-                  content: '保存失败',
+            } else {
+              message
+                .success({
+                  content: "保存失败",
                   key: editKey,
-                  duration: 1
-                }).then(() => {
+                  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 {
+    return {
+      submit,
+      cancel,
+      formRef,
+      formState,
+      formRules,
+      skuCategoryIsActive,
 
-        submit,
-        cancel,
-        formRef,
-        formState,
-        formRules,
-        skuCategoryIsActive,
-
-        labelCol: {
-          span: 8
-        },
-        wrapperCol: {
-          span: 12
-        },
-      };
-    },
-  });
+      labelCol: {
+        span: 8,
+      },
+      wrapperCol: {
+        span: 12,
+      },
+    };
+  },
+});
 </script>
diff --git a/src/view/wms/baseInfo/skuCategory/modal/save.vue b/src/view/wms/baseInfo/skuCategory/modal/save.vue
index 4df5cac..0c5e080 100644
--- a/src/view/wms/baseInfo/skuCategory/modal/save.vue
+++ b/src/view/wms/baseInfo/skuCategory/modal/save.vue
@@ -1,157 +1,215 @@
 <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="categoryCode" label="种类编号" name="categoryCode">
-        <a-input v-model:value="formState.categoryCode" placeholder="请输入种类编号" />
-      </a-form-item>
-      <a-form-item ref="categoryName" label="种类名称" name="categoryName">
-        <a-input v-model:value="formState.categoryName" placeholder="请输入种类名称" />
-      </a-form-item>
-      <a-form-item ref="categoryDesc" label="种类描述" name="categoryDesc">
-        <a-input v-model:value="formState.categoryDesc" placeholder="请输入种类描述" />
-      </a-form-item>
-      <a-form-item ref="treeLevel" label="树层级" name="treeLevel">
-        <a-input v-model:value="formState.treeLevel" placeholder="请输入树层级" />
-      </a-form-item>
-      <a-form-item ref="treeCode" label="树编号" name="treeCode">
-        <a-input v-model:value="formState.treeCode" placeholder="请输入树编号" />
-      </a-form-item>
-      <a-form-item ref="isActive" label="是否有效" name="isActive">
-        <a-select v-model:value="formState.isActive" :options="skuCategoryIsActive" :disabled="false" placeholder="请选择是否有效" />
-      </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="categoryCode" label="种类编号" name="categoryCode">
+            <a-input
+              v-model:value="formState.categoryCode"
+              placeholder="请输入种类编号"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="categoryName" label="种类名称" name="categoryName">
+            <a-input
+              v-model:value="formState.categoryName"
+              placeholder="请输入种类名称"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="categoryDesc" label="种类描述" name="categoryDesc">
+            <a-input
+              v-model:value="formState.categoryDesc"
+              placeholder="请输入种类描述"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="treeLevel" label="树层级" name="treeLevel">
+            <a-input
+              v-model:value="formState.treeLevel"
+              placeholder="请输入树层级"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="treeCode" label="树编号" name="treeCode">
+            <a-input
+              v-model:value="formState.treeCode"
+              placeholder="请输入树编号"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="isActive" label="是否有效" name="isActive">
+            <a-select
+              v-model:value="formState.isActive"
+              :options="skuCategoryIsActive"
+              :disabled="false"
+              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>
   </a-modal>
 </template>
 <script>
-    import {
-    message
-  } from '@hwork/ant-design-vue';
-  import {
-    save
-  } from "@/api/wms/skuCategory";
+import { message } from "@hwork/ant-design-vue";
+import { save } from "@/api/wms/skuCategory";
 
-  import {
-    defineComponent,
-    reactive,
-    ref,
-    toRaw
-  } from "vue";
-  export default defineComponent({
-    props: {
-      visible: {
-        type: Boolean,
+import { defineComponent, reactive, ref, toRaw } from "vue";
+export default defineComponent({
+  props: {
+    visible: {
+      type: Boolean,
+    },
+  },
+  emit: ["close"],
+  setup(props, context) {
+    const formRef = ref();
+
+    const formState = reactive({
+      isActive: "1",
+    });
+
+    const skuCategoryIsActive = ref([
+      {
+        value: "1",
+        label: "是",
       },
-    },
-    emit: ["close"],
-    setup(props, context) {
+    ]);
 
-      const formRef = ref();
+    const formRules = {
+      categoryCode: [
+        {
+          required: true,
+          message: "请输入种类编号",
+          trigger: "blur",
+        },
+      ],
+      categoryName: [
+        {
+          required: true,
+          message: "请输入种类名称",
+          trigger: "blur",
+        },
+      ],
+      categoryDesc: [
+        {
+          required: true,
+          message: "请输入种类描述",
+          trigger: "blur",
+        },
+      ],
+      treeLevel: [
+        {
+          required: true,
+          message: "请输入树层级",
+          trigger: "blur",
+        },
+      ],
+      treeCode: [
+        {
+          required: true,
+          message: "请输入树编号",
+          trigger: "blur",
+        },
+      ],
+      fullTreeCode: [
+        {
+          required: true,
+          message: "请输入全树编号",
+          trigger: "blur",
+        },
+      ],
+      isActive: [
+        {
+          required: true,
+          message: "是否有效",
+          trigger: "blur",
+        },
+      ],
+    };
 
-      const formState = reactive({
-        isActive: "1",
+    const saveKey = "save";
+
+    const submit = (e) => {
+      message.loading({
+        content: "提交中...",
+        key: saveKey,
       });
-
-      const skuCategoryIsActive = ref([{
-        value: '1',
-        label: '是',
-      }]);
-
-      const formRules = {
-        categoryCode: [{
-          required: true,
-          message: '请输入种类编号',
-          trigger: 'blur'
-        }],
-        categoryName: [{
-          required: true,
-          message: '请输入种类名称',
-          trigger: 'blur'
-        }],
-        categoryDesc: [{
-          required: true,
-          message: '请输入种类描述',
-          trigger: 'blur'
-        }],
-        treeLevel: [{
-          required: true,
-          message: '请输入树层级',
-          trigger: 'blur'
-        }],
-        treeCode: [{
-          required: true,
-          message: '请输入树编号',
-          trigger: 'blur'
-        }],
-        fullTreeCode: [{
-          required: true,
-          message: '请输入全树编号',
-          trigger: 'blur'
-        }],
-        isActive: [{
-          required: true,
-          message: '是否有效',
-          trigger: 'blur'
-        }],
-      };
-
-      const saveKey = "save";
-
-      const submit = (e) => {
-        message.loading({
-          content: '提交中...',
-          key: saveKey
-        });
-        formRef.value
-          .validate()
-          .then(() => {
-            save(toRaw(formState)).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: '保存成功',
+      formRef.value
+        .validate()
+        .then(() => {
+          save(toRaw(formState)).then((response) => {
+            if (response.success) {
+              message
+                .success({
+                  content: "保存成功",
                   key: saveKey,
-                  duration: 1
-                }).then(() => {
+                  duration: 1,
+                })
+                .then(() => {
                   cancel();
                 });
-              } else {
-                message.success({
-                  content: '保存失败',
+            } else {
+              message
+                .success({
+                  content: "保存失败",
                   key: saveKey,
-                  duration: 1
-                }).then(() => {
+                  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,
-        skuCategoryIsActive,
+    return {
+      submit,
+      cancel,
+      formRef,
+      formState,
+      formRules,
+      skuCategoryIsActive,
 
-        labelCol: {
-          span: 8
-        },
-        wrapperCol: {
-          span: 12
-        },
-      };
-    },
-  });
+      labelCol: {
+        span: 8,
+      },
+      wrapperCol: {
+        span: 12,
+      },
+    };
+  },
+});
 </script>