From 07b56c461476f7d580318749b2cd5f752aa38f3a Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期四, 11 十二月 2025 17:22:00 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue |   65 ++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 25 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue"
index 3318e6e..b4ee2eb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue"
@@ -25,7 +25,10 @@
             sortName: "createDate"
         });
         const editFormFields = ref({
-
+            palletCode: "",
+            locationCode: "",
+            stockStatus: "",
+            remark: ""
         });
         const editFormOptions = ref([
 
@@ -39,24 +42,26 @@
             ], [
                 { "title": "搴撲綅鍙�", "field": "locationCode", type: "text" },
                 { "title": "璐т綅鐘舵��", "field": "locationStatus", type: "select", dataKey: "LocationState", data: [] },
-                { "title": "鍖哄煙", "field": "areaId", type: "select", dataKey: "AreaType", data: []},
+                { "title": "鍖哄煙", "field": "areaId", type: "select", dataKey: "AreaType", data: [] },
             ]
             , [
                 { "title": "鐗╂枡缂栫爜", "field": "materielCode", type: "text" },
+                { "title": "鐗╂枡鍚嶇О", "field": "materielName", type: "text" },
             ]
         ]);
         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: 120, align: 'left', bind: { key: "AreaType", data: [] } },
-            { field: 'stockStatus', title: '搴撳瓨鐘舵��', type: 'int', width: 90, align: 'left', bind: { key: "StockStateEmun", 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,  align: 'left' },
+            [
+                { 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: 120, align: 'left', bind: { key: "AreaType", data: [] } },
+                { field: 'stockStatus', title: '搴撳瓨鐘舵��', type: 'int', width: 90, align: 'left', bind: { key: "StockStateEmun", data: [] } },
+                { field: 'remark', title: '澶囨敞', type: 'string', width: 60, align: 'left', hidden: true },
+                { 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, align: 'left' },
             ]
         );
         const detail = ref({
@@ -126,6 +131,23 @@
                     required: true,
                 },
                 {
+                    field: "allocateWarehouse",
+                    title: "璋冩嫧浠撳簱",
+                    type: "string",
+                    width: 150,
+                    align: "left",
+                    edit: { type: "select" },
+                    required: true,
+                    bind: { key: "WareAreaType", data: [] }
+                },
+                {
+                    field: "remark",
+                    title: "澶囨敞",
+                    type: "string",
+                    width: 100,
+                    align: "left",
+                },
+                {
                     field: "unit",
                     title: "鍗曚綅",
                     type: "int",
@@ -159,6 +181,7 @@
                     type: "string",
                     width: 120,
                     align: "left",
+                    hidden: true
                 },
                 {
                     field: "status",
@@ -166,7 +189,7 @@
                     type: "string",
                     width: 120,
                     align: "left",
-                    hidden:true,
+                    hidden: true,
                 },
                 {
                     field: "creater",
@@ -188,7 +211,7 @@
                     type: "string",
                     width: 100,
                     align: "left",
-                    hidden:true,
+                    hidden: true,
                 },
                 {
                     field: "modifyDate",
@@ -196,16 +219,8 @@
                     type: "datetime",
                     width: 160,
                     align: "left",
-                    hidden:true,
-                },
-                {
-                    field: "remark",
-                    title: "澶囨敞",
-                    type: "string",
-                    width: 100,
-                    align: "left",
-                    hidden:true,
-                },
+                    hidden: true,
+                }
             ],
             sortName: "id",
             key: "id",

--
Gitblit v1.9.3