| src/main/java/com/zy/crm/common/model/SettleDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/crm/manager/controller/PlanController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/crm/manager/entity/Plan.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/plan/plan.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/plan/plan_more.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/crm/common/model/SettleDto.java
New file @@ -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; } } 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("保持失败，请重试"); 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){ 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 { 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) // 设备明细
