From 6f01b51fc0770fda7787076caf0314be7a7f6656 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 27 六月 2025 10:58:21 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locMast/locMast.js | 88 +++++++++++++++++--------------------------
1 files changed, 35 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 3e4455b..7fc6049 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -15,35 +15,47 @@
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
even: true,
+ // size: 'sm',
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
{type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
- ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��',width:200}
- ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true, hide:false}
+ ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200, hide:false}
+ ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷',width:200, hide:false}
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鐘舵��',
+ templet: function(d) {
+ // 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
+ if (d.frozen$ === '宸插喕缁�') {
+ return '<span style="color: #34a8de;">' +d.frozen$ + '</span>';
+ } else {
+ return '<span">' +d.frozen$ + '</span>';
+ }
+ }}
+ ,{field: 'frozenMemo', 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: 'lev1', align: 'center',title: '灞�', sort:true}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿', hide:false}
+ ,{field: 'row1', align: 'center',title: '鎺�', sort:true, hide:false}
+ ,{field: 'bay1', align: 'center',title: '鍒�', sort:true, hide:false}
+ ,{field: 'lev1', align: 'center',title: '灞�', sort:true, hide:false}
+ ,{field: 'gro1', align: 'center',title: '缁�', sort:true, hide:false}
,{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+"'";
+ 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}
+ },width:80, hide:false}
// ,{field: 'outEnable', align: 'center',title: ''}
- // ,{field: 'ioTime$', align: 'center',title: ''}
- // ,{field: 'firstTime$', align: 'center',title: ''}
- // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'text-decoration: underline;cursor:pointer'}
- // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
- // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'ioTime$', align: 'center',title: 'ioTime', hide:true}
+ // ,{field: 'firstTime$', align: 'center',title: '', hide:true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
+ ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer', hide:true}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿', hide:true}
// ,{field: 'errorTime$', align: 'center',title: ''}
// ,{field: 'errorMemo', align: 'center',title: ''}
// ,{field: 'ctnKind', align: 'center',title: ''}
@@ -53,6 +65,9 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
+ ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷', hide:true}
+ ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷', hide:true}
+ ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷', hide:true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
@@ -120,12 +135,13 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'locMast_detail.html',
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"});
}
});
@@ -307,42 +323,6 @@
});
}
break;
- case 'locType':
- var param = top.reObject(data).locType;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '搴撲綅璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../basLocType/basLocType_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/basLocType/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- parent.location.href = "/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
case 'modiUser':
var param = top.reObject(data).modiUser;
if (param === undefined) {
@@ -472,6 +452,7 @@
row1: $('#row1').val(),
bay1: $('#bay1').val(),
lev1: $('#lev1').val(),
+ gro1: $('#gro1').val(),
fullPlt: $('#fullPlt').val(),
locType: $('#locType').val(),
outEnable: $('#outEnable').val(),
@@ -490,7 +471,8 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
-
+ frozen: $('#frozen').val(),
+ frozenMemo: $('#frozenMemo').val()
};
$.ajax({
url: baseUrl+"/locMast/"+name+"/auth",
--
Gitblit v1.9.1