From 247287298f3b6b45501f0d6819cca70b2c8077b8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 13:50:48 +0800
Subject: [PATCH] #规则完善
---
src/main/webapp/views/rule/rule.html | 27 +++++++++++++++++++++------
src/main/java/com/zy/crm/manager/entity/Rule.java | 20 +++++++++++++++++---
src/main/webapp/static/js/rule/rule.js | 4 ++--
3 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/Rule.java b/src/main/java/com/zy/crm/manager/entity/Rule.java
index e82c934..71de11a 100644
--- a/src/main/java/com/zy/crm/manager/entity/Rule.java
+++ b/src/main/java/com/zy/crm/manager/entity/Rule.java
@@ -103,6 +103,20 @@
this.ruleStandby2 = ruleStandby2;
}
+ public String getRuleType$(){
+ if (null == this.ruleType){ return null; }
+ switch (this.ruleType){
+ case 1:
+ return "鐢熸垚褰撳墠鏃ユ湡鏃堕棿鎴�";
+ case 2:
+ return "鐢熸垚闀垮害涓�10鐨勯殢鏈哄瓧绗︿覆";
+ case 3:
+ return "鐢熸垚鏃ユ湡鏃堕棿瀛楃涓�";
+ default:
+ return String.valueOf(this.ruleType);
+ }
+ }
+
public String getRuleConnectorType$(){
if (null == this.ruleConnectorType){ return null; }
switch (this.ruleConnectorType){
@@ -116,12 +130,12 @@
}
public String getRuleConnector$(){
- if (null == this.ruleConnectorType){ return null; }
+ if (null == this.ruleConnector){ return null; }
switch (this.ruleConnector){
case "-":
- return "榛樿'-'";
+ return "榛樿:-";
default:
- return String.valueOf(this.ruleConnectorType);
+ return String.valueOf(this.ruleConnector);
}
}
diff --git a/src/main/webapp/static/js/rule/rule.js b/src/main/webapp/static/js/rule/rule.js
index 6907f1d..5043c77 100644
--- a/src/main/webapp/static/js/rule/rule.js
+++ b/src/main/webapp/static/js/rule/rule.js
@@ -23,10 +23,10 @@
cols: [[
// {type: 'checkbox'},
{field: 'id', align: 'center',title: 'ID',width: 80, hide:true}
- ,{field: 'ruleType', align: 'center',title: '瑙勫垯鏂瑰紡', hide:false}
+ ,{field: 'ruleType$', align: 'center',title: '瑙勫垯鏂瑰紡', hide:false}
,{field: 'ruleHeader', align: 'center',title: '瑙勫垯澶�', hide:false}
,{field: 'ruleBody', align: 'center',title: '瑙勫垯浣�', hide:false}
- ,{field: 'ruleConnector', align: 'center',title: '杩炴帴绗�', hide:false}
+ ,{field: 'ruleConnector$', align: 'center',title: '杩炴帴绗�', hide:false}
,{field: 'ruleConnectorType$', align: 'center',title: '杩炴帴绗︽槸鍚﹀惎鐢�', hide:false}
,{field: 'ruleMemo', align: 'center',title: '澶囨敞', hide:false}
,{field: 'rulePreview', align: 'center',title: '棰勮',width: 350, hide:false}
diff --git a/src/main/webapp/views/rule/rule.html b/src/main/webapp/views/rule/rule.html
index 8a7d26a..1f7269f 100644
--- a/src/main/webapp/views/rule/rule.html
+++ b/src/main/webapp/views/rule/rule.html
@@ -65,8 +65,13 @@
<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 class="layui-input-inline">
+ <select class="layui-input" name="ruleType" lay-vertype="tips" lay-verify="required">
+ <option style="display: none"></option>
+ <option value="1">鐢熸垚褰撳墠鏃ユ湡鏃堕棿鎴�</option>
+ <option value="2">鐢熸垚闀垮害涓�10鐨勯殢鏈哄瓧绗︿覆</option>
+ <option value="3">鐢熸垚鏃ユ湡鏃堕棿瀛楃涓�</option>
+ </select>
</div>
</div>
<div class="layui-form-item">
@@ -83,14 +88,24 @@
</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 class="layui-input-inline">
+ <select class="layui-input" name="ruleConnector" lay-vertype="tips">
+ <option style="display: none"></option>
+ <option value="-">-</option>
+ <option value="--">--</option>
+ <option value="---">---</option>
+ <option value="-.-">-.-</option>
+ </select>
</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 class="layui-input-inline">
+ <select class="layui-input" name="ruleConnectorType" lay-vertype="tips">
+ <option style="display: none"></option>
+ <option value="1">涓嶅惎鐢�</option>
+ <option value="0">鍚敤</option>
+ </select>
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1