From e15fedf194e896d7c5160d496e3aea8af4110b88 Mon Sep 17 00:00:00 2001 From: 18516761980 <4761516tqsxp> Date: 星期二, 15 三月 2022 10:29:35 +0800 Subject: [PATCH] . --- src/main/webapp/views/receiveDetl/receiveDetl.html | 19 ----- src/main/webapp/static/js/receiveDetl/receiveDetl.js | 103 +++++++++++----------------------- 2 files changed, 35 insertions(+), 87 deletions(-) diff --git a/src/main/webapp/static/js/receiveDetl/receiveDetl.js b/src/main/webapp/static/js/receiveDetl/receiveDetl.js index 39bc7ec..e46be7d 100644 --- a/src/main/webapp/static/js/receiveDetl/receiveDetl.js +++ b/src/main/webapp/static/js/receiveDetl/receiveDetl.js @@ -8,6 +8,8 @@ var layDate = layui.laydate; var form = layui.form; var admin = layui.admin; + var xmSelect = layui.xmSelect; + var treeTable = layui.treeTable; // 鏁版嵁娓叉煋 tableIns = table.render({ @@ -71,7 +73,7 @@ } }); - var insTb = layui.treeTable.render({ + var insTb = treeTable.render({ elem: '#node', url: baseUrl+'/node/tree/auth', headers: {token: localStorage.getItem('token')}, @@ -100,70 +102,6 @@ insTb.expandAll(); } }); - /* 鏄剧ず琛ㄥ崟寮圭獥 */ - function showNodeSelect() { - admin.open({ - type: 1, - area: '400px', - title: '閫夋嫨鍏ュ簱璐т綅', - content: $('#nodeSelect').html(), - success: function (layero, dIndex) { - // 琛ㄥ崟鎻愪氦浜嬩欢 - form.on('submit(pakin)', function (data) { - data.field.nodeSel = insXmSel.getValue('valueStr'); - var loadIndex = layer.load(2); - $.ajax({ - url: baseUrl+"/work/stock/pakin", - headers: {'token': localStorage.getItem('token')}, - data: JSON.stringify({ - nodeId: data.field.nodeSel, - mats: matCodeData - }), - contentType:'application/json;charset=UTF-8', - method: 'POST', - success: function (res) { - layer.close(loadIndex); - if (res.code === 200){ - layer.close(dIndex); - matCodeData = []; - tableIns.reload({data: matCodeData}); - limit(); - layer.msg(res.msg, {icon: 1}); - } else if (res.code === 403){ - top.location.href = baseUrl+"/"; - } else { - layer.msg(res.msg, {icon: 2}); - } - } - }) - return false; - }); - // 娓叉煋涓嬫媺鏍� - var insXmSel = layui.xmSelect.render({ - el: '#nodeSels', - height: '250px', - data: insTb.options.data, - initValue: [], - model: {label: {type: 'text'}}, - prop: { - name: 'name', - value: 'id' - }, - radio: true, - clickClose: true, - tree: { - show: true, - indent: 15, - strict: false, - expandedKeys: true - } - }); - // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯 - $(layero).children('.layui-layer-content').css('overflow', 'visible'); - layui.form.render('select'); - } - }); - } // 鐩戝惉鎺掑簭浜嬩欢 table.on('sort(receiveDetl)', function (obj) { @@ -252,9 +190,6 @@ // showEditModel(data); startIn(data); break; - case "chooseLoc": - showNodeSelect(); - break; } }); function startIn(data) { @@ -263,13 +198,16 @@ ,area: '600px' ,title: '鍏ュ簱' ,content: $('#addIn').html() - ,success: function () { + ,success: function (layero, dIndex) { var remain = data.anfme - data.inQty; form.val('inDetail',{ "remain": remain }); form.val('inDetail',data); - form.on('submit(recommendIn)',function (data) { + + form.on('submit(inLoc)',function (data) { + var loc = insXmSel.getValue('valueStr'); + alert(loc); console.log(data); $.ajax({ url: baseUrl+"/receiveDetl/addIn" @@ -279,6 +217,30 @@ }) return false; }); + + // 娓叉煋涓嬫媺鏍� + var insXmSel = xmSelect.render({ + el: '#nodeSels', + height: '250px', + data: insTb.options.data, + initValue: [], + model: {label: {type: 'text'}}, + prop: { + name: 'name', + value: 'id' + }, + radio: true, + clickClose: true, + tree: { + show: true, + indent: 15, + strict: false, + expandedKeys: true + } + }); + + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); } }) } @@ -315,6 +277,7 @@ }) return false; }); + $(layero).children('.layui-layer-content').css('overflow', 'visible'); layui.form.render('select'); } diff --git a/src/main/webapp/views/receiveDetl/receiveDetl.html b/src/main/webapp/views/receiveDetl/receiveDetl.html index 1982ca1..74f30e1 100644 --- a/src/main/webapp/views/receiveDetl/receiveDetl.html +++ b/src/main/webapp/views/receiveDetl/receiveDetl.html @@ -44,25 +44,10 @@ <script type="text/html" id="operate"> <!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>--> <a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="add">涓婃灦</a> - <a class="layui-btn layui-btn-xs btn-edit" lay-event="chooseLoc">閫夋嫨搴撲綅</a> - <!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>--> </script> -<script type="text/html" id="nodeSelect"> - <form id="details" lay-filter="detail" class="layui-form"> - <div class="layui-form-item"> - <label class="layui-form-label">涓婃灦璐т綅</label> - <div class="layui-input-block"> - <div id="nodeSels" class="ew-xmselect-tree"></div> - </div> - </div> - <div class="layui-form-item text-right"> - <button class="layui-btn" lay-filter="pakin" lay-submit="">纭鍏ュ簱</button> - <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> - </div> - </form> -</script> + <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> @@ -128,7 +113,7 @@ 鍏ュ簱浣嶇疆: </label> <div class="layui-input-block"> - <div id="nodeSel" class="ew-xmselect-tree"></div> + <div id="nodeSels" class="ew-xmselect-tree"></div> <!-- <input type="number" class="layui-input" placeholder="鍙洿鎺ョ偣鍑昏嚜鍔ㄥ叆搴�">--> </div> </div> -- Gitblit v1.9.1