From 6c663b92b0078aa89657df22ec188dff65599f04 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 21 十月 2025 17:24:38 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue |  177 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 150 insertions(+), 27 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue"
index 4e275f8..1c695af 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue"
@@ -33,39 +33,162 @@
         const searchFormOptions = ref([
             [
                 { "title": "鎵樼洏鏉$爜", "field": "palletCode", type: "text" },
-                { "title": "鐗╂枡缂栧彿", "field": "materielCode", type: "text" },
-                { "title": "搴撳瓨鐘舵��", "field": "status", type: "select", dataKey: "StockState", data: [] },
-                { "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
-            ],
-            [
-            { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
-                
             ]
         ]);
-        const columns = ref([
-            { field: 'id', title: '搴撳瓨ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
-            { field: 'palletCode', title: '鎵樼洏鏉$爜', type: 'string', width: 110, align: 'left', sort: true, link: true, },
-            { field: 'locationCode', title: '搴撲綅', type: 'string', width: 110, align: 'left' },
-            { field: 'isFull', title: '鏄惁婊$洏', type: 'bool', width: 110, align: 'left' },
-            // { field: 'state', title: '搴撳瓨鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "StockState", data: [] } },
-            { field: 'remark', title: '澶囨敞', type: 'string', width: 120, align: 'left' },
-            { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left' , bind: { key: "ProductionLine", data: [] } },
-            { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'int', sort: true, width: 100, align: 'left' },
-        ]);
-
+        const columns = ref(
+            [{ field: 'id', title: '搴撳瓨ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
+            { field: 'palletCode', title: '鎵樼洏鏉$爜', type: 'string', width: 110, align: 'left', link: true, },
+            { field: 'locationCode', title: '搴撲綅', type: 'string', width: 100, align: 'left', },
+            { field: 'locationStatus', title: '璐т綅鐘舵��', type: 'int', width: 60, align: 'left', bind: { key: "LocationState", data: [] } },
+            { field: 'floor', title: '妤煎眰', type: 'int', width: 60, align: 'left', bind: { key: "Floor", data: [] } },
+            { field: 'areaId', title: '鍖哄煙', type: 'int', width: 60, align: 'left', bind: { key: "AreaType", data: [] } },
+            { field: 'remark', title: '澶囨敞', type: 'string', width: 60, align: 'left', },
+            { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left', hidden: true },
+            { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', },
+            { field: 'modifier', title: '鏈�鍚庝慨鏀逛汉', type: 'string', sort: true, width: 100, hidden: true, align: 'left' },
+            ]
+        );
         const detail = ref({
-            cnName: "缁勭洏鏄庣粏淇℃伅",
-            table: "DtBoxingInfoDetail",
+            cnName: "搴撳瓨鏄庣粏淇℃伅",
+            table: "BoxingInfoDetails",
             columns: [
-                { title: "鐢佃姱搴忓垪鍙�", field: "serialNumber", type: "text"},
-                { title: "鐗╂枡缂栧彿", field: "materielCode",type: "text" },
-                { title: "鐗╂枡鍚嶇О", field: "materielName", type: "text" },
-                { title: "搴撳瓨鐘舵��", field: "status", type: "text" },
-                { title: "缁勭洏鏁伴噺", field: "stockQuantity", type: "text" },
-                { title: "鍒涘缓鏃堕棿", field: "createDate", type: "text" },
+                {
+                    field: "id",
+                    title: "Id",
+                    type: "int",
+                    width: 90,
+                    hidden: true,
+                    readonly: true,
+                    require: true,
+                    align: "left",
+                },
+                {
+                    field: "stockId",
+                    title: "搴撳瓨淇℃伅涓婚敭",
+                    type: "string",
+                    width: 90,
+                    align: "left",
+                    hidden: true,
+                },
+                {
+                    field: "materielCode",
+                    title: "鐗╂枡缂栧彿",
+                    type: "string",
+                    width: 150,
+                    align: "left",
+                },
+                {
+                    field: "materielName",
+                    title: "鐗╂枡鍚嶇О",
+                    type: "string",
+                    width: 150,
+                    align: "left",
+                },
+                {
+                    field: "orderNo",
+                    title: "鍗曟嵁缂栧彿",
+                    type: "decimal",
+                    width: 180,
+                    align: "left",
+                },
+                {
+                    field: "warehouse",
+                    title: "浠撳簱鍚嶇О",
+                    type: "string",
+                    width: 120,
+                    align: "left",
+                },
+                {
+                    field: "quantity",
+                    title: "鏁伴噺",
+                    type: "int",
+                    width: 90,
+                    align: "left",
+                },
+                {
+                    field: "unit",
+                    title: "鍗曚綅",
+                    type: "int",
+                    width: 90,
+                    align: "left",
+                },
+                {
+                    field: "specs",
+                    title: "瑙勬牸",
+                    type: "string",
+                    width: 120,
+                    align: "left",
+                },
+                {
+                    field: "weight",
+                    title: "鍗曢噸",
+                    type: "string",
+                    width: 90,
+                    align: "left",
+                },
+                {
+                    field: "drawingNumber",
+                    title: "鍥惧彿",
+                    type: "string",
+                    width: 120,
+                    align: "left",
+                },
+                {
+                    field: "date",
+                    title: "鏃ユ湡",
+                    type: "string",
+                    width: 120,
+                    align: "left",
+                },
+                {
+                    field: "status",
+                    title: "搴撳瓨鏄庣粏鐘舵��",
+                    type: "string",
+                    width: 120,
+                    align: "left",
+                    hidden:true,
+                },
+                {
+                    field: "creater",
+                    title: "鍒涘缓浜�",
+                    type: "string",
+                    width: 90,
+                    align: "left",
+                },
+                {
+                    field: "createDate",
+                    title: "鍒涘缓鏃堕棿",
+                    type: "datetime",
+                    width: 160,
+                    align: "left",
+                },
+                {
+                    field: "modifier",
+                    title: "淇敼浜�",
+                    type: "string",
+                    width: 100,
+                    align: "left",
+                    hidden:true,
+                },
+                {
+                    field: "modifyDate",
+                    title: "淇敼鏃堕棿",
+                    type: "datetime",
+                    width: 160,
+                    align: "left",
+                    hidden:true,
+                },
+                {
+                    field: "remark",
+                    title: "澶囨敞",
+                    type: "string",
+                    width: 100,
+                    align: "left",
+                    hidden:true,
+                },
             ],
             sortName: "id",
-            key: "BoxingInfoId"
+            key: "id",
         });
         return {
             table,

--
Gitblit v1.9.3