From 74fd6eb7fb0322078f7946f51073f20e90231df1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 01 四月 2025 11:54:00 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkMast/wrkMast.js | 378 +++++++++++++++++------------------------------------
1 files changed, 124 insertions(+), 254 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index bdb6c00..3e69eca 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -13,23 +13,27 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/wrkMast/list/auth',
page: true,
- limit: 10,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true,event: 'detlShow'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true,event: 'detlShow', width:200}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��',event: 'detlShow', width:150}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�',event: 'detlShow', width:150}
- ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�',event: 'detlShow'}
- ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�',event: 'detlShow'}
- ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯',event: 'detlShow'}
- ,{field: 'staNo$', align: 'center',title: '鐩爣绔�',event: 'detlShow'}
- ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�',event: 'detlShow', width:100}
- ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅',event: 'detlShow', width:100}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜',event: 'detlShow'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+ ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
+ ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
+ ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
+ ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
+ ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'sheetNo$', align: 'center',title: '缈昏浆', hide: false}
+ ,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
+ ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
// var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
// if(row.picking === 'Y'){html += " checked ";}
@@ -52,8 +56,8 @@
// ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'refIotime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
- // // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
- // // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
//
// ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
@@ -63,7 +67,7 @@
// return html;
// }}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:130}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
]],
request: {
pageName: 'curr',
@@ -82,7 +86,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -112,7 +116,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -134,30 +138,25 @@
ioPri: track.ioPri
});
});
- if (list.length === 0){
- layer.msg('璇烽�夋嫨鏁版嵁');
- } else {
- layer.confirm('纭畾澧炲姞'+(list.length===1?'姝�':list.length)+'鏉℃暟鎹殑浼樺厛绾у悧', function(){
- $.ajax({
- url: baseUrl+"/wrkMast/add/pri/auth",
- headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
- data: JSON.stringify(list),
- method: 'POST',
- traditional:true,
- success: function (res) {
- layer.closeAll();
- if (res.code === 200){
- $(".layui-laypage-btn")[0].click();
- } else if (res.code === 403){
- top.location.href = baseUrl;
- } else {
- layer.msg(res.msg)
- }
- }
- })
- });
- }
+ $.ajax({
+ url: baseUrl+"/wrkMast/add/pri/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(list),
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200){
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
break;
// 闄嶄綆浼樺厛绾�
case 'priRed':
@@ -169,30 +168,25 @@
ioPri: track.ioPri
});
});
- if (list.length === 0){
- layer.msg('璇烽�夋嫨鏁版嵁');
- } else {
- layer.confirm('纭畾闄嶄綆'+(list.length===1?'姝�':list.length)+'鏉℃暟鎹殑浼樺厛绾у悧', function(){
- $.ajax({
- url: baseUrl+"/wrkMast/red/pri/auth",
- headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
- data: JSON.stringify(list),
- method: 'POST',
- traditional:true,
- success: function (res) {
- layer.closeAll();
- if (res.code === 200){
- $(".layui-laypage-btn")[0].click();
- } else if (res.code === 403){
- top.location.href = baseUrl;
- } else {
- layer.msg(res.msg)
- }
- }
- })
- });
- }
+ $.ajax({
+ url: baseUrl+"/wrkMast/red/pri/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(list),
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200){
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
break;
case 'addData':
layer.open({
@@ -226,7 +220,7 @@
layer.closeAll();
tableReload(false);
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -236,7 +230,7 @@
}
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -265,7 +259,7 @@
if (res.code === 200) {
table.exportFile(titles,res.data,'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -278,9 +272,9 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(wrkMast)', function(obj){
- var data = obj.data;
+ let data = obj.data;
switch (obj.event) {
- // 鏄庣粏灞曠ず todo
+ // 鏄庣粏灞曠ず
case 'detlShow':
wrkNo = data.wrkNo;
// 琛ㄦ牸涓嬫柟鏄剧ず
@@ -297,191 +291,61 @@
}
});
break;
- // 璇︽儏
- case 'detail':
- layer.open({
- type: 2,
- title: '璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'wrkMast_detail.html',
- 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();
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- layer.getChildFrame('##dealDownLine', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
+ // 瀹屾垚
+ case 'complete':
+ layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+
});
break;
- // 缂栬緫
- case 'edit':
- layer.open({
- type: 2,
- title: '淇敼',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'wrkMast_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#crnStrTime\\$,#crnEndTime\\$,#refIotime\\$,#ioTime\\$', index).parent().parent().hide();
- 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('#wrkNo', index), true);
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- layer.getChildFrame('##dealDownLine', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
+ // 鍙栨秷
+ case 'cancel':
+ if (data.pdcType === "Y") {
+ layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ } else {
+ layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ }
+ break;
+ // 鎷ｆ枡鍏ュ簱
+ case 'pick':
+ layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
});
break;
- case 'locNo':
- var param = top.reObject(data).locNo;
- if (param === undefined || (param+"").trim() === '') {
- 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)
- }
- }
- })
- }
- });
- }
+ // 鍏堝叆鍝�
+ case 'preHave':
+ layer.confirm('浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg, {icon: 1});
+ })
+ layer.closeAll();
+ });
break;
- case 'staNo':
- var param = top.reObject(data).staNo;
- if (param === undefined || (param+"").trim() === '') {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '鐩鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../basDevp/basDevp_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/basDevp/"+ 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 'sourceStaNo':
- var param = top.reObject(data).sourceStaNo;
- if (param === undefined || (param+"").trim() === '') {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../basDevp/basDevp_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/basDevp/"+ 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 'sourceLocNo':
- var param = top.reObject(data).sourceLocNo;
- if (param === undefined || (param+"").trim() === '') {
- 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)
- }
- }
- })
- }
- });
- }
+ // 绌烘搷浣�
+ case 'takeNone':
+ layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ });
break;
}
});
@@ -575,7 +439,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -658,6 +522,11 @@
elem: '#logErrTime\\$',
type: 'datetime'
});
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
var pageCur;
function locDetl(param){
@@ -672,6 +541,7 @@
where: {wrk_no: param},
page: true,
limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -679,7 +549,7 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'matnr', align: 'center',title: '瑙勬牸'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
@@ -711,7 +581,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCur=curr;
form.on('checkbox(tableCheckbox)', function (data) {
@@ -745,7 +615,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
--
Gitblit v1.9.1