From 5fb393a728e569f834059cb1cedbaf128d878b9a Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 13 七月 2020 17:16:57 +0800 Subject: [PATCH] Merge branches 'gdasrs' and 'master' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs --- src/main/webapp/static/js/locDetl/locDetl.js | 4 ++-- src/main/webapp/static/js/report/stayTime.js | 4 ++-- src/main/webapp/views/locDetl/locDetl.html | 5 +---- src/main/webapp/static/js/report/workOut.js | 4 ++-- src/main/webapp/static/js/report/reportStockUse.js | 4 ++-- src/main/webapp/static/js/report/inOut.js | 4 ++-- src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 4 ++-- src/main/webapp/static/js/stkPlcm/stkPlcm.js | 4 ++-- src/main/webapp/static/js/report/workIn.js | 4 ++-- src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js | 4 ++-- src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 4 ++-- src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 4 ++-- 12 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js index 7feb380..973996c 100644 --- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js +++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js @@ -20,8 +20,8 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} - ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true} + // {type: 'checkbox'} + {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true} ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, hide:true} ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'} ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'} diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js index 27fb1c1..e2929a8 100644 --- a/src/main/webapp/static/js/locDetl/locDetl.js +++ b/src/main/webapp/static/js/locDetl/locDetl.js @@ -18,9 +18,9 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} + // {type: 'checkbox'} // ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} - ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} + {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} ,{field: 'matnr', align: 'center',title: '鐗╂枡'} // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80} // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'} diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js index 42224dc..e7dff96 100644 --- a/src/main/webapp/static/js/report/inOut.js +++ b/src/main/webapp/static/js/report/inOut.js @@ -17,8 +17,8 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} - ,{field: 'ymd', align: 'center', title: '鏃ユ湡'} + // {type: 'checkbox'} + {field: 'ymd', align: 'center', title: '鏃ユ湡'} ,{field: 'source_sta_no', align: 'center',title: '绔欑偣'} ,{field: 'sto_qty', align: 'center',title: '鍏ュ簱娆℃暟'} ,{field: 'ret_qty', align: 'center',title: '鍑哄簱娆℃暟'} diff --git a/src/main/webapp/static/js/report/reportStockUse.js b/src/main/webapp/static/js/report/reportStockUse.js index 11e0465..414dde2 100644 --- a/src/main/webapp/static/js/report/reportStockUse.js +++ b/src/main/webapp/static/js/report/reportStockUse.js @@ -18,8 +18,8 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox', fixed: 'left'} - ,{field: 'row1', title: '閽㈡灦鍙�', sort: true, align: 'center'} + // {type: 'checkbox', fixed: 'left'} + {field: 'row1', title: '閽㈡灦鍙�', sort: true, align: 'center'} ,{field: 'total_qty', align: 'center',title: '搴撲綅鎬绘暟'} ,{field: 'full_qty', align: 'center',title: '鍦ㄥ簱鏁伴噺'} ,{field: 'null_qty', align: 'center',title: '绌哄簱浣嶆暟閲�'} diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js index 5947366..961fe31 100644 --- a/src/main/webapp/static/js/report/stayTime.js +++ b/src/main/webapp/static/js/report/stayTime.js @@ -18,8 +18,8 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} - ,{field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center'} + // {type: 'checkbox'} + {field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center'} ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'} ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'} ,{field: 'matnr', align: 'center',title: '鐗╂枡'} diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js index 13e3959..bedebe3 100644 --- a/src/main/webapp/static/js/report/workIn.js +++ b/src/main/webapp/static/js/report/workIn.js @@ -17,8 +17,8 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} - ,{field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡'} + // {type: 'checkbox'} + {field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡'} ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'} // ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'} // ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'} diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js index fc2f2d4..7ad1126 100644 --- a/src/main/webapp/static/js/report/workOut.js +++ b/src/main/webapp/static/js/report/workOut.js @@ -17,8 +17,8 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} - ,{field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡'} + // {type: 'checkbox'} + {field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡'} ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'} ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'} ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'} diff --git a/src/main/webapp/static/js/stkPlcm/stkPlcm.js b/src/main/webapp/static/js/stkPlcm/stkPlcm.js index 6e70a8c..e9e1e00 100644 --- a/src/main/webapp/static/js/stkPlcm/stkPlcm.js +++ b/src/main/webapp/static/js/stkPlcm/stkPlcm.js @@ -17,8 +17,8 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} - ,{field: 'ioTime$', align: 'center',title: '鏃ユ湡'} + // {type: 'checkbox'} + {field: 'ioTime$', align: 'center',title: '鏃ユ湡'} ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�',event: 'locNo', style: 'cursor:pointer'} ,{field: 'crnError$', align: 'center',title: '寮傚父鐮�'} diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js index 4c5a625..0dd26b7 100644 --- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js +++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js @@ -18,10 +18,10 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} + // {type: 'checkbox'} // ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} // ,{field: 'id', align: 'center',title: '缂栧彿'} - ,{field: 'pakinId', align: 'center',title: '鍏ュ簱閫氱煡鍙�'} + {field: 'pakinId', align: 'center',title: '鍏ュ簱閫氱煡鍙�'} ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'} ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'} ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'} diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js index c4497e2..7d86086 100644 --- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js +++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js @@ -18,9 +18,9 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} + // {type: 'checkbox'} // ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} - ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} + {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'} ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栧彿'} // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'} diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js index 80d052e..5d0e30f 100644 --- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js +++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js @@ -18,10 +18,10 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} + // {type: 'checkbox'} // ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} // ,{field: 'id', align: 'center',title: '缂栧彿'} - ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true} + {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true} ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true} ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160} ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160} diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html index ae77b87..44ad39d 100644 --- a/src/main/webapp/views/locDetl/locDetl.html +++ b/src/main/webapp/views/locDetl/locDetl.html @@ -37,15 +37,12 @@ </div> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> - <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button> - <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> - <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button> </div> </script> <script type="text/html" id="operate"> <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a> - <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a> </script> <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> -- Gitblit v1.9.1