From fd4a6165dab2759b8d7bc7955debb48455d1a571 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 10:25:56 +0800
Subject: [PATCH] #报价预算单完善

---
 src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js                |   51 ++++++
 src/main/webapp/views/priQuoteBudget/priQuoteBudget_more.html             |  187 +++++++++++++++++++++++
 src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java |  143 +++++++++++++++++
 src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java               |   36 ++++
 src/main/webapp/static/js/common.js                                       |    1 
 src/main/webapp/views/priQuoteBudget/priQuoteBudget.html                  |   15 +
 6 files changed, 429 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
index d572830..7bfd835 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
@@ -1,5 +1,6 @@
 package com.zy.crm.manager.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -11,9 +12,13 @@
 import com.core.common.DateUtils;
 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.entity.*;
 import com.zy.crm.manager.service.*;
+import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.UserService;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,10 +46,18 @@
     @Autowired
     private PriQuoteService priQuoteService;
 
+    @Autowired
+    private UserService userService;
+
     @RequestMapping(value = "/priQuoteBudget/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
-        return R.ok(priQuoteBudgetService.selectById(String.valueOf(id)));
+        PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(String.valueOf(id));
+        assert priQuoteBudget != null;
+        JSONObject resultObj = JSON.parseObject(JSON.toJSONString(priQuoteBudget));
+        // 姝ラ鏉$浉鍏�
+        resultObj.put("step", priQuoteBudget.getSettle() == 4 ? 0 : priQuoteBudget.getSettle() + 1);
+        return R.ok().add(resultObj);
     }
 
     @RequestMapping(value = "/priQuoteBudget/list/auth")
@@ -56,7 +69,7 @@
                   @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param){
         EntityWrapper<PriQuoteBudget> wrapper = new EntityWrapper<>();
-        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
+        wrapper.setSqlSelect("id,title,create_time as createTime,settle,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
         wrapper.in("member_id", getUserRoleBelongsToUserId());
         excludeTrash(param);
         convert(param, wrapper);
@@ -123,6 +136,16 @@
         //涓氬姟鍛�
         Plan plan = planService.selectById(priQuoteBudget.getItemId());
         priQuoteBudget.setMemberId(plan.getUserId());
+
+        priQuoteBudget.setSettle(0);
+
+        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
+        List<String> initNames = new ArrayList<>();
+        initNames.add("鍒涘缓鎶ヤ环棰勭畻鍗曟ā鏉�");
+        initNames.add("鎻愪氦鎶ヤ环棰勭畻鍗�");
+        initNames.add("閮ㄩ棬缁忕悊瀹℃牳");
+        initNames.add("涓氬姟鍛樼‘璁�");
+        priQuoteBudget.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),initNames,3)));
 
         //璁剧疆椤圭洰娴佺▼
         plan.setStep(4);
@@ -402,4 +425,120 @@
         }
     }
 
