From b392ca2326ddefda33845611f9c7499d0fd6fcef Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期六, 29 十月 2022 15:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/bfasrs' into bfasrs
---
src/main/webapp/static/js/locDetlGroup/locDetlGroup.js | 322 +++++++++++++++++++++++++++--------------------------
1 files changed, 165 insertions(+), 157 deletions(-)
diff --git a/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js b/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
index bcee2fc..af9eb14 100644
--- a/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
+++ b/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
@@ -1,13 +1,16 @@
var pageCurr;
+
function getCol() {
var cols = [
- {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', sort:true}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
-
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
-
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ {field: 'matnr', align: 'center', title: '鐗╂枡鍙�', sort: true}
+ , {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О', sort: true}
+ , {field: 'specs', align: 'center', title: '瑙勬牸'}
+ , {field: 'batch', align: 'center', title: '鎵瑰彿', width: 300, sort: true}
+ , {field: 'storeMax', align: 'center', title: '鏁伴噺涓婇檺', sort: true}
+ , {field: 'storeMin', align: 'center', title: '鏁伴噺涓嬮檺', sort: true}
+ , {field: 'storeMaxDate', align: 'center', title: '搴撻緞涓婇檺', sort: true}
+ , {field: 'anfme', align: 'center', title: '瀹為檯鏁伴噺'}
+ , {field: 'nowTime', align: 'center', title: '瀹為檯搴撻緞'}
];
@@ -15,7 +18,7 @@
return cols;
}
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -26,7 +29,7 @@
tableIns = table.render({
elem: '#locDetl',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/locDetl/grouplist/auth',
+ url: baseUrl + '/locDetl/grouplist/auth',
page: true,
limit: 20,
limits: [20, 30, 50, 100, 200, 500],
@@ -49,17 +52,17 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
+ var _index = $(data.elem).attr('table-index') || 0;
+ if (data.elem.checked) {
res.data[_index][data.value] = 'Y';
- }else{
+ } else {
res.data[_index][data.value] = 'N';
}
});
@@ -69,7 +72,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(locDetl)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
@@ -81,9 +84,9 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -92,7 +95,7 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(locDetl)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
+ switch (obj.event) {
case 'addData':
layer.open({
type: 2,
@@ -101,10 +104,11 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
content: 'locDetl_detail.html',
- success: function(layero, index){
+ success: function (layero, index) {
layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);
+ layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
}
});
break;
@@ -118,22 +122,22 @@
break;
case 'deleteData':
var data = checkStatus.data;
- if (data.length === 0){
+ if (data.length === 0) {
layer.msg('璇烽�夋嫨鏁版嵁');
} else {
- layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ layer.confirm('纭畾鍒犻櫎' + (data.length === 1 ? '姝�' : data.length) + '鏉℃暟鎹悧', function () {
$.ajax({
- url: baseUrl+"/locDetl/delete/auth",
+ url: baseUrl + "/locDetl/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
- traditional:true,
+ traditional: true,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
layer.closeAll();
tableReload(false);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -143,9 +147,9 @@
}
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
obj.config.cols[0].map(function (col) {
if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
titles.push(col.title);
@@ -153,7 +157,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -162,19 +166,19 @@
};
var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/locDetl/export/auth",
+ url: baseUrl + "/locDetl/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.close(loadIndex);
layer.closeAll();
if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -186,7 +190,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(locDetl)', function(obj){
+ table.on('tool(locDetl)', function (obj) {
var data = obj.data;
switch (obj.event) {
// 璇︽儏
@@ -198,11 +202,12 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
content: 'locDetl_detail.html',
- success: function(layero, index){
+ success: function (layero, index) {
setFormVal(layer.getChildFrame('#detail', index), 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"});
+ 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');
}
@@ -217,12 +222,13 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
content: 'locDetl_detail.html',
- success: function(layero, index){
+ success: function (layero, index) {
layer.getChildFrame('#data-detail-submit-save', index).hide();
setFormVal(layer.getChildFrame('#detail', index), data, false);
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
top.convertDisabled(layer.getChildFrame('#locNo,#matnr', index), true);
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ 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');
}
@@ -233,35 +239,36 @@
if (param === undefined) {
layer.msg("鏃犳暟鎹�");
} else {
- layer.open({
- type: 2,
- title: '搴撲綅鍙疯鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../locMast/locMast_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/locMast/"+ 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)
- }
- }
- })
- }
- });
+ layer.open({
+ type: 2,
+ title: '搴撲綅鍙疯鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../locMast/locMast_detail.html',
+ success: function (layero, index) {
+ $.ajax({
+ url: baseUrl + "/locMast/" + 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':
@@ -269,35 +276,36 @@
if (param === undefined) {
layer.msg("鏃犳暟鎹�");
} else {
- layer.open({
- type: 2,
- title: '淇敼浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/user/"+ 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)
- }
- }
- })
- }
- });
+ layer.open({
+ type: 2,
+ title: '淇敼浜哄憳璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function (layero, index) {
+ $.ajax({
+ url: baseUrl + "/user/" + 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 'appeUser':
@@ -305,35 +313,36 @@
if (param === undefined) {
layer.msg("鏃犳暟鎹�");
} else {
- layer.open({
- type: 2,
- title: '鍒涘缓鑰呰鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/user/"+ 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)
- }
- }
- })
- }
- });
+ layer.open({
+ type: 2,
+ title: '鍒涘缓鑰呰鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function (layero, index) {
+ $.ajax({
+ url: baseUrl + "/user/" + 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;
@@ -342,7 +351,7 @@
// 鏁版嵁淇濆瓨鍔ㄤ綔
form.on('submit(save)', function () {
- if (banMsg != null){
+ if (banMsg != null) {
layer.msg(banMsg);
return;
}
@@ -354,9 +363,9 @@
method("update")
});
- function method(name){
+ function method(name) {
var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ shade: [0.5, '#000'] //0.1閫忔槑搴︾殑鑳屾櫙
});
var data = {
// id: $('#id').val(),
@@ -380,20 +389,20 @@
};
$.ajax({
- url: baseUrl+"/locDetl/"+name+"/auth",
+ url: baseUrl + "/locDetl/" + name + "/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
parent.layer.closeAll();
parent.$(".layui-laypage-btn")[0].click();
$("#data-detail :input").each(function () {
$(this).val("");
});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg)
}
layer.close(index);
@@ -439,9 +448,9 @@
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit(child);
}
@@ -462,14 +471,13 @@
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
function tableReload(child) {
- var searchData = {
- };
- $.each($('#search-box [name]').serializeArray(), function() {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
(child ? parent.tableIns : tableIns).reload({
@@ -479,14 +487,14 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
where: searchData,
page: {
- curr: pageCurr-1
+ curr: pageCurr - 1
}
});
pageCurr -= 1;
@@ -499,10 +507,10 @@
function setFormVal(el, data, showImg) {
for (var val in data) {
var find = el.find(":input[id='" + val + "']");
- if (find[0]!=null){
- if (find[0].type === 'checkbox'){
- if (data[val]==='Y'){
- find.attr("checked","checked");
+ if (find[0] != null) {
+ if (find[0].type === 'checkbox') {
+ if (data[val] === 'Y') {
+ find.attr("checked", "checked");
find.val('Y');
} else {
find.remove("checked");
@@ -512,9 +520,9 @@
}
}
find.val(data[val]);
- if (showImg){
+ if (showImg) {
var next = find.next();
- if (next.get(0)){
+ if (next.get(0)) {
if (next.get(0).localName === "img") {
find.hide();
next.attr("src", data[val]);
@@ -534,13 +542,13 @@
function detailScreen(index) {
var detail = layer.getChildFrame('#data-detail', index);
- var height = detail.height()+60;
- if (height > ($(window).height()*0.9)) {
- height = ($(window).height()*0.8);
+ var height = detail.height() + 60;
+ if (height > ($(window).height() * 0.9)) {
+ height = ($(window).height() * 0.8);
}
layer.style(index, {
// top: (($(window).height()-height)/3)+"px",
- height: height+'px'
+ height: height + 'px'
});
}
--
Gitblit v1.9.1