From f5b8c1ae89286dada20ea433ffac84f4c9e72a29 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 06 六月 2025 14:31:25 +0800
Subject: [PATCH] 1

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index 7745c0e..f3952cd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -39,7 +39,13 @@
       const editFormOptions = ref([
         [
         { title: "鎵樼洏缂栧彿", field: "palletCode" },
-          { title: "鐗╂枡绫诲瀷", field: "materialType" },
+        {
+          title: "鐗╂枡绫诲瀷",
+          field: "materialType",
+          type: "select",
+          dataKey: "InventoryMaterialType",
+          data: [],
+        },
           { title: "璐т綅缂栧彿", field: "locationCode" },
           {
           title: "搴撳瓨鐘舵��",
@@ -81,16 +87,17 @@
           dataKey: "InventoryMaterialType",
           data: [],
         },
-          { title: "璐т綅缂栧彿", field: "locationCode" },
-          {
+          { title: "璐т綅缂栧彿", field: "locationCode",type: "like", },
+          
+        ],
+        [
+        {
           title: "搴撳瓨鐘舵��",
           field: "stockStatus",
           type: "selectList",
           dataKey: "stockStatusEmun",
           data: [],
         },
-        ],
-        [
         {
           title: "鐗╂枡鐘舵��",
           field: "wlstatus",
@@ -102,6 +109,10 @@
             field: "id",
             type: "like",
         },
+        ],
+        [
+        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+        { title: "鐢熶骇鏃堕棿", field: "mgeneratetime", type: "datetime" },
         ]
       ]);
       const columns = ref([
@@ -121,7 +132,8 @@
           type: "string",
           width: 90,
           align: "left",
-          DisplayType:"link"
+          DisplayType:"link",
+          sort:true
         },
         {
           field: "palletCode",
@@ -129,7 +141,7 @@
           type: "string",
           width: 90,
           align: "left",
-          DisplayType:"link"
+          sort:true,
         },
         {
           field: "materialType",
@@ -137,6 +149,7 @@
           type: "string",
           width: 150,
           align: "left",
+          sort:true,
           bind: { key: "InventoryMaterialType", data: [] },
         },
         {
@@ -145,7 +158,7 @@
           type: "string",
           width: 150,
           align: "left",
-          
+          sort:true,
         },
         {
           field: "wlstatus",
@@ -153,7 +166,15 @@
           type: "string",
           width: 150,
           align: "left",
+          sort:true,
           bind: { key: "InventoryMaterialStatus", data: [] },
+        },{
+          field: "mgeneratetime",
+          title: "鐢熶骇鏃堕棿",
+          type: "datetime",
+          width: 160,
+          align: "left",
+          sort:true,
         },
         {
           field: "isFull",
@@ -161,6 +182,7 @@
           type: "string",
           width: 150,
           align: "left",
+          sort:true,
           bind: { key: "yesno", data: [] },
         },
         {
@@ -169,6 +191,7 @@
           type: "string",
           width: 150,
           align: "left",
+          sort:true,
           bind: { key: "stockStatusEmun", data: [] },
         },
         {
@@ -177,12 +200,14 @@
           type: "string",
           width: 150,
           align: "left",
+          sort:true,
         },{
           field: "remark",
           title: "澶囨敞",
           type: "string",
           width: 100,
           align: "left",
+          sort:true,
         },
         {
           field: "creater",
@@ -190,6 +215,7 @@
           type: "string",
           width: 90,
           align: "left",
+          sort:true,
         },
         {
           field: "createDate",
@@ -197,13 +223,16 @@
           type: "datetime",
           width: 160,
           align: "left",
+          sort:true,
         },
+        
         {
           field: "modifier",
           title: "淇敼浜�",
           type: "string",
           width: 100,
           align: "left",
+          sort:true,
         },
         {
           field: "modifyDate",
@@ -211,6 +240,7 @@
           type: "datetime",
           width: 160,
           align: "left",
+          sort:true,
         },
         
       ]);

--
Gitblit v1.9.3