From 527aad7440d7246a5787286a5a1291729eb0101c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 11 三月 2021 14:47:15 +0800 Subject: [PATCH] # --- src/main/webapp/views/custOrder/matQuery.html | 115 +++++++++++ src/main/webapp/views/custOrder/custOrder.html | 1 src/main/webapp/views/home/console.html | 2 src/main/webapp/static/js/ioWorks/matQuery.js | 152 +++++++++++++++ src/main/webapp/views/ioWorks/locDetlQuery.html | 4 src/main/webapp/static/js/custOrder/custOrder.js | 21 ++ src/main/webapp/views/custOrder/matQueryBox.html | 197 +++++++++++++++++++ src/main/webapp/static/js/common.js | 45 +--- src/main/webapp/views/pakout/pakout.html | 4 9 files changed, 504 insertions(+), 37 deletions(-) diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 0aa7cb0..2681c52 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -164,37 +164,20 @@ } var matCols = [ - {field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'} - ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�', hide: true} - ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О', width: 500} - ,{field: 'str2', align: 'center',title: '鐗╂枡绫诲埆'} - ,{field: 'str3', align: 'center',title: '瑙勬牸鍨嬪彿'} - ,{field: 'str1', align: 'center',title: '鍩烘湰鍗曚綅', hide: true} - ,{field: 'str4', align: 'center',title: '鐘舵��', hide: true} - ,{field: 'str5', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} - ,{field: 'str6', align: 'center',title: '閫氱煡鍗曞彿', hide: true} - ,{field: 'str7', align: 'center',title: '榛樿浠撳簱', hide: true} - // ,{field: 'str8', align: 'center',title: '鍝佺墝'} - // ,{field: 'str9', align: 'center',title: '閲囪喘鍛�'} - // ,{field: 'str10', align: 'center',title: '浜у湴'} - // ,{field: 'str11', align: 'center',title: '搴忓垪鍙风鐞�'} - // ,{field: 'str12', align: 'center',title: '鎵规绠$悊'} - // ,{field: 'str13', align: 'center',title: '淇濊川鏈熷崟浣�'} - // ,{field: 'str14', align: 'center',title: '淇濊川鏈熺鐞�'} - // ,{field: 'str15', align: 'center',title: '淇濊川鏈�'} - // ,{field: 'str16', align: 'center',title: '鍙攢鍞�'} - ,{field: 'str17', align: 'center',title: '鍙噰璐�', hide: true} - ,{field: 'str18', align: 'center',title: '鍙负瀛愪欢', hide: true} - // ,{field: 'str19', align: 'center',title: '鍙负缁勪欢'} - // ,{field: 'str20', align: 'center',title: '杈呭姪灞炴�х鐞�'} - ,{field: 'str21', align: 'center',title: '鎴愭湰璁$畻鏂规硶', hide: true} - ,{field: 'str22', align: 'center',title: '閲囪喘鍗曚綅', hide: true} - ,{field: 'str23', align: 'center',title: '閿�鍞崟浣�', hide: true} - // ,{field: 'num1', align: 'center',title: '棰勮澶╂暟'} - // ,{field: 'num2', align: 'center',title: '鏈�浣庡簱瀛樻暟閲�'} - // ,{field: 'num3', align: 'center',title: '鏈�楂樺簱瀛樻暟閲�'} - // ,{field: 'num4', align: 'center',title: '瀹夊叏搴撳瓨'} - // ,{field: 'num5', align: 'center',title: '绋庣巼'} + {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'} + ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} + ,{field: 'name', align: 'center',title: '鍚嶇О', hide: true} + ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true} + ,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true} + ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true} + ,{field: 'unit', align: 'center',title: '鍗曚綅'} + ,{field: 'barcode', align: 'center',title: '璐х墿鏉$爜', hide: true} + // ,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true} + // ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} + ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true} + ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true} + ,{field: 'count', align: 'center',title: '鏁伴噺', hide: true} + ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true} ] var detlCols = [ diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js index abf215e..a5adbdd 100644 --- a/src/main/webapp/static/js/custOrder/custOrder.js +++ b/src/main/webapp/static/js/custOrder/custOrder.js @@ -1,10 +1,29 @@ var pageCurr; -layui.use(['table','laydate', 'form'], function(){ + +function right(){ + top.layui.admin.popupRight({ + id: 'LAY_adminPopupLayerTest' + , area: '750px' + , type: 2 + ,content:'custOrder/matQuery.html' + ,success: function(){ + // $('#'+ this.id).html('<div style="padding: 20px;">鏀惧叆鍐呭</div>'); + //admin.view(this.id).render('system/xxx') + } + }); +} + +layui.config({ + base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� +}).extend({ + index: 'lib/index' //涓诲叆鍙fā鍧� +}).use(['table', 'laydate', 'form'], function(){ var table = layui.table; var $ = layui.jquery; var layer = layui.layer; var layDate = layui.laydate; var form = layui.form; + var admin = layui.admin; // 鏁版嵁娓叉煋 tableIns = table.render({ diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js new file mode 100644 index 0000000..390e731 --- /dev/null +++ b/src/main/webapp/static/js/ioWorks/matQuery.js @@ -0,0 +1,152 @@ + +var matData = []; +function getCol() { + var cols = [ + {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'} + ]; + arrRemove(matCols, 'field', 'anfme'); + cols.push.apply(cols, matCols); + cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:65}) + return cols; +} + +layui.use(['table','laydate', 'form'], function() { + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var form = layui.form; + + tableIns = table.render({ + elem: '#chooseData', + headers: {token: localStorage.getItem('token')}, + data: [], + even: true, + toolbar: '#toolbar', + cellMinWidth: 50, + cols: [getCol()], + done: function(res, curr, count) { + limit(); + } + }); + + // 椤甸潰淇敼 + table.on('edit(chooseData)', function (obj) { + updateMatData(obj.data.locNo, obj.data.matnr, Number(obj.value)); + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(chooseData)', function (obj) { + var data = matData; + switch (obj.event) { + case 'outbound': + if (data.length === 0){ + layer.msg('璇峰厛娣诲姞鐗╂枡'); + } else { + var locDetls = []; + data.forEach(function(elem) { + locDetls.push({nodeId: elem.nodeId, matnr: elem.matnr, count: elem.count}); + }); + $.ajax({ + url: baseUrl+"/work/pakout/init", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(locDetls), + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + if (res.code === 200){ + matData = []; + tableIns.reload({data: matData,done:function (res) { + limit(); + }}); + layer.msg(res.msg, {icon: 1}); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg) + } + } + }); + } + break; + } + }); + + // 鐩戝惉琛屽伐鍏蜂簨浠� + table.on('tool(chooseData)', function(obj){ + var data = obj.data; + switch (obj.event) { + case 'remove': + for (var i = matData.length - 1; i >= 0; i--) { + if (matData[i].matnr === data.matnr) { + matData.splice(i, 1); + } + } + tableIns.reload({data: matData,done:function (res) { + limit(); + }}); + break; + } + }); + + function updateMatData(locNo, matnr, count) { + if (isNaN(count)) { + layer.msg("璇疯緭鍏ユ暟瀛�"); + } else { + if (count > 0) { + for (var i=0;i<matData.length;i++){ + if (matData[i]["matnr"] === matnr){ + // if (count > locDetlData[i]["anfme"]) { + // layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�"); + // } else { + matData[i]["count"] = count; + // } + break; + } + } + } else { + layer.msg("鏁伴噺蹇呴』澶т簬闆�"); + } + } + tableIns.reload({data: matData,done:function (res) { + limit(); + }}); + } + +}) + +// 鎻愬彇鐗╂枡 +var matDetlLayerIdx; +function getMatDetl() { + matDetlLayerIdx = layer.open({ + type: 2, + title: '鎻愬彇鍑哄簱鐗╂枡', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: 'matQueryBox.html', + success: function(layero, index){ + } + }); +} + +// 娣诲姞琛ㄦ牸鏁版嵁 +function addTableData(data) { + for (var i=0;i<data.length;i++){ + let pass = false; + for (var j=0;j<matData.length;j++){ + if (data[i].matnr === matData[j].matnr) { + pass = true; + break; + } + } + if (pass) { + data.splice(i--, 1); + } else { + data[i]["count"] = 0; + } + + } + matData.push.apply(matData, data); + tableIns.reload({data: matData}); + layer.close(matDetlLayerIdx); +} \ No newline at end of file diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html index 1519c0c..3ac9eb2 100644 --- a/src/main/webapp/views/custOrder/custOrder.html +++ b/src/main/webapp/views/custOrder/custOrder.html @@ -33,6 +33,7 @@ </div> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> + <button class="layui-btn" onclick="right()">鏃爅s鍙充晶寮瑰嚭</button> <!-- <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> diff --git a/src/main/webapp/views/custOrder/matQuery.html b/src/main/webapp/views/custOrder/matQuery.html new file mode 100644 index 0000000..a4ffe19 --- /dev/null +++ b/src/main/webapp/views/custOrder/matQuery.html @@ -0,0 +1,115 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/common.css" media="all"> + <style> + html { + height: 100%; + padding: 10px; + background-color: #f1f1f1; + } + body { + background-color: #fff; + border-radius: 5px; + box-shadow: 0 0 3px rgba(0,0,0,.3); + padding-bottom: 20px; + } + + #staNoSpan { + text-align: center; + display: inline-block; + width: 100px; + font-size: 13px; + } + .layui-btn-container .layui-form-select { + display: inline-block; + width: 150px; + height: 30px; + } + .layui-btn-container .layui-form-select.layui-form-selected { + display: inline-block; + width: 150px; + } + .layui-btn-container .layui-select-title input { + font-size: 13px; + } + .layui-btn-container .layui-anim.layui-anim-upbit dd { + font-size: 13px; + } + + #btn-outbound { + margin-left: 20px; + } + + /*----------------------------------*/ + .function-area { + padding: 20px 50px; + } + .function-btn { + font-size: 16px; + padding: 1px 1px 1px 1px; + width: 100px; + height: 50px; + border-color: #2b425b; + border-radius: 4px; + border-width: 2px; + background: none; + border-style: solid; + transition: 0.4s; + cursor: pointer; + letter-spacing: 3px; + } + .function-btn:hover { + background-color: #2b425b; + color: #fff; + } + + </style> +</head> +<body> + +<!-- 鍔熻兘鍖� --> +<div class="function-area"> + <button id="mat-query" class="function-btn" onclick="getMatDetl()">+ 鐗╂枡</button> +</div> + +<hr> + +<!-- 琛ㄦ牸 --> +<div style="padding-bottom: 5px; margin-bottom: 45px"> + + <!-- 澶撮儴 --> + <script type="text/html" id="toolbar"> + <div class="layui-form"> + <div class="layui-btn-container"> + <!-- 2.鍚姩鍑哄簱 --> + <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button> + </div> + </div> + </script> + + <!-- 琛� --> + <script type="text/html" id="operate"> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a> + </script> + + <table class="layui-table" id="chooseData" lay-filter="chooseData"></table> +</div> + +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> +<script type="text/javascript" src="../../static/js/ioWorks/matQuery.js" charset="utf-8"></script> + +</body> +</html> + diff --git a/src/main/webapp/views/custOrder/matQueryBox.html b/src/main/webapp/views/custOrder/matQueryBox.html new file mode 100644 index 0000000..92ed334 --- /dev/null +++ b/src/main/webapp/views/custOrder/matQueryBox.html @@ -0,0 +1,197 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/common.css" media="all"> + <style> + body { + padding: 0 20px; + } + .layui-table-box { + border-right: 1px solid #9F9F9F; + border-left: 1px solid #9F9F9F; + } + + #search-box { + padding: 30px 0 20px 0; + } + #search-box .layui-inline:first-child { + margin-left: 30px; + } + #search-box .layui-inline { + margin-right: 5px; + } + + #data-search-btn { + margin-left: 10px; + display: inline-block; + } + #data-search-btn.layui-btn-container .layui-btn { + margin-right: 20px; + } + </style> +</head> +<body> + +<!-- 鎼滅储鏍� --> +<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;"> + <legend>鎼滅储鏍�</legend> + <!-- 鎼滅储鏍� --> + <div id="search-box" class="layui-form layui-card-header"> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off"> + </div> + </div> + <!-- 寰呮坊鍔� --> + <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block"> + <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button> + <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button> + </div> + </div> +</fieldset> + +<script type="text/html" id="toolbar"> + <div class="layui-btn-container"> + <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button> + </div> +</script> + +<div class="layui-form"> + <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table> +</div> + +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> + +</body> +<script> + + var pageCurr; + function getCol() { + var cols = [ + {type: 'checkbox'} + ]; + cols.push.apply(cols, matCols); + cols.push({field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true} + ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}) + return cols; + } + + layui.use(['table','laydate', 'form'], function() { + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var layDate = layui.laydate; + var form = layui.form; + // 鏁版嵁娓叉煋 + locDetlTableIns = table.render({ + elem: '#stockOut', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/mat/list/auth', + page: true, + limit: 8, + even: true, + toolbar: '#toolbar', + cellMinWidth: 50, + cols: [getCol()], + request: { + pageName: 'curr', + pageSize: 'limit' + }, + parseData: function (res) { + return { + 'code': res.code, + 'msg': res.msg, + 'count': res.data.total, + 'data': res.data.records + } + }, + response: { + statusCode: 200 + }, + done: function(res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + } + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(stockOut)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id); + var data = checkStatus.data; + switch(obj.event) { + case 'confirm': + if (data.length === 0){ + layer.msg("璇烽�夋嫨鏁版嵁"); + return; + } + parent.addTableData(data); + break; + } + }); + + // 鎼滅储鏍忔悳绱簨浠� + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(); + }); + + // 鎼滅储鏍忛噸缃簨浠� + form.on('submit(reset)', function (data) { + pageCurr = 1; + clearFormVal($('#search-box')); + tableReload(); + }); + + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); + }) + + function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + locDetlTableIns.reload({ + where: searchData, + page: { + curr: pageCurr + }, + done: function (res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + } + }); + } + + function clearFormVal(el) { + $(':input', el) + .val('') + .removeAttr('checked') + .removeAttr('selected'); + } +</script> +</html> + diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html index 004642f..9dbf1ae 100644 --- a/src/main/webapp/views/home/console.html +++ b/src/main/webapp/views/home/console.html @@ -228,7 +228,7 @@ <!-- </div>--> <!-- </div>--> <div class="layui-col-xs6 layui-col-sm3"> - <div class="console-app-group" lay-href="pakout/pakout.html?resourceId=30435" lay-text="鎷h揣宸ヤ綔妗�"> + <div class="console-app-group" lay-href="pakout/pakout.html?resourceId=30435" lay-text="鎷h揣鍗曠鐞�"> <i class="console-app-icon layui-icon layui-icon-form" style="color: #b37feb;font-size: 30px;"></i> <div class="console-app-name">鎷h揣鍗�</div> </div> diff --git a/src/main/webapp/views/ioWorks/locDetlQuery.html b/src/main/webapp/views/ioWorks/locDetlQuery.html index 598ea33..a34be09 100644 --- a/src/main/webapp/views/ioWorks/locDetlQuery.html +++ b/src/main/webapp/views/ioWorks/locDetlQuery.html @@ -210,8 +210,8 @@ top.location.href = baseUrl+"/"; } pageCurr=curr; - $('.layui-form-checkbox').css("pointer-events", "none"); - $('td[data-field="0').css("cursor", "pointer") + // $('.layui-form-checkbox').css("pointer-events", "none"); + // $('td[data-field="0').css("cursor", "pointer") } }); } diff --git a/src/main/webapp/views/pakout/pakout.html b/src/main/webapp/views/pakout/pakout.html index b5ec87d..b615948 100644 --- a/src/main/webapp/views/pakout/pakout.html +++ b/src/main/webapp/views/pakout/pakout.html @@ -90,9 +90,9 @@ <span name="wrkSts" {{# if( d.wrkSts === 1){ }} class="layui-badge layui-badge-blue" - {{# }else if(d.wrkSts === 2){ }} + {{# } else if(d.wrkSts === 2){ }} class="layui-badge layui-badge-red" - {{# }else if(d.wrkSts === 3){ }} + {{# } else if(d.wrkSts === 3){ }} class="layui-badge layui-badge-green" {{# } }} >{{d.wrkSts$}}</span> -- Gitblit v1.9.1