From 72390e0230b64cd43fedf0ba8e17aba097568a4a Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 26 六月 2025 16:36:13 +0800
Subject: [PATCH] 1

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue |  106 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 59 insertions(+), 47 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
index b77540a..feb18c9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
@@ -29,8 +29,6 @@
     const editFormFields = ref({
       areaCode: "",
       areaName: "",
-      areaType: "",
-      areaStatus: "",
       warehouseId: "",
       areaDes: "",
     });
@@ -49,37 +47,33 @@
           type: "string",
         },
         {
-          title: "鍖哄煙绫诲瀷",
-          required: true,
-          field: "areaType",
-          type: "string",
-        },
-        {
-          title: "鍖哄煙鐘舵��",
-          required: true,
-          field: "areaStatus",
-          type: "string",
-        },
-      ],
-      [
-        {
           title: "浠撳簱涓婚敭",
           required: true,
           field: "warehouseId",
-          type: "string",
+          type: "select",
+          dataKey: "warehouse",
+          data: [],
+        },
+        
+      ],
+      [
+      {
+          title: "鍖哄煙绫诲瀷",
+          required: true,
+          field: "areaType",
+          type: "int",
         },
         {
           title: "鍖哄煙鎻忚堪",
           field: "areaDes",
           type: "textarea",
         },
+        { title: "鍖哄煙鐘舵��", field: "areaStatus" ,type: "select",dataKey: "enableEnum",data: [],},
       ],
     ]);
     const searchFormFields = ref({
       areaCode: "",
       areaName: "",
-      areaType: "",
-      areaStatus: "",
       warehouseId: "",
       areaDes: "",
     });
@@ -87,10 +81,24 @@
       [
         { title: "鍖哄煙缂栧彿", field: "areaCode", type: "like" },
         { title: "鍖哄煙鍚嶇О", field: "areaName", type: "like" },
-        { title: "鍖哄煙绫诲瀷", field: "areaType", type: "like" },
-        { title: "鍖哄煙鐘舵��", field: "areaStatus", type: "like" },
+        
+        {
+          title: "鍖哄煙鐘舵��",
+          field: "areaStatus",
+          type: "select",
+          dataKey: "enableEnum",
+          data: [],
+        },
       ],
-      [{ title: "浠撳簱涓婚敭", field: "warehouseId", type: "like" }],
+      [
+        {
+          title: "浠撳簱涓婚敭",
+          field: "warehouseId",
+          type: "select",
+          dataKey: "warehouse",
+          data: [],
+        },{ title: "鍖哄煙绫诲瀷", field: "areaType" },
+      ],
     ]);
     const columns = ref([
       {
@@ -104,18 +112,19 @@
         align: "left",
       },
       {
+        field: "areaCode",
+        title: "鍖哄煙缂栧彿",
+        type: "string",
+        width: 80,
+        align: "left",
+      },
+      {
         field: "warehouseId",
         title: "浠撳簱涓婚敭",
         type: "string",
         width: 90,
         align: "left",
-      },
-      {
-        field: "areaCode",
-        title: "鍖哄煙缂栧彿",
-        type: "string",
-        width: 150,
-        align: "left",
+        bind:{ key: "warehouse", data: [] },
       },
       {
         field: "areaName",
@@ -124,25 +133,26 @@
         width: 150,
         align: "left",
       },
-      {
-        field: "areaType",
-        title: "鍖哄煙绫诲瀷",
-        type: "decimal",
-        width: 90,
-        align: "left",
-      },
+      // {
+      //   field: "areaType",
+      //   title: "鍖哄煙绫诲瀷",
+      //   type: "decimal",
+      //   width: 90,
+      //   align: "left",
+      // },
       {
         field: "areaStatus",
         title: "鍖哄煙鐘舵��",
         type: "string",
         width: 90,
         align: "left",
+        bind: { key: "enableEnum", data: [] },
       },
       {
         field: "areaDes",
         title: "鍖哄煙鎻忚堪",
         type: "int",
-        width: 120,
+        width: 160,
         align: "left",
       },
       {
@@ -156,30 +166,32 @@
         field: "createDate",
         title: "鍒涘缓鏃堕棿",
         type: "datetime",
-        width: 160,
+        width: 120,
         align: "left",
+        sort: true,
       },
       {
         field: "modifier",
         title: "淇敼浜�",
         type: "string",
-        width: 100,
+        width: 90,
         align: "left",
       },
       {
         field: "modifyDate",
         title: "淇敼鏃堕棿",
         type: "datetime",
-        width: 160,
+        width: 120,
         align: "left",
+        sort: true,
       },
-      {
-        field: "remark",
-        title: "澶囨敞",
-        type: "string",
-        width: 100,
-        align: "left",
-      },
+      // {
+      //   field: "remark",
+      //   title: "澶囨敞",
+      //   type: "string",
+      //   width: 100,
+      //   align: "left",
+      // },
     ]);
     const detail = ref({
       cnName: "#detailCnName",

--
Gitblit v1.9.3