From b46fcd19ae06a89f230c0d53ef51780404f494c9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 14:41:43 +0800
Subject: [PATCH] #报销完善
---
src/main/webapp/views/reimburseOnline/reimburseOnline.html | 4 ++--
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java | 4 ++--
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 2 +-
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 10 ++++++++--
4 files changed, 13 insertions(+), 7 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 47efc32..9a291cc 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -111,9 +111,15 @@
@ManagerAuth(memo = "鎶ラ攢")
@Transactional
public R formAdd(@RequestBody ReimburseOnlineDomainParam 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();
- String[] split = param.getOrderNo().split("---");
- long planId = Long.parseLong(split[1]);
Rule rule = ruleService.selectById(1);
ReimburseOnline reimburseOnline = new ReimburseOnline(planId,RuleUtils.rule(rule),now,getUser());
reimburseOnline.setMemberId(getUserId());
diff --git a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
index 2d7ab4b..2c8193a 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -153,9 +153,9 @@
OrderService orderService = SpringUtils.getBean(OrderService.class);
Order order = orderService.selectById(this.itemId);
if (!Cools.isEmpty(order)){
- return String.valueOf(order.getUuid());
+ return String.valueOf(order.getUuid()+"---"+order.getName());
}
- return null;
+ return "闈為」鐩瀷鎶ラ攢";
}
public String getUser$() {
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 41ebe1e..4909edc 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -87,7 +87,7 @@
,{field: 'templateName', align: 'center',title: '鎶ラ攢绫诲瀷',hide: false}
,{field: 'checkData', align: 'center',title: '鏄惁鍐茶处',hide: false}
,{field: 'orderNum', align: 'center',title: '鎶ラ攢鍗曞彿',width: 320, hide:false}
- ,{field: 'itemId', align: 'center',title: '椤圭洰鍙�',hide: false}
+ ,{field: 'planId$', align: 'center',title: '椤圭洰鍙�',hide: false}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
,{field: 'status$', align: 'center',title: '鐘舵��',hide: false}
diff --git a/src/main/webapp/views/reimburseOnline/reimburseOnline.html b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
index 43dbf0a..0a31442 100644
--- a/src/main/webapp/views/reimburseOnline/reimburseOnline.html
+++ b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
@@ -132,9 +132,9 @@
<form id="editForm" lay-filter="editForm" class="layui-form model-form">
<input name="id" type="hidden"/>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰鍚�: </label>
+ <label class="layui-form-label">椤圭洰鍚�: </label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none" lay-verify="required">
+ <input class="layui-input" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none">
<input id="planId$" name="planId" 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="planQueryNameBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
--
Gitblit v1.9.1