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 | 82 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index d394432..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;
@@ -25,12 +29,14 @@
,{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: '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: 'shuttleNo', align: 'center',title: '灏忚溅', width: 70}
+ ,{field: 'liftNo', align: 'center',title: '鎻愬崌鏈哄彿'}
+ ,{field: 'barcode', 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){
@@ -66,7 +72,7 @@
// return html;
// }}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:230}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:290}
]],
request: {
pageName: 'curr',
@@ -87,6 +93,7 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
+ $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');//瑙ｅ喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
pageCurr=curr;
limit();
form.on('checkbox(tableCheckbox)', function (data) {
@@ -132,6 +139,7 @@
var list=[];
checkStatus.data.map(function (track) {
list.push({
+
wrkNo: track.wrkNo,
ioTime: track.ioTime,
ioPri: track.ioPri
@@ -197,7 +205,7 @@
content: 'wrkMast_detail.html',
success: function(layero, index){
layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
+ clearFormVal(layer.getChildFrame('#detail', index));
layer.getChildFrame('##dealDownLine', index).hide();layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
}
});
@@ -271,9 +279,9 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(wrkMast)', function(obj){
- var data = obj.data;
+ let data = obj.data;
switch (obj.event) {
- // 鏄庣粏灞曠ず todo
+ // 鏄庣粏灞曠ず
case 'detlShow':
wrkNo = data.wrkNo;
// 琛ㄦ牸涓嬫柟鏄剧ず
@@ -320,7 +328,6 @@
layer.closeAll();
});
}
-
break;
// 鎷ｆ枡鍏ュ簱
case 'pick':
@@ -332,45 +339,51 @@
layer.closeAll();
});
break;
- // 璇︽儏
- case 'detail':
+ case 'priWrkMast':
layer.open({
type: 2,
- title: '璇︽儏',
+ title: '缁存姢宸ヤ綔妗�',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', 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();
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#locNo', index), true);
+ 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');
- layer.getChildFrame('##dealDownLine', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
}
});
break;
- // 缂栬緫
- case 'edit':
+ //绌挎杞︽寚浠�
+ case 'shuttleCommand':
+ wrkNo = data.wrkNo;
layer.open({
type: 2,
- title: '淇敼',
+ 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"});
+ 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;
@@ -644,6 +657,7 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
+ $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');//瑙ｅ喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
--
Gitblit v1.9.1