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 |  108 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 90 insertions(+), 18 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 55e328b..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: "搴撳瓨鐘舵��",
@@ -50,7 +56,17 @@
         },
         ],
         [
-        { title: "閲嶉噺(鏁伴噺)", field: "materialweight" },
+        { title: "閲嶉噺", field: "materialweight" },
+        {
+          title: "鐗╂枡鐘舵��",
+          field: "wlstatus",
+          type: "select",
+          dataKey: "InventoryMaterialStatus",
+          data: []
+        },
+        {
+          title: "澶囨敞", field: "Remark"
+        }
         ],
       ]);
       const searchFormFields = ref({
@@ -60,24 +76,44 @@
       });
       const searchFormOptions = ref([
         [
-          { title: "鎵樼洏缂栧彿", field: "palletCode",displayType: "Contains"
-},
+          { title: "鎵樼洏缂栧彿",
+            field: "palletCode",
+            type: "like",
+        },
           {
-          title: "搴撳瓨鐘舵��",
+          title: "鐗╂枡绫诲瀷",
           field: "materialType",
-          type: "selectList",
-          dataKey: "inventoryMaterialType",
+          type: "select",
+          dataKey: "InventoryMaterialType",
           data: [],
         },
-          { title: "璐т綅缂栧彿", field: "locationCode" },
-          {
+          { title: "璐т綅缂栧彿", field: "locationCode",type: "like", },
+          
+        ],
+        [
+        {
           title: "搴撳瓨鐘舵��",
           field: "stockStatus",
           type: "selectList",
           dataKey: "stockStatusEmun",
           data: [],
         },
+        {
+          title: "鐗╂枡鐘舵��",
+          field: "wlstatus",
+          type: "selectList",
+          dataKey: "InventoryMaterialStatus",
+          data: [],
+        },
+        { title: "搴撳瓨缂栧彿",
+            field: "id",
+            type: "like",
+        },
         ],
+        [
+        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+        { title: "鐢熶骇鏃堕棿", field: "mgeneratetime", type: "datetime" },
+        ]
       ]);
       const columns = ref([
         {
@@ -91,11 +127,21 @@
           align: "left",
         },
         {
+          field: "id",
+          title: "搴撳瓨缂栧彿",
+          type: "string",
+          width: 90,
+          align: "left",
+          DisplayType:"link",
+          sort:true
+        },
+        {
           field: "palletCode",
           title: "鎵樼洏缂栧彿",
           type: "string",
           width: 90,
           align: "left",
+          sort:true,
         },
         {
           field: "materialType",
@@ -103,7 +149,8 @@
           type: "string",
           width: 150,
           align: "left",
-          bind: { key: "inventoryMaterialType", data: [] },
+          sort:true,
+          bind: { key: "InventoryMaterialType", data: [] },
         },
         {
           field: "locationCode",
@@ -111,7 +158,23 @@
           type: "string",
           width: 150,
           align: "left",
-          
+          sort:true,
+        },
+        {
+          field: "wlstatus",
+          title: "鐗╂枡鐘舵��",
+          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",
@@ -119,6 +182,7 @@
           type: "string",
           width: 150,
           align: "left",
+          sort:true,
           bind: { key: "yesno", data: [] },
         },
         {
@@ -127,6 +191,7 @@
           type: "string",
           width: 150,
           align: "left",
+          sort:true,
           bind: { key: "stockStatusEmun", data: [] },
         },
         {
@@ -135,6 +200,14 @@
           type: "string",
           width: 150,
           align: "left",
+          sort:true,
+        },{
+          field: "remark",
+          title: "澶囨敞",
+          type: "string",
+          width: 100,
+          align: "left",
+          sort:true,
         },
         {
           field: "creater",
@@ -142,6 +215,7 @@
           type: "string",
           width: 90,
           align: "left",
+          sort:true,
         },
         {
           field: "createDate",
@@ -149,13 +223,16 @@
           type: "datetime",
           width: 160,
           align: "left",
+          sort:true,
         },
+        
         {
           field: "modifier",
           title: "淇敼浜�",
           type: "string",
           width: 100,
           align: "left",
+          sort:true,
         },
         {
           field: "modifyDate",
@@ -163,14 +240,9 @@
           type: "datetime",
           width: 160,
           align: "left",
+          sort:true,
         },
-        {
-          field: "remark",
-          title: "澶囨敞",
-          type: "string",
-          width: 100,
-          align: "left",
-        },
+        
       ]);
       const detail = ref({
         cnName: "#detailCnName",

--
Gitblit v1.9.3