From c411a088e0357025106076d630e3dce6a3635346 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 24 十一月 2022 14:20:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 2
src/main/java/com/zy/crm/common/model/SettleDto.java | 68 ++++++++++++++++++++++
src/main/webapp/views/plan/plan_more.html | 67 +++++++++++++++++----
src/main/webapp/views/plan/plan.html | 1
src/main/java/com/zy/crm/manager/entity/Plan.java | 20 ++++++
5 files changed, 143 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/model/SettleDto.java b/src/main/java/com/zy/crm/common/model/SettleDto.java
new file mode 100644
index 0000000..992de7d
--- /dev/null
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -0,0 +1,68 @@
+package com.zy.crm.common.model;
+
+import com.core.common.DateUtils;
+import com.zy.crm.manager.entity.Plan;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/11/24
+ */
+@Data
+public class SettleDto {
+
+ private Integer step;
+
+ private String title;
+
+ private String msg;
+
+ private Long userId;
+
+ private String username;
+
+ private String time;
+
+ public static List<SettleDto> init(Plan plan) {
+ List<SettleDto> list = new ArrayList<>();
+ for (int i = 1; i < 8; i++) {
+ SettleDto dto = new SettleDto();
+ dto.setStep(i);
+ switch (i) {
+ case 1:
+ dto.setTitle("寮�濮�");
+ dto.setMsg(plan.getUserId$() + "鍒涘缓浜嗗鎵�");
+ dto.setUserId(plan.getUserId());
+ dto.setUsername(plan.getUserId$());
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ case 2:
+ dto.setTitle("缁勯暱寰呭");
+ break;
+ case 3:
+ dto.setTitle("缁勯暱瀹℃牳");
+ break;
+ case 4:
+ dto.setTitle("瑙勫垝寰呭");
+ break;
+ case 5:
+ dto.setTitle("瑙勫垝瀹℃牳");
+ break;
+ case 6:
+ dto.setTitle("瀹℃壒涓�");
+ break;
+ case 7:
+ dto.setTitle("瀹℃壒閫氳繃");
+ break;
+ default:
+ break;
+ }
+ list.add(dto);
+ }
+ return list;
+ }
+
+}
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 caa7561..a746b9e 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -11,6 +11,7 @@
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
+import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.Plan;
@@ -115,6 +116,7 @@
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
plan.setSettle(1); // 1.寮�濮�
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan)));
if (!planService.insert(plan)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
diff --git a/src/main/java/com/zy/crm/manager/entity/Plan.java b/src/main/java/com/zy/crm/manager/entity/Plan.java
index 606eb5f..409e3e9 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -401,6 +401,26 @@
}
}
+ public Integer getStepOfSettle(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 1:
+ return 1;
+ case 2:
+ case 3:
+ return 2;
+ case 4:
+ case 5:
+ return 3;
+ case 6:
+ return 4;
+ case 7:
+ return 4;
+ default:
+ return 0;
+ }
+ }
+
public String getSettle$(){
if (null == this.settle){ return null; }
switch (this.settle){
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 8ce4794..be9a17b 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -10,7 +10,6 @@
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/tree.css" media="all">
- <link rel="stylesheet" href="../../static/css/tree.css" media="all">
<link rel="stylesheet" href="../../static/layui/lay/modules/formDesigner/coolForm.css" />
<style>
.nav-box {
diff --git a/src/main/webapp/views/plan/plan_more.html b/src/main/webapp/views/plan/plan_more.html
index 5d6131a..295f27d 100644
--- a/src/main/webapp/views/plan/plan_more.html
+++ b/src/main/webapp/views/plan/plan_more.html
@@ -49,29 +49,29 @@
<span style="opacity: .5;font-size: small;margin-left: 5px">鍞墠瑙勫垝鐢宠鍗�</span>
</div>
</div>
- <div class="layui-card-body">
+ <div class="layui-card-body" style="padding: 30px 20px">
<div class="layui-tab layui-steps">
<ul class="layui-tab-title">
- <li>
+ <li id="step-1" style="pointer-events: none">
<i class="layui-icon layui-icon-ok">1</i>
- <span class="layui-steps-title">宸插畬鎴�</span>
- <span class="layui-steps-content">杩欓噷鏄姝ラ鐨勬弿杩颁俊鎭�</span>
+ <span class="layui-steps-title">寮�濮�</span>
+ <span class="layui-steps-content"></span>
</li>
- <li class="layui-this">
+ <li id="step-2" style="pointer-events: none">
<i class="layui-icon layui-icon-ok">2</i>
- <span class="layui-steps-title">杩涜涓�</span>
- <span class="layui-steps-content">杩欓噷鏄姝ラ鐨勬弿杩颁俊鎭�</span>
+ <span class="layui-steps-title">鏈粍缁勯暱瀹℃牳</span>
+ <span class="layui-steps-content"></span>
</li>
- <li>
+ <li id="step-3" style="pointer-events: none">
<i class="layui-icon layui-icon-ok">3</i>
- <span class="layui-steps-title">寰呰繘琛�</span>
- <span class="layui-steps-content">杩欓噷鏄姝ラ鐨勬弿杩颁俊鎭�</span>
+ <span class="layui-steps-title">鍞墠瑙勫垝</span>
+ <span class="layui-steps-content"></span>
</li>
- <li>
+ <li id="step-4" class="layui-this" style="pointer-events: none">
<i class="layui-icon layui-icon-ok">4</i>
- <span class="layui-steps-title">寰呰繘琛�</span>
- <span class="layui-steps-content">杩欓噷鏄姝ラ鐨勬弿杩颁俊鎭�</span>
+ <span class="layui-steps-title">瀹℃壒閫氳繃</span>
+ <span class="layui-steps-content"></span>
</li>
</ul>
</div>
@@ -226,8 +226,45 @@
</div>
</div>
</div>
- <!-- 璺熻繘浜� -->
+ <!-- 鍔ㄦ�� -->
<div class="layui-col-md3" style="width: 24%;margin-left: 1%">
+ <!-- 鏃堕棿绾� -->
+ <div class="layui-card">
+ <div class="layui-card-header">
+ <span>鍞墠瑙勫垝娓呭崟</span>
+ </div>
+ <div class="layui-card-body">
+ <ul class="layui-timeline">
+ <li class="layui-timeline-item">
+ <i class="layui-icon layui-timeline-axis"></i>
+ <div class="layui-timeline-content layui-text">
+ <h3 class="layui-timeline-title">8鏈�18鏃�</h3>
+ <p>
+ layui 2.0 鐨勪竴鍒囧噯澶囧伐浣滀技涔庨兘宸插埌浣嶃�傚彂甯冧箣寮︼紝涓�瑙﹀嵆鍙戙��
+ </p>
+ </div>
+ </li>
+ <li class="layui-timeline-item">
+ <i class="layui-icon layui-timeline-axis"></i>
+ <div class="layui-timeline-content layui-text">
+ <h3 class="layui-timeline-title">8鏈�16鏃�</h3>
+ <p>鏉滅敨鐨勬�濇兂鏍稿績鏄剴瀹剁殑浠佹斂鎬濇兂锛屼粬鏈夆��<em>鑷村悰灏ц垳涓婏紝鍐嶄娇椋庝織娣�</em>鈥濈殑瀹忎紵鎶辫礋銆備釜浜烘渶鐖辩殑鍚嶇瘒鏈夛細</p>
+ <ul>
+ <li>銆婄櫥楂樸��</li>
+ <li>銆婅寘灞嬩负绉嬮鎵�鐮存瓕銆�</li>
+ </ul>
+ </div>
+ </li>
+ <li class="layui-timeline-item">
+ <i class="layui-icon layui-timeline-axis"></i>
+ <div class="layui-timeline-content layui-text">
+ <div class="layui-timeline-title">杩囧幓</div>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <!-- 璺熻繘浜� -->
<div class="layui-card">
<div class="layui-card-header">
<span>璺熻繘浜�</span>
@@ -303,6 +340,8 @@
let plan = res.data;
top.planByMore = null;
$("#form-name").html(plan.name);
+ // 杩涘害姝ラ鍥�
+
// 琛ュ厖html
$('#customizeBox').html(plan.formHtml)
// 璁惧鏄庣粏
--
Gitblit v1.9.1