From 9468f9216cb9a72af52d5a51e658b5a0b5dc92d4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 27 八月 2021 16:20:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/controller/WaitMatinController.java | 29 ++++++++++++++++++++++++-----
src/main/webapp/static/js/waitMatin/waitMatin.js | 25 +++++++++++++++++++++++++
src/main/webapp/views/waitMatin/waitMatin.html | 2 +-
3 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index 55e5013..e84ac49 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -146,14 +146,33 @@
return R.ok("娣诲姞鎴愬姛");
}
- @RequestMapping(value = "/waitMatin/update/auth")
+ @RequestMapping(value = "/waitMatin/modify/auth")
@ManagerAuth
- public R update(WaitMatin waitMatin){
- if (Cools.isEmpty(waitMatin) || null==waitMatin.getSeqNo()){
+ @Transactional
+ public R update(@RequestBody List<WaitMatin> waitMatins){
+ if (Cools.isEmpty(waitMatins)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ Date now = new Date();
+ List<WaitMatin> oldWaitMatin = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo()));
+ Date appeTime = oldWaitMatin!=null?oldWaitMatin.get(0).getAppeTime():now;
+ Long appeUser = oldWaitMatin!=null?oldWaitMatin.get(0).getAppeUser():getUserId();
+ if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo()))) {
return R.error();
}
- waitMatinService.updateById(waitMatin);
- return R.ok();
+ int i = 1;
+ for (WaitMatin waitMatin : waitMatins) {
+ waitMatin.setSeqNo(i);
+ waitMatin.setAppeTime(appeTime);
+ waitMatin.setAppeUser(appeUser);
+ waitMatin.setModiTime(now);
+ waitMatin.setModiUser(getUserId());
+ if (!waitMatinService.insert(waitMatin)) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏澶辫触");
+ }
+ i++;
+ }
+ return R.ok("淇敼鎴愬姛");
}
@RequestMapping(value = "/waitMatin/delete/auth")
diff --git a/src/main/webapp/static/js/waitMatin/waitMatin.js b/src/main/webapp/static/js/waitMatin/waitMatin.js
index 91cf79f..6c2059d 100644
--- a/src/main/webapp/static/js/waitMatin/waitMatin.js
+++ b/src/main/webapp/static/js/waitMatin/waitMatin.js
@@ -133,11 +133,15 @@
content: $('#editDialog').html(),
area: '700px',
success: function (layero, dIndex) {
+
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
var isExpAdd = !expTpe;
// 鍥炴樉鏁版嵁
form.val('editForm', expTpe);
+ if (expTpe) {
+ $('#billNo').attr("disabled", "disabled");
+ }
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(waitMatinEditSubmit)', function (data) {
// 缁勮鏁版嵁
@@ -183,6 +187,27 @@
}
}
})
+ } else {
+ layer.load(2);
+ $.ajax({
+ url: baseUrl+"/waitMatin/modify/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ layer.close(dIndex);
+ insTb.reload({page: {curr: 1}});
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
}
return false;
});
diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index 3183123..230dfc5 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -92,7 +92,7 @@
<div class="layui-form-item">
<label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-block">
- <input name="billNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+ <input id="billNo" name="billNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item" style="position: relative;">
--
Gitblit v1.9.1