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 | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 2c8959e..9197a35 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -15,6 +15,7 @@
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
even: true,
+ // size: 'sm',
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
@@ -31,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 ";}
@@ -54,8 +57,8 @@
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
- ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
- ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
+ // ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
+ // ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
@@ -416,14 +419,17 @@
layer.msg(banMsg);
return;
}
- method("add");
+ method("/locMast/add/auth");
});
// 鏁版嵁淇敼鍔ㄤ綔
form.on('submit(edit)', function () {
- method("update")
+ method("/locMast/update/auth")
});
-
+ // 淇敼鍚堝悓鍙峰姩浣�
+ form.on('submit(pakoutPreview)', function () {
+ method("/locDetl/updateBatch/auth")
+ });
function method(name){
var index = layer.load(1, {
shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
@@ -458,10 +464,17 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
+ batch: $('#batch').val(),
+ anfme: $('#anfme').val(),
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
+ zpallet: $('#zpallet').val(),
+ specs: $('#specs').val(),
+ sku: $('#sku').val(),
};
$.ajax({
- url: baseUrl+"/locMast/"+name+"/auth",
+ url: baseUrl+name,
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
@@ -474,6 +487,10 @@
});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
+ }else if (res.code===201){
+ layer.msg(res.msg);
+ parent.layer.closeAll();
+ parent.parent.layer.closeAll();
}else {
layer.msg(res.msg)
}
--
Gitblit v1.9.1