From 848b345334707e702bdac0710323437ceadde619 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 24 八月 2023 15:25:18 +0800
Subject: [PATCH] #优化
---
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 79 +++++++++++++-------------
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 53 ++++++++++++++++-
2 files changed, 89 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
index 336ced3..57a1388 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -141,7 +141,7 @@
}
}
@RequestMapping(value = "/reimburseOnline/from/add/auth")
- @ManagerAuth(memo = "鎶ラ攢")
+ @ManagerAuth(memo = "娣诲姞鎶ラ攢鍗�")
@Transactional
public R formAdd(@RequestBody ReimburseOnlineDomainParam param){
long planId = 0;
@@ -176,7 +176,7 @@
reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
Map<String, Object> map = new HashMap<>();
map.put("title","闈為」鐩瀷鎶ラ攢");
- map.put("reimburseId",param.getReimburseId());
+ map.put("reimburseId",reimburseOnline.getPlanId$());
map.put("docType",param.getDocType());
map.put("orderNo",param.getOrderNo());
map.put("templateName",param.getTemplateName());
@@ -196,16 +196,61 @@
}
@RequestMapping(value = "/reimburseOnline/from/modify/auth")
+ @ManagerAuth(memo = "淇敼鎶ラ攢鍗�")
@Transactional
public R formModify(@RequestBody ReimburseOnlineDomainParam param){
- System.out.println(param);
+
+ long planId = 0;
+ if (!param.getTemplateName().equals("闈為」鐩瀷鎶ラ攢")){
+ if (Cools.isEmpty(param.getOrderNo())){
+ return R.error("淇敼澶辫触锛�"+param.getTemplateName()+"闇�瑕佸叧鑱旈」鐩彿");
+ }
+ String[] split = param.getOrderNo().split("---");
+ planId = Long.parseLong(split[1]);
+ }
+ Date now = new Date();
+ ReimburseOnline reimburseOnline = reimburseOnlineService.selectById(param.getReimburseId());
+
+ if (!reimburseOnline.getSettle().equals(0)){
+ return R.error("淇敼澶辫触锛佹彁浜や箣鍚庣姝慨鏀癸紒");
+ }
+ if (!reimburseOnline.getUserId().equals(getUserId())){
+ return R.error("闈炲垱寤轰汉鍛樼姝慨鏀癸紒");
+ }
+
+
+ reimburseOnline.setCheckData(param.getCheckData());
+ reimburseOnline.setTemplateName(param.getTemplateName());
+ reimburseOnline.setItemId(planId);
+ reimburseOnline.setUpdateTime(new Date());
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("title",reimburseOnline.getPlanId$());
+ map.put("reimburseId",param.getReimburseId());
+ map.put("docType",param.getDocType());
+ map.put("orderNo",param.getOrderNo());
+ map.put("templateName",param.getTemplateName());
+ map.put("checkData",param.getCheckData());
+ reimburseOnline.setForm(JSON.toJSONString(map));
+
+ if (!reimburseOnlineService.updateById(reimburseOnline)){
+ return R.error("鏇存柊鎶ラ攢涓绘。澶辫触");
+ }
+
+ reimburseOnlineDetlService.delete(new EntityWrapper<ReimburseOnlineDetl>().eq("order_id",reimburseOnline.getId()));
+
+ for (ReimburseOnlineDetl reimburseOnlineDetl:param.getReimburseOnlineDetls()){
+ reimburseOnlineDetl.setOrderId(reimburseOnline.getId());
+ reimburseOnlineDetlService.insert(reimburseOnlineDetl);
+ }
+
return R.ok();
}
@RequestMapping(value = "/reimburseOnline/detl/all/auth")
@Transactional
public R head(@RequestParam Integer reimburseId){
- List<ReimburseOnlineDetl> reimburseOnlineDetls = reimburseOnlineDetlService.selectList(new EntityWrapper<ReimburseOnlineDetl>().eq("reimburse_id", reimburseId));
+ List<ReimburseOnlineDetl> reimburseOnlineDetls = reimburseOnlineDetlService.selectList(new EntityWrapper<ReimburseOnlineDetl>().eq("order_id", reimburseId));
return R.ok().add(reimburseOnlineDetls);
}
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 88ea097..766a7de 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -298,7 +298,7 @@
});
break;
case "edit":
- showEditForm(data);
+ showEditModel(data);
break;
case "look":
var $a = $(obj.tr).find('a[lay-event="look"]');
@@ -474,6 +474,7 @@
// {field: 'updateUserId', title: '鏇存柊浜哄憳ID', width: 160},
{field: 'updateUserName', title: '鏇存柊浜哄憳鍚嶅瓧'},
// {field: 'creationTime', title: '鍒涘缓鏃ユ湡', width: 160}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
done: function (res) {
$(layero).find('.layui-table-view').css('margin', '0');
@@ -690,44 +691,44 @@
// });
// }
- // 鏇存柊form
- function showEditForm(mData) {
- admin.open({
- type: 1,
- area: '800px',
- title: '鏍镐环淇℃伅缂栬緫',
- content: $('#editStatus').html(),
- success: function (layero, dIndex) {
- form.val('editStatusDetail', mData);
- form.render('select')
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/reimburseOnline/updateForm/auth",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- 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)
- }
- }
- })
- layer.close(loadIndex);
- layer.close(dIndex);
- return false;
- });
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
+ // // 鏇存柊form
+ // function showEditForm(mData) {
+ // admin.open({
+ // type: 1,
+ // area: '800px',
+ // title: '鏍镐环淇℃伅缂栬緫',
+ // content: $('#editStatus').html(),
+ // success: function (layero, dIndex) {
+ // form.val('editStatusDetail', mData);
+ // form.render('select')
+ // form.on('submit(editSubmit)', function (data) {
+ // var loadIndex = layer.load(2);
+ // $.ajax({
+ // url: baseUrl+"/reimburseOnline/updateForm/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: data.field,
+ // 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)
+ // }
+ // }
+ // })
+ // layer.close(loadIndex);
+ // layer.close(dIndex);
+ // return false;
+ // });
+ // $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ // layui.form.render('select');
+ // }
+ // });
+ // }
});
--
Gitblit v1.9.1