From 8bec6dd2d43529e1c065a7bfaf6eaaac38220c7f Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 02 一月 2024 10:21:55 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl_detail.html | 150 ++++++++++ zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html | 188 ++---------- zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java | 30 ++ zy-asrs-wms/src/main/webapp/static/js/adjDetl/adjDetl.js | 504 ++++++++++++++++++--------------- 4 files changed, 488 insertions(+), 384 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java index 82aa100..8831ced 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java @@ -2,7 +2,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.AbstractWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.common.wms.entity.AdjDetl; import com.zy.asrs.common.wms.service.AdjDetlService; @@ -44,6 +47,12 @@ String[] range = timeRange.split(RANGE_TIME_LINK); wrapper.ge(AdjDetl::getAppeTime, DateUtils.convert(range[0])); wrapper.le(AdjDetl::getAppeTime, DateUtils.convert(range[1])); + } + if (!Cools.isEmpty(param.get("loc_no"))) { + wrapper.like(AdjDetl::getLocNo, param.get("loc_no")); + } + if (!Cools.isEmpty(param.get("matnr"))) { + wrapper.like(AdjDetl::getMatnr, param.get("matnr")); } return R.ok(adjDetlService.page(new Page<>(curr, limit), wrapper)); } @@ -103,4 +112,25 @@ return R.ok().add(vos); } + @RequestMapping(value = "/adjDetl/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + LambdaQueryWrapper<AdjDetl> wrapper = new LambdaQueryWrapper<>(); + Map<String, Object> map = excludeTrash(param.getJSONObject("adjDetl")); + if (!Cools.isEmpty(map.get("loc_no"))) { + wrapper.like(AdjDetl::getLocNo, map.get("loc_no")); + } + if (!Cools.isEmpty(map.get("matnr"))) { + wrapper.like(AdjDetl::getMatnr, map.get("matnr")); + } + if (!Cools.isEmpty(map.get("modi_time"))) { + String[] range = map.get("modi_time").toString().split(RANGE_TIME_LINK); + wrapper.ge(AdjDetl::getAppeTime, DateUtils.convert(range[0])); + wrapper.le(AdjDetl::getAppeTime, DateUtils.convert(range[1])); + } + List<AdjDetl> list = adjDetlService.list(wrapper); + return R.ok(exportSupport(list, fields)); + } + } diff --git a/zy-asrs-wms/src/main/webapp/static/js/adjDetl/adjDetl.js b/zy-asrs-wms/src/main/webapp/static/js/adjDetl/adjDetl.js index f53c20b..24daae3 100644 --- a/zy-asrs-wms/src/main/webapp/static/js/adjDetl/adjDetl.js +++ b/zy-asrs-wms/src/main/webapp/static/js/adjDetl/adjDetl.js @@ -1,15 +1,10 @@ var pageCurr; -var pageCount = 0; -layui.config({ - base: baseUrl + "/static/layui/lay/modules/" -}).use(['table','laydate', 'form', 'admin', 'xmSelect'], function(){ +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; - var admin = layui.admin; - var xmSelect = layui.xmSelect; // 鏁版嵁娓叉煋 tableIns = table.render({ @@ -17,30 +12,31 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/adjDetl/page/auth', page: true, - limit: 15, - limits: [15, 30, 50, 100, 200, 500], + limit: 16, + limits: [16, 30, 50, 100, 200, 500], + even: true, toolbar: '#toolbar', cellMinWidth: 50, - height: 'full-120', cols: [[ - {type: 'checkbox'} - ,{field: 'adjId', align: 'center',title: '搴忓彿'} - ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} - ,{field: 'matnr$', align: 'center',title: '鐗╂枡缂栧彿'} - ,{field: 'batch', align: 'center',title: ''} - ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'} + // {type: 'checkbox'} +// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} +// {field: 'adjId', align: 'center',title: '搴忓彿'} + {field: 'locNo', align: 'center',title: '搴撲綅鍙�'} + ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'} + ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'} + // ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'} ,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'} - ,{field: 'oriWt', align: 'center',title: '鍘熼噸閲�'} - ,{field: 'adjCtns', align: 'center',title: '鍙樻洿绠辨暟'} + // ,{field: 'oriWt', align: 'center',title: '鍘熼噸閲�'} + // ,{field: 'adjCtns', align: 'center',title: '鍙樻洿绠辨暟'} ,{field: 'adjQty', align: 'center',title: '鍙樻洿鏁伴噺'} - ,{field: 'adjWt', align: 'center',title: '鍙樻洿閲嶉噺'} - ,{field: 'memo', align: 'center',title: '澶囨敞'} + // ,{field: 'adjWt', align: 'center',title: '鍙樻洿閲嶉噺'} + ,{field: 'memo', align: 'center',title: '澶囨敞',hide:true} ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'} ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'} - ,{field: 'appeUser', align: 'center',title: '鍒涘缓鑰�'} - ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'} + // ,{field: 'appeUser', align: 'center',title: '鍒涘缓鑰�'} + // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'} - ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} + // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100} ]], request: { pageName: 'curr', @@ -61,13 +57,21 @@ if (res.code === 403) { top.location.href = baseUrl+"/"; } - pageCurr=curr;pageCount=count; + pageCurr=curr; limit(); + form.on('checkbox(tableCheckbox)', function (data) { + var _index = $(data.elem).attr('table-index')||0; + if(data.elem.checked){ + res.data[_index][data.value] = 'Y'; + }else{ + res.data[_index][data.value] = 'N'; + } + }); } }); // 鐩戝惉鎺掑簭浜嬩欢 - table.on('sort(adjDetl)', function (obj) { + table.on('sort(locMast)', function (obj) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; @@ -76,28 +80,51 @@ searchData['orderByType'] = obj.type; tableIns.reload({ where: searchData, - page: {curr: 1} + page: { + curr: 1 + }, + done: function (res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + limit(); + } }); }); // 鐩戝惉澶村伐鍏锋爮浜嬩欢 table.on('toolbar(adjDetl)', function (obj) { - var checkStatus = table.checkStatus(obj.config.id).data; + var checkStatus = table.checkStatus(obj.config.id); switch(obj.event) { - case 'addData': - showEditModel(); - break; case 'deleteData': - if (checkStatus.length === 0) { - layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2}); - return; - } - del(checkStatus.map(function (d) { - return d.adjId; - })); - break; + var data = checkStatus.data; + if (data.length === 0){ + layer.msg('璇烽�夋嫨鏁版嵁'); + } else { + layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){ + $.ajax({ + url: baseUrl+"/adjDetl/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: {param: JSON.stringify(data)}, + method: 'POST', + traditional:true, + success: function (res) { + if (res.code === 200){ + layer.closeAll(); + tableReload(false); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg) + } + } + }) + }); + } + break; case 'exportData': - admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){ + layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){ var titles=[]; var fields=[]; obj.config.cols[0].map(function (col) { @@ -128,7 +155,7 @@ } else if (res.code === 403) { top.location.href = baseUrl+"/"; } else { - layer.msg(res.msg, {icon: 2}) + layer.msg(res.msg) } } }); @@ -141,202 +168,143 @@ table.on('tool(adjDetl)', 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: 'adjDetl_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': - showEditModel(data); + layer.open({ + type: 2, + title: '淇敼', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + content: 'adjDetl_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('#adjId', 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'); + } + }); break; - case "del": - del([data.adjId]); - break; + } }); - /* 寮圭獥 - 鏂板銆佷慨鏀� */ - function showEditModel(mData) { - admin.open({ - type: 1, - area: '600px', - title: (mData ? '淇敼' : '娣诲姞') + '', - content: $('#editDialog').html(), - success: function (layero, dIndex) { - form.val('detail', mData); - layDateRender(mData); - form.on('submit(editSubmit)', function (data) { - var loadIndex = layer.load(2); - $.ajax({ - url: baseUrl+"/adjDetl/"+(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}); - tableReload(); - } 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'); - } - }); - } - - /* 鍒犻櫎 */ - function del(ids) { - layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', { - skin: 'layui-layer-admin', - shade: .1 - }, function (i) { - layer.close(i); - var loadIndex = layer.load(2); - $.ajax({ - url: baseUrl+"/adjDetl/delete/auth", - headers: {'token': localStorage.getItem('token')}, - data: {ids: ids}, - method: 'POST', - success: function (res) { - layer.close(loadIndex); - if (res.code === 200){ - layer.msg(res.msg, {icon: 1}); - tableReload(); - } else if (res.code === 403){ - top.location.href = baseUrl+"/"; - } else { - layer.msg(res.msg, {icon: 2}); - } - } - }) - }); - } - - // 鎼滅储 - form.on('submit(search)', function (data) { - pageCurr = 1; - tableReload(true); + // 鏁版嵁淇濆瓨鍔ㄤ綔 + 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(), + adjId: $('#adjId').val(), + locNo: $('#locNo').val(), + matNo: $('#matNo').val(), + oriCtns: $('#oriCtns').val(), + oriQty: $('#oriQty').val(), + oriWt: $('#oriWt').val(), + adjCtns: $('#adjCtns').val(), + adjQty: $('#adjQty').val(), + adjWt: $('#adjWt').val(), + memo: $('#memo').val(), + modiUser: $('#modiUser').val(), + modiTime: top.strToDate($('#modiTime\\$').val()), + appeUser: $('#appeUser').val(), + appeTime: top.strToDate($('#appeTime\\$').val()), + + }; + $.ajax({ + url: baseUrl+"/adjDetl/"+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); + } + }) + } + + // 澶嶉�夋浜嬩欢 + form.on('checkbox(detailCheckbox)', function (data) { + var el = data.elem; + if (el.checked) { + $(el).val('Y'); + } else { + $(el).val('N'); + } + }); + + // 鎼滅储鏍忔悳绱簨浠� + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(false); + }); + + // 鎼滅储鏍忛噸缃簨浠� form.on('submit(reset)', function (data) { pageCurr = 1; clearFormVal($('#search-box')); - tableReload(true); + tableReload(false); }); // 鏃堕棿閫夋嫨鍣� - function layDateRender(data) { - setTimeout(function () { - layDate.render({ - elem: '.layui-laydate-range' - ,type: 'datetime' - ,range: true - }); - layDate.render({ - elem: '#modiTime\\$', - type: 'datetime', - value: data!==undefined?data['modiTime$']:null - }); - layDate.render({ - elem: '#appeTime\\$', - type: 'datetime', - value: data!==undefined?data['appeTime$']:null - }); - - }, 100); - } - layDateRender(); - - window.loadLocMastSel = function () { - return xmSelect.render({ - el: '#locMastXmlSel', - autoRow: true, - filterable: true, - remoteSearch: true, - radio: true, - remoteMethod: function (val, cb, show) { - $.ajax({ - url: baseUrl + "/locMast/all/get/kv", - headers: {'token': localStorage.getItem('token')}, - data: { - condition: val - }, - method: 'POST', - success: function (res) { - if (res.code === 200) { - cb(res.data) - } else { - cb([]); - layer.msg(res.msg, {icon: 2}); - } - } - }); - } - }); - } - - window.loadMatCodeSel = function () { - return xmSelect.render({ - el: '#matCodeXmlSel', - autoRow: true, - filterable: true, - remoteSearch: true, - radio: true, - remoteMethod: function (val, cb, show) { - $.ajax({ - url: baseUrl + "/matCode/all/get/kv", - headers: {'token': localStorage.getItem('token')}, - data: { - condition: val - }, - method: 'POST', - success: function (res) { - if (res.code === 200) { - cb(res.data) - } else { - cb([]); - layer.msg(res.msg, {icon: 2}); - } - } - }); - } - }); - } - - window.loadUserSel = function () { - return xmSelect.render({ - el: '#userXmlSel', - autoRow: true, - filterable: true, - remoteSearch: true, - radio: true, - remoteMethod: function (val, cb, show) { - $.ajax({ - url: baseUrl + "/user/all/get/kv", - headers: {'token': localStorage.getItem('token')}, - data: { - condition: val - }, - method: 'POST', - success: function (res) { - if (res.code === 200) { - cb(res.data) - } else { - cb([]); - layer.msg(res.msg, {icon: 2}); - } - } - }); - } - }); - } - - + layDate.render({ + elem: '#modiTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#appeTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); }); @@ -345,17 +313,85 @@ parent.layer.closeAll(); }); -function tableReload(search) { - if (pageCount === 0 || search) { - let searchData = {}; - $.each($('#search-box [name]').serializeArray(), function() { - searchData[this.name] = this.value; - }); - tableIns.reload({ - where: searchData, - page: {curr: pageCurr} - }); - } else { - $(".layui-laypage-btn")[0].click(); +function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + (child ? parent.tableIns : 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' + }); +} + +$('body').keydown(function () { + if (event.keyCode === 13) { + $("#search").click(); + } +}); diff --git a/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html b/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html index 5e513ed..a5e4cfb 100644 --- a/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html +++ b/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html @@ -7,52 +7,55 @@ <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?v=318" 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 class="layui-fluid"> - <div class="layui-card"> - <div class="layui-card-body"> - <div class="layui-form toolbar" id="search-box"> - <div class="layui-form-item"> - <div class="layui-inline"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 300px"> - <div class="layui-input-inline"> - <input class="layui-input layui-laydate-range" name="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px"> - </div> - </div> - <div class="layui-inline">  - <button class="layui-btn icon-btn" lay-filter="search" lay-submit> - <i class="layui-icon"></i>鎼滅储 - </button> - <button class="layui-btn icon-btn" lay-filter="reset" lay-submit> - <i class="layui-icon"></i>閲嶇疆 - </button> - </div> - </div> - </div> - <table class="layui-hide" id="adjDetl" lay-filter="adjDetl"></table> +<!-- 鎼滅储鏍� --> +<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="loc_no" placeholder="搴撲綅鍙�" autocomplete="off"> </div> + </div> + <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" style="width: 300px"> + <div class="layui-input-inline"> + <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="condition" 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> +<!-- 琛ㄦ牸 --> +<div class="layui-form"> + <table class="layui-hide" id="adjDetl" lay-filter="adjDetl"></table> +</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> - <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</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" style="margin-top: 10px">瀵煎嚭</button> </div> </script> <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-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a> + <!-- <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> @@ -60,124 +63,9 @@ <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/adjDetl/adjDetl.js" charset="utf-8"></script> -</body> -<!-- 琛ㄥ崟寮圭獥 --> -<script type="text/html" id="editDialog"> - <div id="detail" lay-filter="detail" class="layui-form admin-form model-form"> - <input name="id" type="hidden"> - <div class="layui-row"> - <div class="layui-col-md12"> - <div class="layui-form-item"> - <label class="layui-form-label layui-form-required">搴撲綅鍙�: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ュ簱浣嶅彿" lay-vertype="tips" lay-verify="required" style="display: none"> - <input id="locNo$" name="locNo$" 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="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label layui-form-required">鐗╂枡缂栧彿: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" lay-vertype="tips" lay-verify="required" style="display: none"> - <input id="matnr$" name="matnr$" 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="matCodeQueryBymatnr" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="matCodeQueryBymatnrSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">: </label> - <div class="layui-input-block"> - <input class="layui-input" name="batch" placeholder="璇疯緭鍏�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍘熺鏁�: </label> - <div class="layui-input-block"> - <input class="layui-input" name="oriCtns" placeholder="璇疯緭鍏ュ師绠辨暟"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍘熸暟閲�: </label> - <div class="layui-input-block"> - <input class="layui-input" name="oriQty" placeholder="璇疯緭鍏ュ師鏁伴噺"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍘熼噸閲�: </label> - <div class="layui-input-block"> - <input class="layui-input" name="oriWt" placeholder="璇疯緭鍏ュ師閲嶉噺"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍙樻洿绠辨暟: </label> - <div class="layui-input-block"> - <input class="layui-input" name="adjCtns" placeholder="璇疯緭鍏ュ彉鏇寸鏁�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍙樻洿鏁伴噺: </label> - <div class="layui-input-block"> - <input class="layui-input" name="adjQty" placeholder="璇疯緭鍏ュ彉鏇存暟閲�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍙樻洿閲嶉噺: </label> - <div class="layui-input-block"> - <input class="layui-input" name="adjWt" placeholder="璇疯緭鍏ュ彉鏇撮噸閲�"> - </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 class="layui-form-item"> - <label class="layui-form-label">淇敼浜哄憳: </label> - <div class="layui-input-block cool-auto-complete"> - <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none"> - <input id="modiUser$" name="modiUser$" 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="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">淇敼鏃堕棿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">鍒涘缓鑰�: </label> - <div class="layui-input-block"> - <input class="layui-input" name="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��"> - </div> - </div> - <div class="layui-form-item"> - <label class="layui-form-label">娣诲姞鏃堕棿: </label> - <div class="layui-input-block"> - <input class="layui-input" name="appeTime" id="appeTime$" 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> - </div> -</script> +<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> + +</body> </html> diff --git a/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl_detail.html b/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl_detail.html new file mode 100644 index 0000000..872937f --- /dev/null +++ b/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl_detail.html @@ -0,0 +1,150 @@ +<!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="adjId" class="layui-input" type="text" onkeyup="check(this.id, 'adjDetl')" lay-verify="number" > + </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 cool-auto-complete"> + <input id="locNo" class="layui-input" type="text" lay-verify="required" style="display: none"> + <input id="locNo$" 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="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </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 cool-auto-complete"> + <input id="matnr" class="layui-input" type="text" lay-verify="required" style="display: none"> + <input id="matnr$" 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="matCodeQueryBymatnr" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="matCodeQueryBymatnSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">鍘� 绠� 鏁帮細</label> + <div class="layui-input-inline"> + <input id="oriCtns" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍘� 鏁� 閲忥細</label> + <div class="layui-input-inline"> + <input id="oriQty" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">鍘� 閲� 閲忥細</label> + <div class="layui-input-inline"> + <input id="oriWt" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">鍙樻洿绠辨暟锛�</label> + <div class="layui-input-inline"> + <input id="adjCtns" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍙樻洿鏁伴噺锛�</label> + <div class="layui-input-inline"> + <input id="adjQty" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">鍙樻洿閲嶉噺锛�</label> + <div class="layui-input-inline"> + <input id="adjWt" class="layui-input" type="text" lay-verify="number" > + </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> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">淇敼浜哄憳锛�</label> + <div class="layui-input-inline cool-auto-complete"> + <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none"> + <input id="modiUser$" 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="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" 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="modiTime$" class="layui-input" type="text" autocomplete="off"> + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">鍒� 寤� 鑰咃細</label> + <div class="layui-input-inline"> + <input id="appeUser" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">娣诲姞鏃堕棿锛�</label> + <div class="layui-input-inline"> + <input id="appeTime$" class="layui-input" type="text" autocomplete="off"> + </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/adjDetl/adjDetl.js" charset="utf-8"></script> +</html> + -- Gitblit v1.9.1