From 05c2e8aadb518a6323ff9fe23051fdbd56097221 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期日, 08 十二月 2024 19:46:43 +0800
Subject: [PATCH] 文本日志查看

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue |  157 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 106 insertions(+), 51 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 0adaf93..05cbea5 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"
@@ -38,50 +38,35 @@
       });
       const editFormOptions = ref([
         [
+        { title: "鎵樼洏缂栧彿", field: "palletCode" },
+        {
+          title: "鐗╂枡绫诲瀷",
+          field: "materialType",
+          type: "select",
+          dataKey: "InventoryMaterialType",
+          data: [],
+        },
+          { title: "璐т綅缂栧彿", field: "locationCode" },
           {
-            title: "璁惧缂栧彿",
-            required: true,
-            field: "deviceCode",
-            type: "string",
-          },
-          {
-            title: "璁惧鍚嶇О",
-            required: true,
-            field: "deviceName",
-            type: "string",
-          },
-          {
-            title: "璁惧绫诲瀷",
-            required: true,
-            field: "deviceType",
-            type: "string",
-          },
-          {
-            title: "璁惧鐘舵��",
-            required: true,
-            field: "deviceStatus",
-            type: "string",
-          },
+          title: "搴撳瓨鐘舵��",
+          field: "stockStatus",
+          type: "select",
+          dataKey: "stockStatusEmun",
+          data: [],
+        },
         ],
         [
-          { title: "璁惧IP", required: true, field: "deviceIp", type: "string" },
-          {
-            title: "璁惧绔彛",
-            required: true,
-            field: "devicePort",
-            type: "string",
-          },
-          {
-            title: "PLC绫诲瀷",
-            required: true,
-            field: "devicePlcType",
-            type: "string",
-          },
-          {
-            title: "澶囨敞",
-            field: "deviceRemark",
-            type: "string",
-          },
+        { title: "閲嶉噺", field: "materialweight" },
+        {
+          title: "鐗╂枡鐘舵��",
+          field: "wlstatus",
+          type: "select",
+          dataKey: "InventoryMaterialStatus",
+          data: []
+        },
+        {
+          title: "澶囨敞", field: "Remark"
+        }
         ],
       ]);
       const searchFormFields = ref({
@@ -91,10 +76,39 @@
       });
       const searchFormOptions = ref([
         [
-          { title: "璁惧缂栧彿", field: "deviceCode" },
-          { title: "璁惧绫诲瀷", field: "deviceType" },
-          { title: "璁惧鐘舵��", field: "deviceStatus" },
+          { 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: "wlstatus",
+          type: "selectList",
+          dataKey: "InventoryMaterialStatus",
+          data: [],
+        },
+        { title: "搴撳瓨缂栧彿",
+            field: "id",
+            type: "like",
+        },
+        ]
       ]);
       const columns = ref([
         {
@@ -108,11 +122,28 @@
           align: "left",
         },
         {
+          field: "id",
+          title: "搴撳瓨缂栧彿",
+          type: "string",
+          width: 90,
+          align: "left",
+          DisplayType:"link"
+        },
+        {
           field: "palletCode",
           title: "鎵樼洏缂栧彿",
           type: "string",
           width: 90,
           align: "left",
+          DisplayType:"link"
+        },
+        {
+          field: "materialType",
+          title: "鐗╂枡绫诲瀷",
+          type: "string",
+          width: 150,
+          align: "left",
+          bind: { key: "InventoryMaterialType", data: [] },
         },
         {
           field: "locationCode",
@@ -120,6 +151,15 @@
           type: "string",
           width: 150,
           align: "left",
+          
+        },
+        {
+          field: "wlstatus",
+          title: "鐗╂枡鐘舵��",
+          type: "string",
+          width: 150,
+          align: "left",
+          bind: { key: "InventoryMaterialStatus", data: [] },
         },
         {
           field: "isFull",
@@ -128,6 +168,27 @@
           width: 150,
           align: "left",
           bind: { key: "yesno", data: [] },
+        },
+        {
+          field: "stockStatus",
+          title: "搴撳瓨鐘舵��",
+          type: "string",
+          width: 150,
+          align: "left",
+          bind: { key: "stockStatusEmun", data: [] },
+        },
+        {
+          field: "materialweight",
+          title: "閲嶉噺(鏁伴噺)",
+          type: "string",
+          width: 150,
+          align: "left",
+        },{
+          field: "remark",
+          title: "澶囨敞",
+          type: "string",
+          width: 100,
+          align: "left",
         },
         {
           field: "creater",
@@ -157,13 +218,7 @@
           width: 160,
           align: "left",
         },
-        {
-          field: "remark",
-          title: "澶囨敞",
-          type: "string",
-          width: 100,
-          align: "left",
-        },
+        
       ]);
       const detail = ref({
         cnName: "#detailCnName",

--
Gitblit v1.9.3