From 18e13ddba707623dc9078d7bffc498f91dba409c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 13 四月 2021 14:48:26 +0800 Subject: [PATCH] # --- /dev/null | 102 -------------- src/main/webapp/static/js/orderSettle/orderSettle.js | 226 ++++++------------------------- src/main/webapp/views/orderSettle/orderSettle.html | 52 +++++++ src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java | 11 + src/main/webapp/static/js/common.js | 8 + 5 files changed, 112 insertions(+), 287 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java b/src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java index 06a82fe..8218ef2 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java @@ -16,10 +16,7 @@ import zy.cloud.wms.manager.entity.OrderSettle; import zy.cloud.wms.manager.service.OrderSettleService; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @RestController public class OrderSettleController extends BaseController { @@ -63,6 +60,10 @@ @RequestMapping(value = "/orderSettle/add/auth") @ManagerAuth public R add(OrderSettle orderSettle) { + orderSettle.setCreateBy(getUserId()); + orderSettle.setCreateTime(new Date()); + orderSettle.setUpdateBy(getUserId()); + orderSettle.setUpdateTime(new Date()); orderSettleService.insert(orderSettle); return R.ok(); } @@ -73,6 +74,8 @@ if (Cools.isEmpty(orderSettle) || null==orderSettle.getOrderSettle()){ return R.error(); } + orderSettle.setUpdateBy(getUserId()); + orderSettle.setUpdateTime(new Date()); orderSettleService.updateById(orderSettle); return R.ok(); } diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 951a7ae..982a8d1 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -56,6 +56,14 @@ }); } +// 娓呴櫎琛ㄥ崟 +function clearFormVal(el) { + $(':input', el) + .val('') + .removeAttr('checked') + .removeAttr('selected'); +} + // 鏉冮檺 function limit(child){ if (child == null){ diff --git a/src/main/webapp/static/js/orderSettle/orderSettle.js b/src/main/webapp/static/js/orderSettle/orderSettle.js index 98422b2..4185f96 100644 --- a/src/main/webapp/static/js/orderSettle/orderSettle.js +++ b/src/main/webapp/static/js/orderSettle/orderSettle.js @@ -1,10 +1,13 @@ var pageCurr; -layui.use(['table','laydate', 'form'], function(){ +layui.config({ + base: baseUrl + "/static/layui/lay/modules/" +}).use(['table','laydate', 'form', 'admin'], 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({ @@ -63,7 +66,7 @@ }); // 鐩戝惉鎺掑簭浜嬩欢 - table.on('sort(locMast)', function (obj) { + table.on('sort(orderSettleTab)', function (obj) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; @@ -74,13 +77,6 @@ where: searchData, page: { curr: 1 - }, - done: function (res, curr, count) { - if (res.code === 403) { - top.location.href = baseUrl+"/"; - } - pageCurr=curr; - limit(); } }); }); @@ -90,18 +86,7 @@ var checkStatus = table.checkStatus(obj.config.id); switch(obj.event) { case 'addData': - layer.open({ - type: 2, - title: '鏂板', - maxmin: true, - area: [top.detailWidth, top.detailHeight], - content: 'orderSettle_detail.html', - success: function(layero, index){ - layer.getChildFrame('#data-detail-submit-edit', index).hide(); - clearFormVal(layer.getChildFrame('#detail', index)); - layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); - } - }); + showEditModel(); break; case 'deleteData': var data = checkStatus.data; @@ -122,7 +107,7 @@ } else if (res.code === 403){ top.location.href = baseUrl+"/"; } else { - layer.msg(res.msg) + layer.msg(res.msg, {icon: 2}) } } }) @@ -174,98 +159,53 @@ table.on('tool(orderSettleTab)', function(obj){ var data = obj.data; switch (obj.event) { - // 璇︽儏 - case 'detail': - layer.open({ - type: 2, - title: '璇︽儏', - maxmin: true, - area: [top.detailWidth, top.detailHeight], - shadeClose: true, - content: 'orderSettle_detail.html', - success: function(layero, index){ - setFormVal(layer.getChildFrame('#detail', index), data, true); - top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); - layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide(); - layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); - layero.find('iframe')[0].contentWindow.layui.form.render('select'); - layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); - } - }); - break; // 缂栬緫 case 'edit': - layer.open({ - type: 2, - title: '淇敼', - maxmin: true, - area: [top.detailWidth, top.detailHeight], - content: 'orderSettle_detail.html', - success: function(layero, index){ - layer.getChildFrame('#data-detail-submit-save', index).hide(); - setFormVal(layer.getChildFrame('#detail', index), data, false); - top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false); - top.convertDisabled(layer.getChildFrame('#orderSettle', index), true); - layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); - layero.find('iframe')[0].contentWindow.layui.form.render('select'); - layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); - } - }); + showEditModel(data); break; - } }); - // 鏁版嵁淇濆瓨鍔ㄤ綔 - form.on('submit(save)', function () { - if (banMsg != null){ - layer.msg(banMsg); - return; - } - method("add"); - }); - - // 鏁版嵁淇敼鍔ㄤ綔 - form.on('submit(edit)', function () { - method("update") - }); - - function method(name){ - var index = layer.load(1, { - shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙 - }); - var data = { -// id: $('#id').val(), - orderSettle: $('#orderSettle').val(), - settleName: $('#settleName').val(), - createBy: $('#createBy').val(), - createTime: top.strToDate($('#createTime\\$').val()), - updateBy: $('#updateBy').val(), - updateTime: top.strToDate($('#updateTime\\$').val()), - memo: $('#memo').val(), - - }; - $.ajax({ - url: baseUrl+"/orderSettle/"+name+"/auth", - headers: {'token': localStorage.getItem('token')}, - data: top.reObject(data), - method: 'POST', - success: function (res) { - if (res.code === 200){ - parent.layer.closeAll(); - parent.$(".layui-laypage-btn")[0].click(); - $("#data-detail :input").each(function () { - $(this).val(""); - }); - } else if (res.code === 403){ - top.location.href = baseUrl+"/"; - }else { - layer.msg(res.msg) - } - layer.close(index); + /* 鏄剧ず琛ㄥ崟寮圭獥 */ + function showEditModel(mData) { + admin.open({ + type: 1, + area: '600px', + title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��', + content: $('#editDialog').html(), + success: function (layero, dIndex) { + // 鍥炴樉琛ㄥ崟鏁版嵁 + form.val('detail', mData); + // 琛ㄥ崟鎻愪氦浜嬩欢 + form.on('submit(editSubmit)', function (data) { + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/orderSettle/"+(mData?'update':'add')+"/auth", + headers: {'token': localStorage.getItem('token')}, + data: data.field, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.close(dIndex); + layer.msg(res.msg, {icon: 1}); + $(".layui-laypage-btn")[0].click(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + return false; + }); + // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯 + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); } - }) + }); } + // 澶嶉�夋浜嬩欢 form.on('checkbox(detailCheckbox)', function (data) { @@ -300,88 +240,18 @@ type: 'datetime' }); - }); -// 鍏抽棴鍔ㄤ綔 -$(document).on('click','#data-detail-close', function () { - parent.layer.closeAll(); -}); - -function tableReload(child) { +function tableReload() { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; }); - (child ? parent.tableIns : tableIns).reload({ + tableIns.reload({ where: searchData, page: { curr: pageCurr - }, - done: function (res, curr, count) { - if (res.code === 403) { - top.location.href = baseUrl+"/"; - } - pageCurr=curr; - if (res.data.length === 0 && count !== 0) { - tableIns.reload({ - where: searchData, - page: { - curr: pageCurr-1 - } - }); - pageCurr -= 1; - } - limit(child); } - }); -} - -function setFormVal(el, data, showImg) { - for (var val in data) { - var find = el.find(":input[id='" + val + "']"); - if (find[0]!=null){ - if (find[0].type === 'checkbox'){ - if (data[val]==='Y'){ - find.attr("checked","checked"); - find.val('Y'); - } else { - find.remove("checked"); - find.val('N'); - } - continue; - } - } - find.val(data[val]); - if (showImg){ - var next = find.next(); - if (next.get(0)){ - if (next.get(0).localName === "img") { - find.hide(); - next.attr("src", data[val]); - next.show(); - } - } - } - } -} - -function clearFormVal(el) { - $(':input', el) - .val('') - .removeAttr('checked') - .removeAttr('selected'); -} - -function detailScreen(index) { - var detail = layer.getChildFrame('#data-detail', index); - var height = detail.height()+60; - if (height > ($(window).height()*0.9)) { - height = ($(window).height()*0.8); - } - layer.style(index, { -// top: (($(window).height()-height)/3)+"px", - height: height+'px' }); } diff --git a/src/main/webapp/views/orderSettle/orderSettle.html b/src/main/webapp/views/orderSettle/orderSettle.html index f2fc50c..fb78244 100644 --- a/src/main/webapp/views/orderSettle/orderSettle.html +++ b/src/main/webapp/views/orderSettle/orderSettle.html @@ -7,6 +7,7 @@ <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/admin.css" media="all"> <link rel="stylesheet" href="../../static/css/cool.css" media="all"> <link rel="stylesheet" href="../../static/css/common.css" media="all"> </head> @@ -16,7 +17,7 @@ <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="id" placeholder="缂栧彿" autocomplete="off"> + <input class="layui-input" type="text" name="orderSettle" placeholder="璁㈠崟鐘舵��" autocomplete="off"> </div> </div> @@ -50,8 +51,53 @@ <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/orderSettle/orderSettle.js" charset="utf-8"></script> -<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> - </body> +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="editDialog"> + <form id="detail" lay-filter="detail" class="layui-form admin-form"> + <input name="id" type="hidden"> + <div class="layui-row"> + + <div class="layui-col-md6"> + <div class="layui-form-item"> + <label class="layui-form-label layui-form-required">璁㈠崟鐘舵��</label> + <div class="layui-input-block"> + <input class="layui-input" name="orderSettle" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�" lay-vertype="tips" lay-verify="required"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label layui-form-required">鐘舵��</label> + <div class="layui-input-block"> + <select name="status" lay-vertype="tips" lay-verify="required"> + <option value="">璇烽�夋嫨鐘舵��</option> + <option value="1">姝e父</option> + <option value="0">绂佺敤</option> + </select> + </div> + </div> + </div> + + <div class="layui-col-md6"> + <div class="layui-form-item"> + <label class="layui-form-label layui-form-required">鐘舵�佹弿杩�</label> + <div class="layui-input-block"> + <input class="layui-input" name="settleName" placeholder="璇疯緭鍏ョ姸鎬佹弿杩�" lay-vertype="tips" lay-verify="required"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">澶囨敞:</label> + <div class="layui-input-block"> + <input class="layui-input" name="memo" placeholder="澶囨敞"> + </div> + </div> + </div> + </div> + <hr class="layui-bg-gray"> + <div class="layui-form-item text-right"> + <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button> + <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + </div> + </form> +</script> </html> diff --git a/src/main/webapp/views/orderSettle/orderSettle_detail.html b/src/main/webapp/views/orderSettle/orderSettle_detail.html deleted file mode 100644 index e3864ea..0000000 --- a/src/main/webapp/views/orderSettle/orderSettle_detail.html +++ /dev/null @@ -1,102 +0,0 @@ -<!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"> -</head> -<body> - -<!-- 璇︽儏 --> -<div id="data-detail" class="layer_self_wrap"> - <form id="detail" class="layui-form"> - <!-- - <div class="layui-inline" style="display: none"> - <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label> - <div class="layui-input-inline"> - <input id="id" class="layui-input" type="text" placeholder="缂栧彿"> - </div> - </div> - --> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label"><span class="not-null">*</span>璁㈠崟鐘舵�侊細</label> - <div class="layui-input-inline"> - <input id="orderSettle" class="layui-input" type="text" onkeyup="check(this.id, 'orderSettle')" lay-verify="required|number" > - </div> - </div> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">鐘舵�佹弿杩帮細</label> - <div class="layui-input-inline"> - <input id="settleName" class="layui-input" type="text"> - </div> - </div> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">娣诲姞浜哄憳锛�</label> - <div class="layui-input-inline cool-auto-complete"> - <input id="createBy" class="layui-input" type="text" lay-verify="number" style="display: none"> - <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()> - <div class="cool-auto-complete-window"> - <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">娣诲姞鏃堕棿锛�</label> - <div class="layui-input-inline"> - <input id="createTime$" class="layui-input" type="text" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">淇敼浜哄憳锛�</label> - <div class="layui-input-inline cool-auto-complete"> - <input id="updateBy" class="layui-input" type="text" lay-verify="number" style="display: none"> - <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()> - <div class="cool-auto-complete-window"> - <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">淇敼鏃堕棿锛�</label> - <div class="layui-input-inline"> - <input id="updateTime$" class="layui-input" type="text" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">澶囥��銆�娉細</label> - <div class="layui-input-inline"> - <input id="memo" class="layui-input" type="text"> - </div> - </div> - - - <hr class="layui-bg-gray"> - - <div id="data-detail-btn" class="layui-btn-container layui-form-item"> - <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div> - <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div> - <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div> - </div> - - <div id="prompt"> - 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span> - </div> - </form> -</div> -</body> -<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/orderSettle/orderSettle.js" charset="utf-8"></script> -</html> - -- Gitblit v1.9.1