From b931c44bee33ccae4d14594a6419bcf0a26b29dd Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 24 一月 2024 09:39:50 +0800
Subject: [PATCH] 修复Loc_mast导出问题
---
src/main/webapp/static/js/locMast/locMast.js | 90 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index a7a5278..5e365cc 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: [[
@@ -22,25 +23,30 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
- ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'fireStatus$', align: 'center',title: '娑堥槻鐘舵��', hide:false}
+ ,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', hide:false}
+ ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'locType2$', align: 'center',title: '娴嬭瘯璁惧鍙�'}
+ ,{field: 'freeze$', align: 'center',title: '鍐荤粨鐘舵��'}
+ // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'pltType', align: 'center',title: ''}
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'row1', align: 'center',title: '鎺�'}
- ,{field: 'bay1', align: 'center',title: '鍒�'}
+ // ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'row1', align: 'center',title: '鎺�', sort:true}
+ ,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
,{field: 'lev1', 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' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.fullPlt === 'Y'){html += " checked ";}
- html += ">";
- return html;
- },width:80}
+ // ,{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 ";}
+ // html += ">";
+ // return html;
+ // },width:80}
// ,{field: 'outEnable', align: 'center',title: ''}
// ,{field: 'ioTime$', align: 'center',title: ''}
// ,{field: 'firstTime$', align: 'center',title: ''}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'ctnKind', align: 'center',title: '鍚姩鎸夐挳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
@@ -53,6 +59,9 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{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: '杞婚噸绫诲瀷'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
@@ -126,6 +135,7 @@
success: function(layero, index){
layer.getChildFrame('#data-detail-submit-edit', index).hide();
clearFormVal(layer.getChildFrame('#detail', index));
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
}
});
@@ -223,6 +233,58 @@
layer.close(idx);
})
});
+ break;
+ case 'disableALL':
+ var data = checkStatus.data;
+ if (data.length !=8 ){
+ layer.msg('璇烽�夋嫨姝よ澶囨墍鏈夋暟鎹啀杩涜绂佺敤鎿嶄綔');
+ } else {
+ layer.confirm('纭畾绂佺敤'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/locMast/disableALL/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'openAll':
+ var data = checkStatus.data;
+ if (data.length !=8 ){
+ layer.msg('璇烽�夋嫨姝よ澶囨墍鏈夋暟鎹啀杩涜鍚敤鎿嶄綔');
+ } else {
+ layer.confirm('纭畾鍚敤'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/locMast/openAll/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
break;
}
});
@@ -431,6 +493,7 @@
pltType: $('#pltType').val(),
ctnType: $('#ctnType').val(),
locSts: $('#locSts').val(),
+ locType1: $('#loc_type1').val(),
sheetNo: $('#sheetNo').val(),
crnNo: $('#crnNo').val(),
row1: $('#row1').val(),
@@ -454,7 +517,10 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
-
+ fireNo: $('#fireNo').val(),
+ fireStatus: $('#fireStatus').val(),
+ packStatus: $('#packStatus').val(),
+ freeze: $('#freeze').val(),
};
$.ajax({
url: baseUrl+"/locMast/"+name+"/auth",
--
Gitblit v1.9.1