From d58196721475e968769d708d9c14f60dd8d5671f Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期四, 13 十一月 2025 22:20:14 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue |  164 +++++++++++++++++++++++-------------------------------
 1 files changed, 70 insertions(+), 94 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index 7ae264a..e29270d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -27,92 +27,80 @@
         sortName: "id",
       });
       const editFormFields = ref({
-        deviceCode: "",
-        deviceName: "",
-        deviceType: "",
-        deviceStatus: "",
-        deviceIp: "",
-        devicePort: "",
-        devicePlcType: "",
-        deviceRemark: "",
+        palletCode: "",
+        palletType: "",
+        locationCode: "",
+        warehouseId: "",
+        stockStatus: "",
+        mesSubPalletCode: "",
+        remark: "",
       });
       const editFormOptions = ref([
         [
         { title: "鎵樼洏缂栧彿", field: "palletCode" },
         {
-          title: "鐗╂枡绫诲瀷",
-          field: "materialType",
-          type: "select",
-          dataKey: "InventoryMaterialType",
-          data: [],
-        },
-          { title: "璐т綅缂栧彿", field: "locationCode" },
-          {
           title: "搴撳瓨鐘舵��",
           field: "stockStatus",
           type: "select",
           dataKey: "stockStatusEmun",
           data: [],
         },
+        { title: "璐т綅缂栧彿", field: "locationCode" },
         ],
         [
-        { title: "閲嶉噺", field: "materialweight" },
         {
-          title: "鐗╂枡鐘舵��",
-          field: "wlstatus",
+          title: "鎵樼洏绫诲瀷",
+          field: "palletType",
           type: "select",
-          dataKey: "InventoryMaterialStatus",
-          data: []
+          dataKey: "InventoryMaterialType",
+          data: [],
         },
+        { title: "浠撳簱涓婚敭", field: "warehouseId", type: "int" },
+        { title: "瀛愭墭鐩樼紪鍙�", field: "mesSubPalletCode" },
+        ],
+        [
         {
-          title: "澶囨敞", field: "Remark"
+          title: "澶囨敞", field: "remark"
         }
         ],
       ]);
       const searchFormFields = ref({
-        deviceCode: "",
-        deviceType: "",
-        deviceStatus: "",
+        palletCode: "",
+        locationCode: "",
+        stockStatus: "",
+        warehouseId: "",
+        palletType: "",
+        mesSubPalletCode: "",
+        creater: "",
+        createDate: "",
       });
       const searchFormOptions = ref([
         [
-          { title: "鎵樼洏缂栧彿",
-            field: "palletCode",
-            type: "like",
-        },
+          { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
           {
-          title: "鐗╂枡绫诲瀷",
-          field: "materialType",
-          type: "select",
-          dataKey: "InventoryMaterialType",
-          data: [],
-        },
-          { title: "璐т綅缂栧彿", field: "locationCode",type: "like", },
-          
+            title: "搴撳瓨鐘舵��",
+            field: "stockStatus",
+            type: "selectList",
+            dataKey: "stockStatusEmun",
+            data: [],
+          },
+          { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+          { title: "搴撳瓨缂栧彿", field: "id", 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: "palletType",
+            type: "selectList",
+            dataKey: "InventoryMaterialType",
+            data: [],
+          },
+          { title: "浠撳簱涓婚敭", field: "warehouseId", type: "int" },
+          { title: "瀛愭墭鐩樼紪鍙�", field: "mesSubPalletCode", type: "like" },
         ],
         [
-        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
-        { title: "鐢熶骇鏃堕棿", field: "mgeneratetime", type: "datetime" },
+          { title: "鍒涘缓浜�", field: "creater", type: "like" },
+          { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
         ]
       ]);
       const columns = ref([
@@ -129,11 +117,10 @@
         {
           field: "id",
           title: "搴撳瓨缂栧彿",
-          type: "string",
+          type: "int",
           width: 90,
           align: "left",
-          DisplayType:"link",
-        
+          DisplayType: "link",
         },
         {
           field: "palletCode",
@@ -144,12 +131,11 @@
           //sort:true,
         },
         {
-          field: "materialType",
-          title: "鐗╂枡绫诲瀷",
-          type: "string",
-          width: 150,
+          field: "palletType",
+          title: "鎵樼洏绫诲瀷",
+          type: "int",
+          width: 100,
           align: "left",
-          //sort:true,
           bind: { key: "InventoryMaterialType", data: [] },
         },
         {
@@ -161,47 +147,37 @@
           //sort:true,
         },
         {
-          field: "wlstatus",
-          title: "鐗╂枡鐘舵��",
-          type: "string",
-          width: 150,
+          field: "warehouseId",
+          title: "浠撳簱涓婚敭",
+          type: "int",
+          width: 100,
           align: "left",
-         // sort:true,
-          bind: { key: "InventoryMaterialStatus", data: [] },
-        },{
-          field: "mgeneratetime",
-          title: "鐢熶骇鏃堕棿",
-          type: "datetime",
-          width: 160,
-          align: "left",
-         // sort:true,
-        },
-        {
-          field: "isFull",
-          title: "鏄惁婊$洏",
-          type: "string",
-          width: 150,
-          align: "left",
-         // sort:true,
-          bind: { key: "yesno", data: [] },
+          hidden: true,
         },
         {
           field: "stockStatus",
           title: "搴撳瓨鐘舵��",
-          type: "string",
+          type: "int",
           width: 150,
           align: "left",
-         // sort:true,
           bind: { key: "stockStatusEmun", data: [] },
         },
         {
-          field: "materialweight",
-          title: "閲嶉噺(鏁伴噺)",
+          field: "mesSubPalletCode",
+          title: "瀛愭墭鐩樼紪鍙�",
           type: "string",
-          width: 150,
+          width: 120,
           align: "left",
-        //  sort:true,
-        },{
+        },
+        {
+          field: "details",
+          title: "搴撳瓨鏄庣粏",
+          type: "string",
+          width: 100,
+          align: "left",
+          hidden: true,
+        },
+        {
           field: "remark",
           title: "澶囨敞",
           type: "string",

--
Gitblit v1.9.3