From 91e3c9e3e76ce7c09e4d9bf2fcb05755fb63a7e9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 13:03:37 +0800
Subject: [PATCH] #规则
---
src/main/java/com/zy/crm/manager/mapper/RuleMapper.java | 12
src/main/webapp/views/reimburseOnline/reimburseOnline.html | 2
src/main/webapp/static/js/rule/rule.js | 249 +++++++++++++++++
src/main/webapp/views/rule/rule.html | 131 +++++++++
src/main/resources/mapper/RuleMapper.xml | 20 +
src/main/java/com/zy/crm/manager/controller/PlanController.java | 2
src/main/java/com/zy/crm/manager/entity/Rule.java | 115 ++++++++
src/main/java/com/zy/crm/manager/controller/RuleController.java | 136 +++++++++
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java | 15
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 7
src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java | 2
src/main/java/com/zy/crm/manager/service/RuleService.java | 9
src/main/java/com/zy/crm/manager/utils/RuleUtils.java | 83 +++++
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 8
src/main/java/com/zy/crm/manager/service/impl/RuleServiceImpl.java | 13
15 files changed, 797 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 920f19e..89c6475 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -575,7 +575,7 @@
for (Plan plan : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", plan.getId());
- map.put("value", plan.getName());
+ map.put("value", plan.getName()+"---"+plan.getId());
result.add(map);
}
return R.ok(result);
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 fff418d..985d3c3 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -108,8 +108,16 @@
}
}
@RequestMapping(value = "/reimburseOnline/from/add/auth")
+ @ManagerAuth(memo = "鎶ラ攢")
@Transactional
public R formAdd(@RequestBody ReimburseOnlineDomainParam param){
+ Date now = new Date();
+ String[] split = param.getOrderNo().split("---");
+ long planId = Long.parseLong(split[1]);
+ ReimburseOnline reimburseOnline = new ReimburseOnline(planId,split[1],now,getUser());
+
+
+
System.out.println(param);
return R.ok();
}
diff --git a/src/main/java/com/zy/crm/manager/controller/RuleController.java b/src/main/java/com/zy/crm/manager/controller/RuleController.java
new file mode 100644
index 0000000..4baed80
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/controller/RuleController.java
@@ -0,0 +1,136 @@
+package com.zy.crm.manager.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.crm.common.web.BaseController;
+import com.zy.crm.manager.entity.Rule;
+import com.zy.crm.manager.service.RuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class RuleController extends BaseController {
+
+ @Autowired
+ private RuleService ruleService;
+
+ @RequestMapping(value = "/rule/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(ruleService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/rule/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Rule> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(ruleService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/rule/add/auth")
+ @ManagerAuth
+ public R add(Rule rule) {
+ if (Cools.isEmpty(rule.getRuleConnector())){
+ rule.setRuleConnector("-");
+ rule.setRuleConnectorType(1);
+ }
+ if (Cools.isEmpty(rule.getRuleConnectorType())){
+ rule.setRuleConnectorType(1);
+ }
+ /*
+ * 瀹氫箟涓�涓鍒欙細澶达細String ruleHeader;浣擄細 String ruleBody;杩炴帴绗︼細String ruleConnector锛涜繛鎺ョ鏄惁鍚敤锛�0锛氬惎鐢紱1锛氫笉鍚敤銆傦細Integer ruleConnectorType锛涜鍒欐柟寮忥紙榛樿1锛氬綋鍓嶆棩鏈熸椂闂存埑锛夛細Integer ruleType锛�
+ * 鏍规嵁瑙勫垯鑷姩鐢熸垚
+ * */
+ ruleService.insert(rule);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rule/update/auth")
+ @ManagerAuth
+ public R update(Rule rule){
+ if (Cools.isEmpty(rule) || null==rule.getId()){
+ return R.error();
+ }
+ ruleService.updateById(rule);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rule/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ ruleService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rule/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<Rule> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("rule"));
+ convert(map, wrapper);
+ List<Rule> list = ruleService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/ruleQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<Rule> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<Rule> page = ruleService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Rule rule : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", rule.getId());
+ map.put("value", rule.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/rule/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<Rule> wrapper = new EntityWrapper<Rule>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != ruleService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(Rule.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
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 5ca5422..d739794 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -7,7 +7,6 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.OrderService;
-import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -55,7 +54,7 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty(value= "椤圭洰id{man_item}")
+ @ApiModelProperty(value= "椤圭洰id{man_item}/planId")
@TableField("item_id")
private Long itemId;
@@ -109,6 +108,18 @@
this.filepath = filepath;
}
+ public ReimburseOnline(Long itemId,String orderNum,Date createTime,User user) {
+ this.itemId = itemId;
+ this.orderNum = orderNum;
+ this.createTime = createTime;
+ this.updateTime = createTime;
+ this.userId = user.getId();
+ this.deptId = user.getDeptId();
+ this.status = 0;
+ this.updateUserId = user.getId();
+ }
+
+
// PriOnline priOnline = new PriOnline(
// null, // excel琛ㄦ爣棰�
// null, // excel琛ㄦ暟鎹�
diff --git a/src/main/java/com/zy/crm/manager/entity/Rule.java b/src/main/java/com/zy/crm/manager/entity/Rule.java
new file mode 100644
index 0000000..2a341a7
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/Rule.java
@@ -0,0 +1,115 @@
+package com.zy.crm.manager.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("sys_rule")
+public class Rule implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 瑙勫垯鏂瑰紡锛堥粯璁�1锛氬綋鍓嶆棩鏈熸椂闂存埑锛�
+ */
+ @ApiModelProperty(value= "瑙勫垯鏂瑰紡锛堥粯璁�1锛氬綋鍓嶆棩鏈熸椂闂存埑锛�")
+ @TableField("rule_type")
+ private Integer ruleType;
+
+ /**
+ * 瑙勫垯澶�
+ */
+ @ApiModelProperty(value= "瑙勫垯澶�")
+ @TableField("rule_header")
+ private String ruleHeader;
+
+ /**
+ * 瑙勫垯浣�
+ */
+ @ApiModelProperty(value= "瑙勫垯浣�")
+ @TableField("rule_body")
+ private String ruleBody;
+
+ /**
+ * 杩炴帴绗︼紙榛樿鈥�-鈥濓級
+ */
+ @ApiModelProperty(value= "杩炴帴绗︼紙榛樿鈥�-鈥濓級")
+ @TableField("rule_connector")
+ private String ruleConnector;
+
+ /**
+ * 杩炴帴绗︽槸鍚﹀惎鐢紙0锛氬惎鐢紱1锛氫笉鍚敤銆傞粯璁�1锛�
+ */
+ @ApiModelProperty(value= "杩炴帴绗︽槸鍚﹀惎鐢紙0锛氬惎鐢紱1锛氫笉鍚敤銆傞粯璁�1锛�")
+ @TableField("rule_connector_type")
+ private Integer ruleConnectorType;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ @TableField("rule_memo")
+ private String ruleMemo;
+
+ /**
+ * 棰勮
+ */
+ @ApiModelProperty(value= "棰勮")
+ @TableField("rule_preview")
+ private String rulePreview;
+
+ /**
+ * 澶囩敤瀛楁1
+ */
+ @ApiModelProperty(value= "澶囩敤瀛楁1")
+ @TableField("rule_standby1")
+ private String ruleStandby1;
+
+ /**
+ * 澶囩敤瀛楁2
+ */
+ @ApiModelProperty(value= "澶囩敤瀛楁2")
+ @TableField("rule_standby2")
+ private String ruleStandby2;
+
+ public Rule() {}
+
+ public Rule(Integer ruleType, String ruleHeader, String ruleBody, String ruleConnector, Integer ruleConnectorType, String ruleMemo, String rulePreview, String ruleStandby1, String ruleStandby2) {
+ this.ruleType = ruleType;
+ this.ruleHeader = ruleHeader;
+ this.ruleBody = ruleBody;
+ this.ruleConnector = ruleConnector;
+ this.ruleConnectorType = ruleConnectorType;
+ this.ruleMemo = ruleMemo;
+ this.rulePreview = rulePreview;
+ this.ruleStandby1 = ruleStandby1;
+ this.ruleStandby2 = ruleStandby2;
+ }
+
+// Rule rule = new Rule(
+// null, // 瑙勫垯鏂瑰紡锛堥粯璁�1锛氬綋鍓嶆棩鏈熸椂闂存埑锛塠闈炵┖]
+// null, // 瑙勫垯澶碵闈炵┖]
+// null, // 瑙勫垯浣揫闈炵┖]
+// null, // 杩炴帴绗︼紙榛樿鈥�-鈥濓級[闈炵┖]
+// null, // 杩炴帴绗︽槸鍚﹀惎鐢紙0锛氬惎鐢紱1锛氫笉鍚敤銆傞粯璁�1锛塠闈炵┖]
+// null, // 澶囨敞
+// null, // 棰勮
+// null, // 澶囩敤瀛楁1
+// null // 澶囩敤瀛楁2
+// );
+
+
+}
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 8b9e8f6..3f4f1bc 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
@@ -1,9 +1,11 @@
package com.zy.crm.manager.entity.param;
import com.zy.crm.manager.entity.ReimburseOnlineDetl;
+import lombok.Data;
import java.util.List;
+@Data
public class ReimburseOnlineDomainParam {
private Integer reimburseId;
diff --git a/src/main/java/com/zy/crm/manager/mapper/RuleMapper.java b/src/main/java/com/zy/crm/manager/mapper/RuleMapper.java
new file mode 100644
index 0000000..d788efc
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/mapper/RuleMapper.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.crm.manager.entity.Rule;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface RuleMapper extends BaseMapper<Rule> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/RuleService.java b/src/main/java/com/zy/crm/manager/service/RuleService.java
new file mode 100644
index 0000000..c9d1cc6
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/RuleService.java
@@ -0,0 +1,9 @@
+package com.zy.crm.manager.service;
+
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.crm.manager.entity.Rule;
+
+public interface RuleService extends IService<Rule> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/RuleServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/RuleServiceImpl.java
new file mode 100644
index 0000000..6f53f71
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/impl/RuleServiceImpl.java
@@ -0,0 +1,13 @@
+package com.zy.crm.manager.service.impl;
+
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.crm.manager.entity.Rule;
+import com.zy.crm.manager.mapper.RuleMapper;
+import com.zy.crm.manager.service.RuleService;
+import org.springframework.stereotype.Service;
+
+@Service("ruleService")
+public class RuleServiceImpl extends ServiceImpl<RuleMapper, Rule> implements RuleService {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/utils/RuleUtils.java b/src/main/java/com/zy/crm/manager/utils/RuleUtils.java
new file mode 100644
index 0000000..6274793
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/utils/RuleUtils.java
@@ -0,0 +1,83 @@
+package com.zy.crm.manager.utils;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Random;
+
+public class RuleUtils {
+ private String ruleHeader;
+ private String ruleBody;
+ private String ruleConnector;
+ private int ruleConnectorType;
+ private int ruleType;
+
+ public RuleUtils(String ruleHeader, String ruleBody, String ruleConnector, int ruleConnectorType, int ruleType) {
+ this.ruleHeader = ruleHeader;
+ this.ruleBody = ruleBody;
+ this.ruleConnector = ruleConnector;
+ this.ruleConnectorType = ruleConnectorType;
+ this.ruleType = ruleType;
+ }
+
+ public String generateString() {
+ StringBuilder sb = new StringBuilder();
+
+ // 娣诲姞澶撮儴
+ sb.append(ruleHeader);
+
+ // 鏍规嵁瑙勫垯鏂瑰紡鐢熸垚鏃ユ湡鏃堕棿鎴虫垨闅忔満瀛楃涓�
+ String ruleValue = "";
+ if (ruleType == 1) {
+ ruleValue = String.valueOf(System.currentTimeMillis());
+ } else if (ruleType == 2) {
+ ruleValue = generateRandomString(10); // 鐢熸垚闀垮害涓�10鐨勯殢鏈哄瓧绗︿覆
+ } else if (ruleType == 3) {
+ ruleValue = generateCustomTimestamp(); // 鑷畾涔夌敓鎴愭棩鏈熸椂闂存埑鐨勯�昏緫
+ }
+
+ // 娣诲姞瑙勫垯鍊煎埌瀛楃涓蹭綋
+ sb.append(ruleBody);
+ sb.append(ruleValue);
+
+ // 娣诲姞杩炴帴绗︼紙濡傛灉鍚敤锛�
+ if (ruleConnectorType == 0) {
+ sb.append(ruleConnector);
+ }
+
+ return sb.toString();
+ }
+
+ private String generateRandomString(int length) {
+ // 鐢熸垚鎸囧畾闀垮害鐨勯殢鏈哄瓧绗︿覆鐨勯�昏緫
+ String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+ StringBuilder sb = new StringBuilder();
+
+ Random random = new Random();
+ for (int i = 0; i < length; i++) {
+ int index = random.nextInt(characters.length());
+ char randomChar = characters.charAt(index);
+ sb.append(randomChar);
+ }
+
+ return sb.toString(); // 杩斿洖鐢熸垚鐨勯殢鏈哄瓧绗︿覆
+ }
+
+ private String generateCustomTimestamp() {
+ // 鑷畾涔夌敓鎴愭棩鏈熸椂闂存埑鐨勯�昏緫
+ LocalDateTime now = LocalDateTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ return now.format(formatter);// 杩斿洖鐢熸垚鐨勮嚜瀹氫箟鏃ユ湡鏃堕棿鎴�
+ }
+
+ public static void main(String[] args) {
+ String ruleHeader = "Header: ";
+ String ruleBody = "Timestamp: ";
+ String ruleConnector = "-";
+ int ruleConnectorType = 0;
+ int ruleType = 1;
+
+ RuleUtils generator = new RuleUtils(ruleHeader, ruleBody, ruleConnector, ruleConnectorType, ruleType);
+ String generatedString = generator.generateString();
+ System.out.println(generatedString);
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/mapper/RuleMapper.xml b/src/main/resources/mapper/RuleMapper.xml
new file mode 100644
index 0000000..a96f231
--- /dev/null
+++ b/src/main/resources/mapper/RuleMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.crm.manager.mapper.RuleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.Rule">
+ <id column="id" property="id" />
+ <result column="rule_type" property="ruleType" />
+ <result column="rule_header" property="ruleHeader" />
+ <result column="rule_body" property="ruleBody" />
+ <result column="rule_connector" property="ruleConnector" />
+ <result column="rule_connector_type" property="ruleConnectorType" />
+ <result column="rule_memo" property="ruleMemo" />
+ <result column="rule_preview" property="rulePreview" />
+ <result column="rule_standby1" property="ruleStandby1" />
+ <result column="rule_standby2" property="ruleStandby2" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 6cd9c1c..de19404 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -482,14 +482,15 @@
url: baseUrl+"/reimburseOnline/from/" + (isExpAdd?"add":"modify") + "/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- orderId: Number(data.field.id),
+ reimburseId: Number(data.field.id),
docType: Number(data.field.docType),
- orderNo: data.field.orderNo,
- orderDetlList: nList
+ orderNo: data.field.planId,
+ reimburseOnlineDetls: nList
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
+ console.log(data)
layer.closeAll('loading');
if (res.code === 200){
layer.close(dIndex);
diff --git a/src/main/webapp/static/js/rule/rule.js b/src/main/webapp/static/js/rule/rule.js
new file mode 100644
index 0000000..53ed583
--- /dev/null
+++ b/src/main/webapp/static/js/rule/rule.js
@@ -0,0 +1,249 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#rule',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/rule/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'ruleType', align: 'center',title: '瑙勫垯鏂瑰紡锛堥粯璁�1锛氬綋鍓嶆棩鏈熸椂闂存埑锛�'}
+ ,{field: 'ruleHeader', align: 'center',title: '瑙勫垯澶�'}
+ ,{field: 'ruleBody', align: 'center',title: '瑙勫垯浣�'}
+ ,{field: 'ruleConnector', align: 'center',title: '杩炴帴绗︼紙榛樿鈥�-鈥濓級'}
+ ,{field: 'ruleConnectorType', align: 'center',title: '杩炴帴绗︽槸鍚﹀惎鐢紙0锛氬惎鐢紱1锛氫笉鍚敤銆傞粯璁�1锛�'}
+ ,{field: 'ruleMemo', align: 'center',title: '澶囨敞'}
+ ,{field: 'rulePreview', align: 'center',title: '棰勮'}
+ ,{field: 'ruleStandby1', align: 'center',title: '澶囩敤瀛楁1'}
+ ,{field: 'ruleStandby2', align: 'center',title: '澶囩敤瀛楁2'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(rule)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(rule)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'rule': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/rule/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(rule)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/rule/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/rule/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/reimburseOnline/reimburseOnline.html b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
index c2b407a..313de83 100644
--- a/src/main/webapp/views/reimburseOnline/reimburseOnline.html
+++ b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
@@ -135,7 +135,7 @@
<label class="layui-form-label layui-form-required">椤圭洰鍚�: </label>
<div class="layui-input-block cool-auto-complete">
<input class="layui-input" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none" lay-verify="required">
- <input id="planId$" name="planId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩悕" onfocus=this.blur()>
+ <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'))">
<select class="cool-auto-complete-window-select" data-key="planQueryNameBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
diff --git a/src/main/webapp/views/rule/rule.html b/src/main/webapp/views/rule/rule.html
new file mode 100644
index 0000000..8a7d26a
--- /dev/null
+++ b/src/main/webapp/views/rule/rule.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="rule" lay-filter="rule"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/rule/rule.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瑙勫垯鏂瑰紡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ruleType" placeholder="璇疯緭鍏ヨ鍒欐柟寮忥紙榛樿1锛氬綋鍓嶆棩鏈熸椂闂存埑锛�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瑙勫垯澶�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ruleHeader" placeholder="璇疯緭鍏ヨ鍒欏ご" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瑙勫垯浣�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ruleBody" placeholder="璇疯緭鍏ヨ鍒欎綋" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">杩炴帴绗�(榛樿"-"): </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ruleConnector" placeholder="璇疯緭鍏ヨ繛鎺ョ锛堥粯璁も��-鈥濓級" lay-vertype="tips">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">杩炴帴绗︽槸鍚﹀惎鐢�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ruleConnectorType" placeholder="璇疯緭鍏ヨ繛鎺ョ鏄惁鍚敤锛�0锛氬惎鐢紱1锛氫笉鍚敤銆傞粯璁や笉鍚敤锛�" lay-vertype="tips">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ruleMemo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">棰勮: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="rulePreview" placeholder="璇疯緭鍏ラ瑙�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">澶囩敤瀛楁1: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="ruleStandby1" placeholder="璇疯緭鍏ュ鐢ㄥ瓧娈�1">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">澶囩敤瀛楁2: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="ruleStandby2" placeholder="璇疯緭鍏ュ鐢ㄥ瓧娈�2">-->
+<!-- </div>-->
+<!-- </div>-->
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1