src/main/java/com/zy/crm/manager/controller/PlanController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/js/plan/plan.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -15,8 +15,10 @@ import com.zy.crm.manager.controller.result.FollowerTableVo; import com.zy.crm.manager.entity.Plan; import com.zy.crm.manager.entity.PlanFoll; import com.zy.crm.manager.entity.PlanType; import com.zy.crm.manager.service.PlanFollService; import com.zy.crm.manager.service.PlanService; import com.zy.crm.manager.service.PlanTypeService; import com.zy.crm.system.entity.User; import com.zy.crm.system.service.UserService; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -39,11 +41,25 @@ @Autowired private PlanService planService; @Autowired private PlanTypeService planTypeService; @GetMapping(value = "/plan/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { return R.ok(planService.selectById(String.valueOf(id))); Plan plan = planService.selectById(String.valueOf(id)); assert plan != null; JSONObject resultObj = JSON.parseObject(JSON.toJSONString(plan)); if (!Cools.isEmpty(plan.getForm())) { JSONObject formObj = JSON.parseObject(plan.getForm()); formObj.forEach(resultObj::putIfAbsent); } PlanType planType = planTypeService.selectById(plan.getPlanType()); if (planType == null) { return R.error("当前规划单类型已被禁用"); } resultObj.put("formHtml", planType.getHtml()); return R.ok().add(resultObj); } @RequestMapping(value = "/plan/page/auth") src/main/resources/application.yml
@@ -9,12 +9,12 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm username: sa password: Zoneyung@zy56$ # url: jdbc:sqlserver://localhost:51433;databasename=zy_crm # url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm # username: sa # password: sa@123 # password: Zoneyung@zy56$ url: jdbc:sqlserver://localhost:1433;databasename=zy_crm username: sa password: sa@123 mvc: static-path-pattern: /** redis: src/main/webapp/static/js/plan/plan.js
@@ -391,47 +391,55 @@ function showEditModel(mData) { let loadIndex = layer.load(2); $.ajax({ url: baseUrl + "/planType/" + mData.planType + "/auth", url: baseUrl + "/plan/" + mData.id + "/auth", headers: {'token': localStorage.getItem('token')}, method: 'GET', success: function (res) { layer.close(loadIndex); admin.open({ type: 1, area: ["95%", "90%"], offset: 'auto', title: '编辑售前规划申请单 - ' + res.data.name, content: $('#editDialog').html(), success: function (layero, dIndex) { console.log(mData) layDateRender(mData); form.val('detail', mData); form.on('submit(editSubmit)', function (data) { var loadIndex = layer.load(2); $.ajax({ url: baseUrl+"/plan/"+(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}); if (res.code === 200){ let plan = res.data; console.log(plan) admin.open({ type: 1, area: ["95%", "90%"], offset: 'auto', title: '编辑售前规划申请单 - ' + plan.planType$, content: $('#editDialog').html(), success: function (layero, dIndex) { $('#customizeBox').html(plan.formHtml) layDateRender(mData); form.val('detail', mData); form.on('submit(editSubmit)', function (data) { let loadIndex = layer.load(2); $.ajax({ url: baseUrl+"/plan/update/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'); } }); }) return false; }); $(layero).children('.layui-layer-content').css('overflow', 'visible'); layui.form.render('select'); } }); } else if (res.code === 403){ top.location.href = baseUrl+"/"; } else { layer.msg(res.msg, {icon: 2}); } } }); }