Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/ZhongH...

qinchulong

2025-05-27 c020f31a67fc5aa5644511bddff075f7ecc85234

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue

@@ -29,7 +29,6 @@
    const editFormFields = ref({
      areaCode: "",
      areaName: "",

      warehouseId: "",
      areaDes: "",
    });
@@ -55,11 +54,7 @@
          dataKey: "warehouse",
          data: [],
        },
        {
          title: "区域描述",
          field: "areaDes",
          type: "textarea",
        },{ title: "区域状态", field: "areaStatus" ,type: "select",dataKey: "enableEnum",data: [],},
        
      ],
      [
      {
@@ -68,6 +63,12 @@
          field: "areaType",
          type: "int",
        },
        {
          title: "区域描述",
          field: "areaDes",
          type: "textarea",
        },
        { title: "区域状态", field: "areaStatus" ,type: "select",dataKey: "enableEnum",data: [],},
      ],
    ]);
    const searchFormFields = ref({
@@ -80,7 +81,7 @@
      [
        { title: "区域编号", field: "areaCode", type: "like" },
        { title: "区域名称", field: "areaName", type: "like" },
        { title: "区域类型", field: "areaType" },
        
        {
          title: "区域状态",
          field: "areaStatus",
@@ -96,7 +97,7 @@
          type: "select",
          dataKey: "warehouse",
          data: [],
        },
        },{ title: "区域类型", field: "areaType" },
      ],
    ]);
    const columns = ref([
@@ -111,19 +112,19 @@
        align: "left",
      },
      {
        field: "areaCode",
        title: "区域编号",
        type: "string",
        width: 80,
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库主键",
        type: "string",
        width: 90,
        align: "left",
        bind:{ key: "warehouse", data: [] },
      },
      {
        field: "areaCode",
        title: "区域编号",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "areaName",
@@ -167,6 +168,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "modifier",
@@ -181,6 +183,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "remark",