From fd17661780e6c41f32fafb5c30863677d1bcceeb Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期五, 25 十一月 2022 15:47:07 +0800 Subject: [PATCH] # --- src/main/resources/mapper/PlanMapper.xml | 4 ++-- src/main/java/com/zy/crm/manager/controller/PlanController.java | 16 ++++++++++++++++ src/main/webapp/static/js/plan/plan.js | 30 +++++++++++++++++++++++++++++- src/main/webapp/views/plan/plan.html | 3 +++ 4 files changed, 50 insertions(+), 3 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 8bd0658..dfd6ef7 100644 --- a/src/main/java/com/zy/crm/manager/controller/PlanController.java +++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java @@ -94,6 +94,7 @@ @RequestMapping(value = "/plan/add/auth") @ManagerAuth + @Transactional public R add(@RequestParam Map<String, Object> param) { // pre Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class); @@ -128,6 +129,15 @@ if (!planService.insert(plan)) { throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯"); } + + // 鑷姩娣诲姞璺熻繘浜� + PlanFoll planFoll = new PlanFoll(); + planFoll.setPlanId(plan.getId()); + planFoll.setUserId(manager.getId()); + if (!planFollService.insert(planFoll)) { + throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯"); + } + return R.ok(); } @@ -162,6 +172,12 @@ return R.ok(); } + @PostMapping(value = "/plan/approval/auth") + @ManagerAuth + public R approval(@RequestParam Long planId){ + return R.ok(); + } + @RequestMapping(value = "/planQuery/auth") @ManagerAuth public R query(String condition) { diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml index 7d278b0..b21aedf 100644 --- a/src/main/resources/mapper/PlanMapper.xml +++ b/src/main/resources/mapper/PlanMapper.xml @@ -73,8 +73,8 @@ mp.id in ( select - order_id - from man_order_foll + plan_id + from man_plan_foll where 1=1 and user_id = #{userId} ) diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js index c39deaf..2023dcf 100644 --- a/src/main/webapp/static/js/plan/plan.js +++ b/src/main/webapp/static/js/plan/plan.js @@ -167,7 +167,7 @@ ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true} ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true} - ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 180} ]], request: { pageName: 'curr', @@ -379,6 +379,34 @@ } }) break; + case 'approval': + layer.confirm('瀹℃壒閫氳繃锛�', { + skin: 'layui-layer-admin', + shade: .1, + offset: '200px', + title: data.name + }, function (i) { + layer.close(i); + let loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/plan/approval/auth", + headers: {'token': localStorage.getItem('token')}, + data: {planId: data.id}, + 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}); + } + } + }) + }); + break; case 'edit': showEditModel(data); break; diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html index 3ed7c6b..401e0a0 100644 --- a/src/main/webapp/views/plan/plan.html +++ b/src/main/webapp/views/plan/plan.html @@ -104,6 +104,9 @@ </div> <script type="text/html" id="operate"> + {{# if (d.settle == 1 || d.settle == 2) { }} + <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a> + {{# } }} <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> -- Gitblit v1.9.1