From 57c109f4c962659e7a8f17ef4cd6b00a551e30ad Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 31 三月 2025 15:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lfdasrs-sxkVersion' into lfdasrs-sxkVersion

---
 src/main/webapp/static/js/locMast/locMast.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 054a10d..9197a35 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -32,6 +32,8 @@
             ,{field: 'row1', align: 'center',title: '鎺�', sort:true}
             ,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
             ,{field: 'lev1', align: 'center',title: '灞�', sort:true}
+            ,{field: 'group1', align: 'center',title: '缁�', sort:true}
+            ,{field: 'locAttribute', align: 'center',title: '娣辨祬搴撲綅鍙�', sort:true}
             ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
                     var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' disabled table-index='"+row.LAY_TABLE_INDEX+"'";
                     if(row.fullPlt === 'Y'){html += " checked ";}
@@ -424,7 +426,7 @@
     form.on('submit(edit)', function () {
         method("/locMast/update/auth")
     });
-    // 鏁版嵁淇敼鍔ㄤ綔
+    // 淇敼鍚堝悓鍙峰姩浣�
     form.on('submit(pakoutPreview)', function () {
         method("/locDetl/updateBatch/auth")
     });
@@ -468,6 +470,7 @@
             maktx: $('#maktx').val(),
             zpallet: $('#zpallet').val(),
             specs: $('#specs').val(),
+            sku: $('#sku').val(),
 
         };
         $.ajax({

--
Gitblit v1.9.1