From 5b446c229afcaa79b1fa3b2cb4f3563a6facefba Mon Sep 17 00:00:00 2001 From: 18516761980 <56479841@qq.com> Date: 星期二, 21 六月 2022 16:31:37 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs --- src/main/webapp/static/js/orderTable.js | 20 +++++++++ src/main/webapp/static/js/order/out.js | 35 ++++++++++++++++- src/main/webapp/views/order/out.html | 59 +++++++++++++++++------------ 3 files changed, 86 insertions(+), 28 deletions(-) diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js index cc84ebe..be85831 100644 --- a/src/main/webapp/static/js/order/out.js +++ b/src/main/webapp/static/js/order/out.js @@ -4,7 +4,7 @@ base: baseUrl + "/static/layui/lay/modules/" }).extend({ notice: 'notice/notice', -}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect', 'tableMerge'], function(){ +}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect', 'tableMerge', 'tableX'], function(){ var table = layui.table; var $ = layui.jquery; var layer = layui.layer; @@ -16,6 +16,7 @@ var treeTable = layui.treeTable; var xmSelect = layui.xmSelect; var tableMerge = layui.tableMerge; + var tableX = layui.tableX; insTb2 = table.render({ elem: '#orderDetlTable', @@ -26,13 +27,14 @@ limits: [15, 30, 50, 100, 200, 500], toolbar: '#orderDetToolbar', height: 'full-120', + where: {order_id: 9999999999}, cols: [[ {type: 'checkbox'} ,{type: 'numbers', title: '#'} ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160} ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160} ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} - ,{field: 'batch', align: 'center',title: '鎵瑰彿'} + ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'} ,{field: 'specs', align: 'center',title: '瑙勬牸'} // ,{field: 'anfme', align: 'center',title: '鏁伴噺'} // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'} @@ -77,6 +79,7 @@ limit(); } }); + /* 琛ㄦ牸2鎼滅储 */ form.on('submit(sensorTbSearch)', function (data) { insTb2.reload({where: data.field, page: {curr: 1}}); @@ -85,6 +88,7 @@ /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */ table.on('toolbar(orderDetlTable)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id).data; if (obj.event === 'pakoutPreview') { // 娣诲姞 if (checkStatus.length === 0) { @@ -109,6 +113,7 @@ /* 琛ㄦ牸2宸ュ叿鏉$偣鍑讳簨浠� */ table.on('tool(orderDetlTable)', function (obj) { + console.log(obj); var data = obj.data; switch (obj.event) { // 鍑哄簱 @@ -154,7 +159,7 @@ // {type: 'checkbox', merge: ['orderNo']}, {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'}, {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350}, - {field: 'batch', title: '鎵瑰彿', align: 'center'}, + {field: 'batch', title: '搴忓垪鐮�', align: 'center'}, {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'}, {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'}, {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'}, @@ -338,6 +343,8 @@ }) }) + window.pakoutPreview = pakoutPreview; + }); function tableReload(child) { @@ -353,3 +360,25 @@ }); } +/** + * 涓�閿嚭搴� + */ +function autoOut(orderId) { + let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false}); + $.ajax({ + url: baseUrl + "/out/pakout/orderDetlIds/auth", + headers: {'token': localStorage.getItem('token')}, + data: { orderId : orderId }, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + pakoutPreview(res.data); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) +} diff --git a/src/main/webapp/static/js/orderTable.js b/src/main/webapp/static/js/orderTable.js index 5d4c8b1..8d65b03 100644 --- a/src/main/webapp/static/js/orderTable.js +++ b/src/main/webapp/static/js/orderTable.js @@ -1,13 +1,14 @@ var insTb; layui.config({ base: baseUrl + "/static/layui/lay/modules/" // 閰嶇疆妯″潡鎵�鍦ㄧ殑鐩綍 -}).use(['table','laydate', 'form', 'admin'], function() { +}).use(['table','laydate', 'form', 'admin', 'tableX'], function() { var table = layui.table; var $ = layui.jquery; var layer = layui.layer; var layDate = layui.laydate; var form = layui.form; var admin = layui.admin; + var tableX = layui.tableX; /****************************************** 宸﹁竟琛� *************************************************/ @@ -44,6 +45,21 @@ ]], done: function (res, curr, count) { $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click'); + + // 缁戝畾榧犳爣鍙抽敭 + tableX.bindCtxMenu('originTable', function (d) { + return [ + { + icon: 'layui-icon layui-icon-ok', + name: '涓�閿嚭搴�', + click: function (d) { + autoOut(d.id); + } + } + ] + + }) + } }); @@ -77,9 +93,11 @@ } }); + /* 鐩戝惉琛屽崟鍑讳簨浠� */ var selObj; table.on('row(originTable)', function (obj) { + selObj = obj; obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); insTb2.reload({where: {order_id: obj.data.id}, page: {curr: 1}}); diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html index 7a68bac..9a59d23 100644 --- a/src/main/webapp/views/order/out.html +++ b/src/main/webapp/views/order/out.html @@ -107,21 +107,21 @@ </div> </div> <div class="layui-inline"> - <label class="layui-form-label">鎵瑰彿:</label> + <label class="layui-form-label">搴忓垪鐮�:</label> <div class="layui-input-inline"> - <input name="batch" class="layui-input" placeholder="鎵瑰彿"/> + <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/> </div> </div> -<!-- <div class="layui-inline">--> -<!-- <label class="layui-form-label">鐘舵��:</label>--> -<!-- <div class="layui-input-inline">--> -<!-- <select name="isOnline">--> -<!-- <option value="1">鍏呯數涓�</option>--> -<!-- <option value="1">鍏呯數涓�</option>--> -<!-- <option value="0">涓嶅湪鍏呯數</option>--> -<!-- </select>--> -<!-- </div>--> -<!-- </div>--> + <!-- <div class="layui-inline">--> + <!-- <label class="layui-form-label">鐘舵��:</label>--> + <!-- <div class="layui-input-inline">--> + <!-- <select name="isOnline">--> + <!-- <option value="1">鍏呯數涓�</option>--> + <!-- <option value="1">鍏呯數涓�</option>--> + <!-- <option value="0">涓嶅湪鍏呯數</option>--> + <!-- </select>--> + <!-- </div>--> + <!-- </div>--> <div class="layui-inline">  <button class="layui-btn icon-btn" lay-filter="sensorTbSearch" lay-submit> <i class="layui-icon"></i>鎼滅储 @@ -138,15 +138,22 @@ <!-- 澶村伐鍏锋爮 --> <script type="text/html" id="orderDetToolbar"> - <div class="layui-btn-container"> - <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button> - </div> + + <!-- <div class="layui-btn-container">--> + <!-- <div class="layui-col-md3">--> + <!-- <select id="staNoSelect" lay-verify="required">--> + <!-- <option value="">璇烽�夋嫨绔欑偣</option>--> + <!-- </select>--> + <!-- </div>--> + <!-- </div>--> + <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button> + </script> <!-- 琛屽伐鍏锋爮 --> <script type="text/html" id="operate"> {{#if (d.anfme > d.qty){ }} - <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a> + <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a> {{# } }} </script> @@ -169,9 +176,9 @@ <div class="ew-select-fixed"> <select class="order-sta-select" lay-filter="tbBasicTbStaNos"> {{#if (d.staNos!=null) {}} - {{# for(let i=0; i<d.staNos.length; i++) { }} - <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option> - {{# } }} + {{# for(let i=0; i<d.staNos.length; i++) { }} + <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option> + {{# } }} {{# } }} </select> </div> @@ -187,10 +194,10 @@ <script type="text/html" id="locNoTpl"> <span name="locNo" - {{# if( d.lack === false){ }} - class="layui-badge layui-badge-green" >{{d.locNo}}</span> - {{# } else { }} - class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span> + {{# if( d.lack === false){ }} + class="layui-badge layui-badge-green" >{{d.locNo}}</span> + {{# } else { }} + class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span> {{# } }} </script> @@ -271,7 +278,11 @@ <script type="text/javascript" src="../../static/js/tools/md5.js"></script> <script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script> - +<!--<script type="text/template" id="takeSiteSelectTemplate">--> +<!-- {{#each data}}--> +<!-- <option value="{{siteId}}">{{desc}}</option>--> +<!-- {{/each}}--> +<!--</script>--> <!-- 椤圭洰缂栬緫绐楀彛 --> <script type="text/html" id="hostEditDialog"> <form id="hostEditForm" lay-filter="hostEditForm" class="layui-form model-form"> -- Gitblit v1.9.1