From 1d39a8a4a084eede13d58d29d77edafd5413ef9c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 六月 2020 10:00:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/wrkMast/wrkMast.html | 1 +
src/main/webapp/static/js/wrkMast/wrkMast.js | 24 ++++++++++++------------
src/main/webapp/static/js/stoMan/stoQue.js | 18 +++++++++---------
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index dc69887..4847999 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -19,21 +19,21 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',event: 'locDetl'}
- ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180,event: 'locDetl'}
- ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷',event: 'locDetl'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿',event: 'locDetl'}
- ,{field: 'row1', align: 'center',title: '鎺�',event: 'locDetl'}
- ,{field: 'bay1', align: 'center',title: '鍒�',event: 'locDetl'}
- ,{field: 'lev1', align: 'center',title: '灞�',event: 'locDetl'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180}
+ ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'row1', align: 'center',title: '鎺�'}
+ ,{field: 'bay1', align: 'center',title: '鍒�'}
+ ,{field: 'lev1', align: 'center',title: '灞�'}
,{field: 'fullPlt', align: 'center',title: '婊℃澘',event: 'locDetl', templet:function(row){
var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
html += "disabled='disabled' >";
return html;
},width:80}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'locDetl'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180,event: 'locDetl'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
]],
request: {
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index d184143..e27f546 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -19,17 +19,17 @@
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}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true}
+ ,{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: '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 ";}
@@ -63,7 +63,7 @@
// return html;
// }}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index c93a84f..e017e58 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -108,6 +108,7 @@
</div>
<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-sm btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<a class="layui-btn layui-btn-danger layui-btn-sm btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-sm btn-cancel" lay-event="cancel">鍙栨秷</a>
</script>
--
Gitblit v1.9.1