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 | 84 +++++++++++++++++------------------------
1 files changed, 35 insertions(+), 49 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index a66c4d1..3e69eca 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -31,6 +31,9 @@
,{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 ";}
@@ -64,7 +67,7 @@
// return html;
// }}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
]],
request: {
pageName: 'curr',
@@ -269,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;
// 琛ㄦ牸涓嬫柟鏄剧ず
@@ -301,13 +304,23 @@
break;
// 鍙栨秷
case 'cancel':
- 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();
- });
+ 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':
@@ -319,46 +332,19 @@
layer.closeAll();
});
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 '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 '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 'takeNone':
+ layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
});
break;
}
@@ -563,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: '琛岄」鐩�'}
--
Gitblit v1.9.1