#

LSH

2023-11-04 2a6c92390c3496eb6bc8f500a653a1efc1d88a93

#

 src/main/java/com/zy/crm/manager/controller/OrderController.java

@@ -224,16 +224,11 @@
                        List<SettleDto> priOnline2Dtos = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
                        List<SettleDto> priOnline2DtoList = new ArrayList<>();
                        for (SettleDto dto : priOnline2Dtos) {
                            switch (dto.getStep()) {
                                case 0:
                                    dto.setMsg(dto.getMsg()+" ———————————————————————————————————————————————————————————————————————————————— "+DateUtils.convert(now)+" 跟踪项目修改负责人为："+priOnline2.getUser$());
                                    break;
                                case 2:
                                    dto.setUserId(priOnline2.getUserId());
                                    dto.setUsername(priOnline2.getUser$());
                                    break;
                                default:
                                    break;
                            if (dto.getStep() == 0) {
                                dto.setMsg(dto.getMsg() + " ———————————————————————————————————————————————————————————————————————————————— " + DateUtils.convert(now) + " 跟踪项目修改负责人为：" + priOnline2.getUser$());
                            } else if (dto.getStep().equals(priOnline2.getSettleSize())) {
                                dto.setUserId(priOnline2.getUserId());
                                dto.setUsername(priOnline2.getUser$());
                            }
                            priOnline2DtoList.add(dto);
                        }

 src/main/webapp/views/priOnline2/priOnline.html

@@ -83,6 +83,8 @@
    {{# } }}
    {{# if ((d.settle == 1 && d.settleSize == 3) || (d.settle == 2 && d.settleSize == 4)){ }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">确认</a>
    {{# } }}
    {{# if (d.settle == 1 || (d.settle == 2 && d.settleSize == 4)){ }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">回退审批</a>
    {{# } }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="check">核价</a>