中扬CRM客户关系管理系统
Junjie
2023-08-24 e4f82a68cdc10967abf0b69d9846721fdca2b77a
Merge remote-tracking branch 'origin/zycrm' into zycrm
3个文件已修改
101 ■■■■■ 已修改文件
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/reimburseOnline/reimburseOnline.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -559,14 +559,10 @@
                for (SettleDto dto : list) {
                    if (dto.getStep().equals(settle)){
                        dto.setCurr(Boolean.FALSE);
                        break;
                    }else if (dto.getStep().equals(settle+1)){
                        dto.setCurr(Boolean.TRUE);
                        dto.setMsg("报价流程节点"+process+"确认人:"+planLeader.getNickname() + "审批通过");
                        dto.setTime(DateUtils.convert(now));
                        break;
                    }else {
                        break;
                    }
                }
                reimburseOnline.setSettleMsg(JSON.toJSONString(list));
@@ -579,6 +575,7 @@
                    settle=settle+2;
                }else {
                    settle++;
                    reimburseOnline.setStatus(1);
                }
                ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", settle+"-"+split[1]));//3:报销流程
                reimburseOnline.setMemberId(processPermissions2.getUserId());
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -300,100 +300,6 @@
            case "edit":
                showEditForm(data);
                break;
            case "upload":
                $.ajax({
                    type:"get",
                    url: baseUrl+"/reimburseOnline/viewCheck/" + data.id + "/auth",
                    dataType:"json",
                    headers: {'token': localStorage.getItem('token')},
                    success:function(res) {
                        if (res.code == 200) {
                            layer.confirm('当前已存在数据,继续上传将会覆盖旧数据,是否上传?', function(){
                                $("#uploadQuote").click()
                            });
                        }else{
                            $("#uploadQuote").click()
                        }
                    }
                });
                $("#uploadQuote").on("change",(evt) => {
                    var files = evt.target.files;
                    if(files==null || files.length==0){
                        alert("No files wait for import");
                        return;
                    }
                    let name = files[0].name;
                    let suffixArr = name.split("."), suffix = suffixArr[suffixArr.length-1];
                    if(suffix!="xlsx"){
                        alert("Currently only supports the import of xlsx files");
                        return;
                    }
                    LuckyExcel.transformExcelToLucky(files[0], function(exportJson, luckysheetfile){
                        if(exportJson.sheets==null || exportJson.sheets.length==0){
                            alert("Failed to read the content of the excel file, currently does not support xls files!");
                            return;
                        }
                        let formData = new FormData($("#uploadFile")[0]);
                        formData.append("id", data.id);
                        formData.append("checkData", zip(exportJson.sheets));
                        $.ajax({
                            url: baseUrl+"/reimburseOnline/uploadCheck/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: formData,
                            // data: JSON.stringify({
                            //     id: data.id,
                            //     checkData: zip(exportJson.sheets)
                            // }),
                            // dataType: "json",
                            method: 'POST',
                            cache: false,
                            processData: false,
                            contentType: false,
                            // contentType:'application/json;charset=UTF-8',
                            success: function (res) {
                                if (res.code == 200) {
                                    layer.msg('上传成功',{time:1000},() => {
                                        parent.location.reload()
                                    })
                                }else{
                                    layer.msg(res.msg,{time:1000},() => {
                                        parent.location.reload()
                                    })
                                }
                            }
                        })
                    });
                })
                break;
            case "viewCheck":
                //查看询价
                $.ajax({
                    type:"get",
                    url: baseUrl+"/reimburseOnline/viewCheck/" + data.id + "/auth",
                    dataType:"json",
                    headers: {'token': localStorage.getItem('token')},
                    success:function(res) {
                        if (res.code == 200) {
                            layer.open({
                                type: 2,
                                title: '查看询价',
                                maxmin: true,
                                area: [top.detailWidth, top.detailHeight],
                                shadeClose: false,
                                content: 'reimburseOnline_check.html?id=' + data.id,
                                success: function(layero, index){
                                    // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                                }
                            });
                        }else{
                            layer.msg(res.msg,{time:1000})
                        }
                    }
                });
                break;
            case "look":
                var $a = $(obj.tr).find('a[lay-event="look"]');
                var offset = $a.offset();
src/main/webapp/views/reimburseOnline/reimburseOnline.html
@@ -82,7 +82,7 @@
<script type="text/html" id="operate">
  {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4 || d.settle == 5 || d.settle == 6) { }}
  {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4 || d.settle == 5) { }}
  <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">审批</a>
  {{# } }}
  {{# if (d.settle == 0) { }}