+    @PostMapping(value = "/priQuoteBudget/approval/auth")
+    @ManagerAuth
+    public R approvalBusinessTrip(@RequestParam Long priQuoteBudgetId,
+                                  @RequestParam(required = false) Long plannerId){
+        PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(priQuoteBudgetId);
+        assert priQuoteBudget != null;
+        Date now = new Date();
+        switch (priQuoteBudget.getSettle()) {
+            case 0:
+                User user2 = userService.selectById(priQuoteBudget.getUserId());
+                User manager1 = userService.getDeptManager(getHostId(), user2.getDeptId());
+
+                if (Cools.isEmpty(getUser())) {
+                    return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
+                }
+                if (!getUserId().equals(getUser().getId())) {
+                    return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
+                }
+                // 淇敼 settle 姝ラ鏁版嵁
+                List<SettleDto> list1 = JSON.parseArray(priQuoteBudget.getSettleMsg(), SettleDto.class);
+                for (SettleDto dto : list1) {
+                    switch (dto.getStep()) {
+                        case 0:
+                            dto.setCurr(Boolean.FALSE);
+                            break;
+                        case 1:
+                            dto.setCurr(Boolean.TRUE);
+                            dto.setMsg(getUser().getNickname() + "鎻愪氦瀹屾垚");
+                            dto.setTime(DateUtils.convert(now));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                priQuoteBudget.setSettleMsg(JSON.toJSONString(list1));
+                // 淇敼瑙勫垝鍗曠姸鎬�
+                priQuoteBudget.setSettle(1);
+                priQuoteBudget.setUpdateUserId(getUserId());
+                priQuoteBudget.setUpdateTime(now);
+                priQuoteBudget.setMemberId(manager1.getId());
+
+                if (!priQuoteBudgetService.updateById(priQuoteBudget)) {
+                    throw new CoolException("鎻愪氦澶辫触锛岃鑱旂郴绠$悊鍛�");
+                }
+                break;
+            case 1:
+                // 鏈儴闂ㄧ粡鐞嗗鏍�
+                User user = userService.selectById(priQuoteBudget.getUserId());
+                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+                if (manager.getId().equals(getUserId())) {
+
+                    // 淇敼 settle 姝ラ鏁版嵁
+                    List<SettleDto> list = JSON.parseArray(priQuoteBudget.getSettleMsg(), SettleDto.class);
+                    for (SettleDto dto : list) {
+                        switch (dto.getStep()) {
+                            case 1:
+                                dto.setCurr(Boolean.FALSE);
+                                break;
+                            case 2:
+                                dto.setCurr(Boolean.TRUE);
+                                dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+                                dto.setTime(DateUtils.convert(now));
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    priQuoteBudget.setSettleMsg(JSON.toJSONString(list));
+
+                    // 淇敼瑙勫垝鍗曠姸鎬�
+                    priQuoteBudget.setSettle(2);  // 鐢宠閫氳繃
+                    priQuoteBudget.setUpdateTime(now);
+                    if (!priQuoteBudgetService.updateById(priQuoteBudget)) {
+                        throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�");
+                    }
+                } else {
+                    return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄愶紒锛侊紒");
+                }
+                break;
+            case 2:
+                // 涓氬姟鍛�
+                User salesman0 = userService.selectById(priQuoteBudget.getUserId());
+                if (!getUserId().equals(salesman0.getId())) {
+                    return R.error("鎶辨瓑锛屾偍鏃犻渶纭锛侊紒锛�");
+                }
+                // 淇敼 settle 姝ラ鏁版嵁
+                List<SettleDto> list2 = JSON.parseArray(priQuoteBudget.getSettleMsg(), SettleDto.class);
+                for (SettleDto dto : list2) {
+                    switch (dto.getStep()) {
+                        case 2:
+                            dto.setCurr(Boolean.TRUE);
+                            break;
+                        case 3:
+                            dto.setCurr(Boolean.TRUE);
+                            dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "浠ョ‘璁�");
+                            dto.setTime(DateUtils.convert(new Date()));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                priQuoteBudget.setSettleMsg(JSON.toJSONString(list2));
+                // 淇敼瑙勫垝鍗曠姸鎬�
+                priQuoteBudget.setSettle(3);  // 瀹℃壒閫氳繃
+                priQuoteBudget.setUpdateTime(new Date());
+
+                if (!priQuoteBudgetService.updateById(priQuoteBudget)) {
+                    throw new CoolException("纭澶辫触锛岃鑱旂郴绠$悊鍛�");
+                }
+                break;
+            default:
+                return R.error();
+        }
+        return R.ok("瀹℃壒鎴愬姛");
+    }
+
 }
diff --git a/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java b/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java
index 798793d..f362af7 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java
@@ -95,6 +95,26 @@
     @TableField("dept_id")
     private Long deptId;
 
+    /**
+     * hostId
+     */
+    @ApiModelProperty(value= "hostId")
+    @TableField("host_id")
+    private Long hostId;
+
+    /**
+     * 杩涘害
+     */
+    @ApiModelProperty(value= "杩涘害")
+    private Integer settle;
+
+    /**
+     * 娴佺▼杩涘害
+     */
+    @ApiModelProperty(value= "娴佺▼杩涘害")
+    @TableField("settle_msg")
+    private String settleMsg;
+
     public PriQuoteBudget() {}
 
     public PriQuoteBudget(String title,String sheetData,Date createTime,String filepath) {
@@ -104,6 +124,22 @@
         this.filepath = filepath;
     }
 
+    public String getSettle$(){
+        if (null == this.settle){ return null; }
+        switch (this.settle){
+            case 0:
+                return "绛夊緟鎻愪氦";
+            case 1:
+                return "绛夊緟瀹℃壒";
+            case 2:
+                return "绛夊緟纭";
+            case 3:
+                return "瀹℃壒閫氳繃";
+            default:
+                return String.valueOf(this.settle);
+        }
+    }
+
     public Long getCstmrId$(){
         CstmrService cstmrService = SpringUtils.getBean(CstmrService.class);
         Cstmr cstmr = cstmrService.selectByName(1L, this.templateName);
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 16bd48a..2e3b5c2 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -238,3 +238,4 @@
 var businessTripByMore;
 var priOnlineByMore;
 var priSalesByMore;
+var priQuoteBudgetByMore;
diff --git a/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js b/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
index 5e446a5..a252989 100644
--- a/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
+++ b/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
@@ -92,6 +92,7 @@
             ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
             ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
             ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�'}
+            ,{field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
             ,{field: 'userId$', align: 'center',title: '鍒涘缓浜哄憳'}
             ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳'}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
@@ -233,6 +234,29 @@
     table.on('tool(priQuoteBudget)', function(obj){
         var data = obj.data;
         switch (obj.event) {
+            case 'approval':
+                layer.confirm('瀹℃壒閫氳繃锛�', {
+                    skin: 'layui-layer-admin',
+                    shade: .1,
+                    offset: '200px',
+                    title: data.name
+                }, function (i) {
+                    layer.close(i);
+                    approval(data.id);
+                });
+                break;
+            case 'more':
+                top.priQuoteBudgetByMore = data.id;
+                admin.popupRight({
+                    type: 1,
+                    window: "top",
+                    area: "1250px",
+                    url: "priQuoteBudget_more.html",
+                    end: function () {
+                        // $(".layui-laypage-btn")[0].click();
+                    }
+                })
+                break;
             case 'moreCstmr':
                 top.cstmrByMore = data.cstmrId$;
                 admin.popupRight({
@@ -380,6 +404,33 @@
         });
     }
 
+    function approval(priQuoteBudgetId, plannerId, dIdx) {
+        let loadIndex = layer.load(2);
+        $.ajax({
+            url: baseUrl+"/priQuoteBudget/approval/auth",
+            headers: {'token': localStorage.getItem('token')},
+            data: {
+                priQuoteBudgetId: priQuoteBudgetId,
+                plannerId: plannerId
+            },
+            method: 'POST',
+            success: function (res) {
+                if (dIdx) {
+                    layer.close(dIdx);
+                }
+                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});
+                }
+            }
+        })
+    }
+
 });
 
 // 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/priQuoteBudget/priQuoteBudget.html b/src/main/webapp/views/priQuoteBudget/priQuoteBudget.html
index 1f70a58..f259d61 100644
--- a/src/main/webapp/views/priQuoteBudget/priQuoteBudget.html
+++ b/src/main/webapp/views/priQuoteBudget/priQuoteBudget.html
@@ -98,9 +98,20 @@
 </script>
 
 <script type="text/html" id="operate">
+    {{# if (d.settle == 0) { }}
+        <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>
+    {{# } }}
+    {{# if (d.settle == 1) { }}
+        <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
+    {{# } }}
+    {{# if (d.settle == 2) { }}
+        <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">纭</a>
+    {{# } }}
+    {{# if (d.settle == 0 || d.settle == 1) { }}
+        <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+    {{# } }}
     <a class="layui-btn layui-btn-xs btn-edit" lay-event="quoteBudget">鎶ヤ环棰勭畻</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>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/priQuoteBudget/priQuoteBudget_more.html b/src/main/webapp/views/priQuoteBudget/priQuoteBudget_more.html
new file mode 100644
index 0000000..7e116c6
--- /dev/null
+++ b/src/main/webapp/views/priQuoteBudget/priQuoteBudget_more.html
@@ -0,0 +1,187 @@
+<meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+<style>
+    #formAdvForm {
+        background-color: #f3f3f3;
+    }
+    #formAdvForm .layui-form-item {
+        margin-top: 20px;
+        margin-bottom: 0;
+    }
+
+    #formAdvForm .layui-form-item .layui-inline {
+        margin-bottom: 25px;
+        margin-right: 0;
+    }
+
+    .form-group-bottom {
+        position: fixed;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        padding: 10px 20px;
+        background-color: #fff;
+        box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, .05);
+    }
+</style>
+<!-- 姝f枃寮�濮� -->
+<form class="layui-form" id="formAdvForm" lay-filter="formAdvForm" style="height: 100%">
+    <div class="layui-fluid" style="padding-bottom: 75px;height: 100%; overflow: scroll;box-sizing: border-box">
+        <!-- 鏍囬 -->
+        <div class="layui-card">
+            <div class="layui-card-header" style="padding-top: 5px; padding-bottom: 5px">
+                <div>
+                    <i class="layui-icon" style="font-size: 20px;color: #1890ff;font-weight: bold">&#xe656;</i>
+                    <span id="form-name" style="margin: 0 6px;font-size: 18px;font-weight: bold;letter-spacing: 1px"></span>
+                    <span style="opacity: .5;font-size: small;margin-left: 5px">鏍镐环鍗�</span>
+                </div>
+            </div>
+            <div class="layui-card-body" style="padding: 30px 20px">
+
+                <div class="layui-tab layui-steps">
+                    <ul class="layui-tab-title" id="stepBox">
+                    </ul>
+                </div>
+
+            </div>
+        </div>
+        <div class="layui-row">
+            <!-- 鏁版嵁 -->
+            <!--            <div class="layui-col-md9">-->
+            <!--                <div class="layui-card">-->
+            <!--                    <div class="layui-card-header">-->
+            <!--                        鍩烘湰淇℃伅-->
+            <!--                    </div>-->
+            <!--                    <div class="layui-card-body">-->
+
+            <!--                    </div>-->
+            <!--                </div>-->
+            <!--            </div>-->
+            <!-- 鍔ㄦ�� -->
+            <!--            <div class="layui-col-md3" style="width: 24%;margin-left: 1%">-->
+            <div class="layui-col-md3" style="width: 100%;">
+                <!-- 鏃堕棿绾� -->
+                <div class="layui-card">
+                    <div class="layui-card-header">
+                        <span>娴佺▼鍔ㄦ��</span>
+                    </div>
+                    <div class="layui-card-body">
+                        <ul class="layui-timeline" id="timelineBox">
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group-bottom text-right">
+        <button class="layui-btn" lay-filter="refresh" lay-submit><i class="layui-icon">&#xe666;</i>&emsp;鍒锋柊&emsp;</button>
+    </div>
+
+</form>
+
+<script type="text/html" id="followerTabOperate">
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/template" id="stepTpl">
+    {{#each list}}
+    <li id="step-{{step}}" style="pointer-events: none">
+        <i class="layui-icon layui-icon-ok">{{step}}</i>
+        <span class="layui-steps-title">{{title}}</span>
+        {{# if username}}
+        <span class="layui-steps-content">{{username}}</span>
+        {{ else }}
+        <span class="layui-steps-content">&nbsp;</span>
+        {{/if}}
+    </li>
+    {{/each}}
+</script>
+
+<script type="text/template" id="timelineTpl">
+    {{#each list}}
+    <li class="layui-timeline-item">
+        <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
+        <div class="layui-timeline-content layui-text">
+            <h4 class="layui-timeline-title" style="display: inline;margin-right: 10px;">{{title}}</h4>
+            <span>{{time}}</span>
+            <p>
+                {{msg}}
+            </p>
+        </div>
+    </li>
+    {{/each}}
+</script>
+
+<script>
+    var priQuoteBudgetId = top.priQuoteBudgetByMore;
+    $('.layui-layer-close').hide();
+    layui.config({
+        base: baseUrl + "/static/layui/lay/modules/"
+    }).extend({
+        notice: 'notice/notice',
+        steps: 'steps/steps',
+    }).use(['form', 'table', 'laydate', 'notice', 'xmSelect', 'steps'], function () {
+        var $ = layui.jquery;
+        var form = layui.form;
+        var table = layui.table;
+        var laydate = layui.laydate;
+        var notice = layui.notice;
+        var xmSelect = layui.xmSelect;
+        var steps = layui.steps;
+
+        form.render('select');
+
+        init();
+        function init(){
+            notice.msg('姝e湪杞藉叆鏁版嵁......', {icon: 4, position: "topRight"});
+            $.ajax({
+                url: baseUrl + "/priQuoteBudget/" + priQuoteBudgetId + "/auth",
+                headers: {'token': localStorage.getItem('token')},
+                method: 'GET',
+                success: function (res) {
+                    notice.destroy();
+                    if (res.code === 200) {
+                        let priQuoteBudget = res.data;
+                        top.priQuoteBudgetByMore = null;
+                        $("#form-name").html(priQuoteBudget.name);
+                        // 杩涘害姝ラ鍥�
+                        let template0 = Handlebars.compile($('#stepTpl').html());
+                        $('#stepBox').html(template0({list: JSON.parse(priQuoteBudget.settleMsg)}));
+                        $('#step-' + Number(priQuoteBudget.step)).addClass("layui-this");
+
+                        let template1 = Handlebars.compile($('#timelineTpl').html());
+                        $('#timelineBox').html(template1({list: JSON.parse(priQuoteBudget.settleMsg)}));
+                        // 琛ュ厖html
+                        $('#customizeBox').html(priQuoteBudget.formHtml);
+                        // 璁惧鏄庣粏
+                        // form.val('formAdvForm', priQuoteBudget);
+                        // top.convertDisabled($('#formAdvForm :input'), true);
+                        // 璺熻繘浜�
+                        // initFollowers(priQuoteBudget.id);
+                        layDateRender();
+                    } else if (res.code === 403) {
+                        top.location.href = baseUrl + "/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2})
+                    }
+                }
+            })
+        }
+
+        /* 娓叉煋laydate */
+        function layDateRender() {
+            laydate.render({
+                elem: '#endTime',
+                type: 'datetime'
+            });
+        }
+        layDateRender();
+
+        /* 鐩戝惉琛ㄥ崟鎻愪氦 */
+        form.on('submit(refresh)', function (data) {
+            init();
+            return false;
+        });
+
+    })
+</script>

--
Gitblit v1.9.1