From b1b78ed80b8bc68c31b7c8ab006bda8899b9b0f4 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 20 六月 2020 15:15:19 +0800 Subject: [PATCH] # --- src/main/webapp/views/locMast/locMast_detail.html | 32 ++++++++++++++++---------------- src/main/java/com/zy/asrs/controller/LocMastController.java | 8 ++++++++ src/main/webapp/static/js/locMast/locMast.js | 4 ++-- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index fd8bade..af143d0 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -10,6 +10,7 @@ import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; +import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; import com.zy.asrs.entity.param.LocMastInitParam; import com.zy.asrs.service.LocDetlService; @@ -87,6 +88,13 @@ if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){ return R.error(); } + LocMast oldLocMast = locMastService.selectById(locMast.getLocNo()); + // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁� + if (oldLocMast.getLocType().equals("R") || oldLocMast.getLocType().equals("F")) { + if (locMast.getLocType().equals("O") || locMast.getLocType().equals("D")) { + locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo())); + } + } locMast.setModiUser(getUserId()); locMast.setModiTime(new Date()); locMastService.updateById(locMast); diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js index 83ea416..3e4455b 100644 --- a/src/main/webapp/static/js/locMast/locMast.js +++ b/src/main/webapp/static/js/locMast/locMast.js @@ -257,13 +257,13 @@ type: 2, title: '淇敼', maxmin: true, - area: [top.detailWidth, top.detailHeight], + area: ['500px', top.detailHeight], shadeClose: false, content: 'locMast_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('#data-detail :input', index), false); top.convertDisabled(layer.getChildFrame('#locNo', 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'); diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html index ea48fce..218edf1 100644 --- a/src/main/webapp/views/locMast/locMast_detail.html +++ b/src/main/webapp/views/locMast/locMast_detail.html @@ -14,7 +14,7 @@ <!-- 璇︽儏 --> <div id="data-detail" class="layer_self_wrap"> - <form id="detail" class="layui-form"> + <form id="detail" class="layui-form" style="text-align: center"> <!-- <div class="layui-inline" style="display: none"> <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label> @@ -23,13 +23,13 @@ </div> </div> --> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline" style="width:80%;"> <label class="layui-form-label"><span class="not-null">*</span>搴� 浣� 鍙凤細</label> <div class="layui-input-inline"> <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locMast')"> </div> </div> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline" style="width:80%;display: none"> <label class="layui-form-label">搴撲綅绫诲瀷锛�</label> <div class="layui-input-inline cool-auto-complete"> <input id="whsType" class="layui-input" type="text" style="display: none"> @@ -65,37 +65,37 @@ <input id="sheetNo" class="layui-input" type="text"> </div> </div> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label> <div class="layui-input-inline"> - <input id="crnNo" class="layui-input" type="text"> + <input id="crnNo" class="layui-input" type="text" disabled="disabled"> </div> </div> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">鎺掞細</label> <div class="layui-input-inline"> - <input id="row1" class="layui-input" type="text"> + <input id="row1" class="layui-input" type="text" disabled="disabled"> </div> </div> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">鍒楋細</label> <div class="layui-input-inline"> - <input id="bay1" class="layui-input" type="text"> + <input id="bay1" class="layui-input" type="text" disabled="disabled"> </div> </div> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">灞傦細</label> <div class="layui-input-inline"> - <input id="lev1" class="layui-input" type="text"> + <input id="lev1" class="layui-input" type="text" disabled="disabled"> </div> </div> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">婊°��銆�鏉匡細</label> - <div class="layui-input-inline"> + <div class="layui-input-inline" style="text-align: left"> <input id="fullPlt" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'> </div> </div> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline" style="width:80%;"> <label class="layui-form-label"><span class="not-null">*</span>搴撲綅鐘舵�侊細</label> <div class="layui-input-inline cool-auto-complete"> <input id="locType" class="layui-input" type="text" style="display: none" lay-verify="required" > @@ -225,8 +225,8 @@ <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 id="prompt" style="text-indent: 30px;"> + <span class="not-null">娓╅Θ鎻愮ず锛氫慨鏀逛负绌哄簱浣嶆椂浼氭竻闄ゅ簱瀛樻槑缁�</span> </div> </form> </div> -- Gitblit v1.9.1