From fae5b7ce29b94017025535a2a4e94eb2541637a0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 九月 2023 18:52:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/reimburseOnline/reimburseOnline.html | 15 +++++++++++++++
src/main/resources/mapper/ReimburseOnlineMapper.xml | 2 ++
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java | 7 +++++++
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 5 ++++-
src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java | 2 ++
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 6 +++++-
6 files changed, 35 insertions(+), 2 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 c2cc912..62e9c28 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -92,7 +92,7 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<ReimburseOnline> wrapper = new EntityWrapper<>();
- wrapper.setSqlSelect("id,settle,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
+ wrapper.setSqlSelect("id,settle,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId,name");
// wrapper.in("member_id", getUserRoleBelongsToUserId());
wrapper.andNew();
excludeTrash(param);
@@ -157,6 +157,7 @@
ReimburseOnline reimburseOnline = new ReimburseOnline(planId,RuleUtils.rule(rule),now,getUser());
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
+ reimburseOnline.setName(param.getName());
reimburseOnline.setSettle(0); // 0.鍒涘缓
User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
@@ -181,6 +182,7 @@
map.put("orderNo",param.getOrderNo());
map.put("templateName",param.getTemplateName());
map.put("checkData",param.getCheckData());
+ map.put("name",param.getName());
reimburseOnline.setForm(JSON.toJSONString(map));
reimburseOnline.setMemberId(getUser().getId());
@@ -222,6 +224,7 @@
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
reimburseOnline.setItemId(planId);
+ reimburseOnline.setName(param.getName());
reimburseOnline.setUpdateTime(new Date());
Map<String, Object> map = new HashMap<>();
@@ -231,6 +234,7 @@
map.put("orderNo",param.getOrderNo());
map.put("templateName",param.getTemplateName());
map.put("checkData",param.getCheckData());
+ map.put("name",param.getName());
reimburseOnline.setForm(JSON.toJSONString(map));
if (!reimburseOnlineService.updateById(reimburseOnline)){
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 7112703..d411a3c 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -122,6 +122,13 @@
@TableField("settle_msg")
private String settleMsg;
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ @TableField("name")
+ private String name;
+
public ReimburseOnline() {}
public ReimburseOnline(String title, String sheetData, Date createTime, String filepath) {
diff --git a/src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java b/src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java
index a436004..57958b2 100644
--- a/src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java
+++ b/src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java
@@ -18,5 +18,7 @@
private String checkData;
+ private String name;
+
private List<ReimburseOnlineDetl> reimburseOnlineDetls;
}
diff --git a/src/main/resources/mapper/ReimburseOnlineMapper.xml b/src/main/resources/mapper/ReimburseOnlineMapper.xml
index a5f1b4d..35d3171 100644
--- a/src/main/resources/mapper/ReimburseOnlineMapper.xml
+++ b/src/main/resources/mapper/ReimburseOnlineMapper.xml
@@ -20,6 +20,7 @@
<result column="form" property="form" />
<result column="settle" property="settle" />
<result column="settle_msg" property="settleMsg" />
+ <result column="name" property="name" />
</resultMap>
<!-- 鏌ヨ缁撴灉涓嶅寘鍚玡xcel鏁版嵁data锛屼互鍏嶇粨鏋滈泦杩囧ぇ -->
@@ -35,6 +36,7 @@
<result column="dept_id" property="deptId" />
<result column="status" property="status" />
<result column="update_time" property="updateTime" />
+ <result column="name" property="name" />
</resultMap>
<select id="listByPage" resultMap="NoDataResultMap">
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 42e40a7..daab1de 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -89,6 +89,7 @@
,{field: 'checkData', align: 'center',title: '鏄惁鍐茶处',hide: false}
,{field: 'orderNum', align: 'center',title: '鎶ラ攢鍗曞彿',width: 320, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
,{field: 'planId$', align: 'center',title: '椤圭洰鍙�',hide: false}
+ ,{field: 'name', align: 'center',title: '瀹㈡埛淇℃伅',hide: false}
,{field: 'settle', align: 'center',title: '杩涘害',hide: false}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
@@ -394,6 +395,7 @@
var isExpAdd = !expTpe;
// 鍥炴樉鏁版嵁
form.val('editForm', expTpe);
+ console.log(expTpe)
if (expTpe) {
// $('#orderNo').attr("disabled", "disabled");
}
@@ -421,7 +423,8 @@
orderNo: data.field.planId,
templateName: data.field.templateName,
checkData: data.field.checkData,
- reimburseOnlineDetls: nList
+ reimburseOnlineDetls: nList,
+ name: data.field.name
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
diff --git a/src/main/webapp/views/reimburseOnline/reimburseOnline.html b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
index ac87da2..4c6c8cd 100644
--- a/src/main/webapp/views/reimburseOnline/reimburseOnline.html
+++ b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
@@ -159,6 +159,21 @@
</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="name" placeholder="璇疯緭鍏ュ鎴蜂俊鎭�" style="display: none">
+ <input id="name" name="name" 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="cstmrQueryBydirector"
+ onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="cstmrQueryBydirectorSelect"
+ 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-inline">
<select class="layui-input" name="templateName" lay-vertype="tips" lay-verify="required">
--
Gitblit v1.9.1