From ca42a5047cb15ae63035f15a971a8e1ec858851f Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期三, 20 十二月 2023 16:24:04 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/wrkMast/wrkMast.js | 67 +++++++++++++++++++-------------- 1 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js index e196bca..8b03117 100644 --- a/src/main/webapp/static/js/wrkMast/wrkMast.js +++ b/src/main/webapp/static/js/wrkMast/wrkMast.js @@ -1,6 +1,10 @@ var pageCurr; var wrkNo; -layui.use(['table','laydate', 'form'], function(){ +layui.config({ + base: baseUrl + "/static/layui/lay/modules/" +}).extend({ + dropdown: 'dropdown/dropdown', +}).use(['table', 'laydate', 'form', 'dropdown'], function () { var table = layui.table; var $ = layui.jquery; var layer = layui.layer; @@ -26,8 +30,8 @@ ,{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: 'sourceStaNo', align: 'center',title: '婧愮珯'} + ,{field: 'staNo', align: 'center',title: '鐩爣绔�'} ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'} ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'} ,{field: 'shuttleNo', align: 'center',title: '灏忚溅', width: 70} @@ -89,6 +93,7 @@ if (res.code === 403) { top.location.href = baseUrl+"/"; } + $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂 pageCurr=curr; limit(); form.on('checkbox(tableCheckbox)', function (data) { @@ -334,31 +339,6 @@ layer.closeAll(); }); break; - // 鍏堝叆鍝� - 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 'takeNone': - layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){ - }); - break; - // 寮冭溅 - case 'removeSte': - layer.confirm('娓呴櫎灏忚溅銆�' + data.steNo + '銆�', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){ - http.post(baseUrl+"/deal/steNo/empty", {wrkNo: data.wrkNo}, function (res) { - $(".layui-laypage-btn")[0].click(); - layer.msg(data.wrkNo + res.msg, {icon: 1}); - }) - layer.closeAll(); - }); - break; case 'priWrkMast': layer.open({ type: 2, @@ -374,6 +354,36 @@ 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'); + } + }); + break; + //绌挎杞︽寚浠� + case 'shuttleCommand': + wrkNo = data.wrkNo; + layer.open({ + type: 2, + title: '绌挎杞︽寚浠�', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: '../command/shuttleCommand.html', + success: function (layero, index) { + + } + }); + break; + //鎻愬崌鏈烘寚浠� + case 'liftCommand': + wrkNo = data.wrkNo; + layer.open({ + type: 2, + title: '鎻愬崌鏈烘寚浠�', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: '../command/liftCommand.html', + success: function (layero, index) { + } }); break; @@ -647,6 +657,7 @@ if (res.code === 403) { top.location.href = baseUrl+"/"; } + $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂 pageCurr=curr; if (res.data.length === 0 && count !== 0) { tableIns.reload({ -- Gitblit v1.9.1