中扬CRM客户关系管理系统
LSH
2023-10-10 a6535d6c9889a4240d037367db3c481a679e15a0
#一键出差、报销完善相关
3个文件已修改
351 ■■■■■ 已修改文件
src/main/java/com/zy/crm/manager/entity/BusinessTripOther.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/businessTrip/businessTripOther.js 271 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/businessTrip/businessTripOther.html 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/BusinessTripOther.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.crm.manager.service.OrderService;
import com.zy.crm.manager.utils.TimeCalculatorUtils;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
@@ -545,6 +546,15 @@
        return s;
    }
    public String getOrderId$(){
        OrderService service = SpringUtils.getBean(OrderService.class);
        Order order = service.selectById(this.orderId);
        if (!Cools.isEmpty(order)){
            return String.valueOf(order.getName());
        }
        return null;
    }
    public String getPcdStart$() {
        StringBuilder sb = new StringBuilder();
        DicService service = SpringUtils.getBean(DicService.class);
src/main/webapp/static/js/businessTrip/businessTripOther.js
@@ -3,7 +3,7 @@
    base: baseUrl + "/static/layui/lay/modules/"
}).extend({
    cascader: 'cascader/cascader',
}).use(['table','laydate', 'form', 'admin', 'cascader', 'tree', 'dropdown'], function(){
}).use(['table','laydate', 'form', 'admin', 'xmSelect', 'cascader', 'tree', 'dropdown'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
@@ -89,7 +89,8 @@
            ,{field: 'userId$', align: 'center',title: '申请人',hide: false}
            ,{field: 'deptId$', align: 'center',title: '所属部门',hide: true}
            ,{field: 'hostId', align: 'center',title: 'hostId',hide: true}
            ,{field: 'orderId', align: 'center',title: '跟踪项目',hide: false}
            ,{field: 'orderId$', align: 'center',title: '跟踪项目',hide: false}
            ,{field: 'orderId', align: 'center',title: '跟踪项目',hide: true}
            ,{field: 'settle$', align: 'center',title: '进度', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
            ,{field: 'status$', align: 'center',title: '状态',hide: false}
            ,{field: 'businessTripType', align: 'center',title: '类型',hide: true}
@@ -98,7 +99,7 @@
            ,{field: 'updateTime$', align: 'center',title: '更新时间',hide: false,width: 125}
            ,{field: 'updateId$', align: 'center',title: '更新人员',hide: false}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:180}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:240}
        ]],
        request: {
            pageName: 'curr',
@@ -199,6 +200,9 @@
    table.on('tool(businessTripOther)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'addBlank':
                showEditModelBlank(data.id);
                break;
            case 'approval':
                layer.confirm('审批通过?', {
                    skin: 'layui-layer-admin',
@@ -372,6 +376,267 @@
        });
    }
    // 显示表单弹窗
    function showEditModelBlank(businessOtherId) {
        admin.open({
            type: 1,
            title: '添加报销审批',
            content: $('#editDialog2').html(),
            area: '2200px',
            success: function (layero, dIndex) {
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                var isExpAdd = true;
                // 回显数据
                form.val('editForm', false);
                // console.log(expTpe)
                // if (expTpe) {
                //     // $('#orderNo').attr("disabled", "disabled");
                // }
                // 表单提交事件
                form.on('submit(orderEditSubmit)', function (data) {
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加报销明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                        return false;
                    }
                    let nList = admin.util.deepClone(xxDataList);
                    for (let xi = 0; xi < nList.length; xi++) {
                        // if (nList[xi].anfme <= 0){
                        //     layer.msg('明细修改数量不合法', {icon: 2});
                        //     return false;
                        // }
                    }
                    layer.load(2);
                    $.ajax({
                        url: baseUrl+"/reimburseOnline/from/" + (isExpAdd?"add":"modify") + "/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify({
                            reimburseId: Number(data.field.id),
                            docType: Number(data.field.docType),
                            businessOtherId: businessOtherId,
                            templateName: data.field.templateName,
                            checkData: data.field.checkData,
                            reimburseOnlineDetls: nList
                        }),
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            console.log(data)
                            layer.closeAll('loading');
                            if (res.code === 200){
                                layer.close(dIndex);
                                $(".layui-laypage-btn")[0].click();
                                layer.msg(res.msg, {icon: 1});
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                // 明细表格
                var xxDataList = [];
                var tbOptions = {
                    elem: '#formSSXMTable',
                    headers: {token: localStorage.getItem('token')},
                    data: xxDataList,
                    page: true,
                    height: '350px;',
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'occupation', title: '事由', width: 100, style: 'color: blue;font-weight: bold', edit:true},
                        // {field: 'expenseType', title: '费用类型', width: 100},
                        {field: 'expenseType$', title: '费用类型', width: 100},
                        {field: 'taxRate', title: '税率', width: 60, edit: true},
                        {field: 'untaxedAmountInLocalCurrency', title: '未税本币金额', width: 120, edit: true},
                        {field: 'untaxedAmount', title: '未税金额', width: 100, edit: true},
                        {field: 'taxAmount', title: '税额', width: 60, edit: true},
                        {field: 'invoiceValue', title: '发票金额', width: 100, edit: true},
                        {field: 'invoiceAmountInLocalCurrency', title: '发票本币金额', width: 120, edit: true},
                        {field: 'reimbursementRatio', title: '报销比例', width: 100, edit: true},
                        {field: 'reimbursementAmount', title: '报销金额', width: 100, edit: true},
                        {field: 'reimbursementAmountInLocalCurrency', title: '报销本币金额', width: 120, edit: true},
                        {field: 'cashierConfirmationAmount', title: '出纳确认金额', width: 120, edit: true},
                        {field: 'cashierCurrency', title: '出纳币种', width: 100, edit: true},
                        {field: 'departureTime', title: '出发日期', width: 100},
                        {field: 'cashierConfirmationAmount', title: '出纳确认金额', width: 120, edit: true},
                        {field: 'userId', title: '列支人员', width: 120},
                        {field: 'deptId', title: '列支部门', width: 120},
                        {field: 'updateTime', title: '更新日期', width: 100},
                        // {field: 'updateUserId', title: '更新人员ID', width: 160},
                        {field: 'updateUserName', title: '更新人员名字'},
                        // {field: 'creationTime', title: '创建日期', width: 160}
                        {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
                    ]],
                    done: function (res, curr, count) {
                        $(layero).find('.layui-table-view').css('margin', '0');
                        var options = this;
                        // 获取当前行数据
                        table.getRowData = function(elem){
                            var index = $(elem).closest('tr').data('index');
                            return table.cache[options.id][index] || {};
                        };
                        $('.input-occupation').on('text', function(){
                            var value = this.value; // 获取选中项 value
                            var data = table.getRowData(this);
                            console.log(value);
                            console.log("value------===");
                            xxDataList.forEach(res => {
                                if (data.id === res.id){
                                    console.log(res)
                                    res.occupation = value;
                                }
                            })
                        });
                    },
                    size: ''
                };
                var insTbSSXM = table.render(tbOptions);
                // 工具条点击事件
                table.on('tool(formSSXMTable)', function (obj) {
                    var data = obj.data;
                    var layEvent = obj.event;
                    if (layEvent === 'edit') {
                        showEditModel2(data);
                    } else if (layEvent === 'del') {
                        layer.confirm('确定要删除吗?', {
                            shade: .1,
                            skin: 'layui-layer-admin'
                        }, function (i) {
                            layer.close(i);
                            for (var j = 0; j < xxDataList.length; j++) {
                                if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) {
                                    xxDataList.splice(j, 1);
                                    break;
                                }
                            }
                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                        });
                    }
                });
                // 明细数据修改
                table.on('edit(formSSXMTable)', function (obj) {
                    let index = obj.tr.attr("data-index");
                    let data = xxDataList[index];
                    if (obj.field === 'anfme'){
                        let vle = Number(obj.value);
                        if (isNaN(vle)) {
                            layer.msg("请输入数字", {icon: 2});
                            return false;
                        } else {
                            if (vle <= 0) {
                                layer.msg("数量必须大于零", {icon: 2});
                                return false;
                            }
                        }
                    }
                    data[obj.field] = obj.value;
                    insTbSSXM.reload({data: xxDataList});
                });
                $('#matAddBtnComment').click(function () {
                    showEditModel2();
                });
                // 显示添加明细表单弹窗
                function showEditModel2(exp) {
                    admin.open({
                        type: 1,
                        offset: '150px',
                        area: '680px',
                        title: (exp ? '修改' : '添加') + '明细',
                        content: $('#matEditDialog').html(),
                        success: function (layero, dIndex) {
                            console.log("exp")
                            console.log(exp)
                            // 回显数据
                            form.val('matEditForm', exp);
                            // 表单提交事件
                            form.on('submit(matEditSubmit)', function (data) {
                                let selectList = matXmSelect.getValue();
                                console.log("selectList")
                                console.log(selectList)
                                console.log(selectList)
                                for (let i = 0; i<selectList.length; i++) {
                                    let item = selectList[i];
                                    // 查询物料详情
                                    $.ajax({
                                        url: baseUrl+"/reimburseCostTypes/covert/"+item.value+"/auth",
                                        headers: {'token': localStorage.getItem('token')},
                                        method: 'GET',
                                        async: false,
                                        success: function (res) {
                                            if (res.code === 200){
                                                var bige=true;
                                                // console.log("-------2.1-------")
                                                // for (var j = 0; j < xxDataList.length; j++) {
                                                //     if (xxDataList[j].expenseType === res.data.expenseType && xxDataList[j].batch === res.data.batch) {
                                                //         bige=false;
                                                //         console.log("-------2.2-------")
                                                //         break;
                                                //     }
                                                // }
                                                if (bige){
                                                    // console.log("-------2.3-------")
                                                    xxDataList.push(res.data);
                                                    insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                                                }
                                            } else if (res.code === 403){
                                                top.location.href = baseUrl+"/";
                                            }else {
                                                layer.msg(res.msg, {icon: 2})
                                            }
                                        }
                                    })
                                }
                                layer.close(dIndex);
                                return false;
                            });
                            // 渲染物料选择
                            var matXmSelect = xmSelect.render({
                                el: '#reimburseCostTypes',
                                style: {
                                    width: '340px',
                                },
                                autoRow: true,
                                toolbar: { show: true },
                                filterable: true,
                                remoteSearch: true,
                                remoteMethod: function(val, cb, show){
                                    $.ajax({
                                        url: baseUrl+"/reimburseCostTypes/all/get/kv",
                                        headers: {'token': localStorage.getItem('token')},
                                        data: {
                                            condition: val
                                        },
                                        method: 'POST',
                                        success: function (res) {
                                            if (res.code === 200){
                                                cb(res.data)
                                            } else {
                                                cb([]);
                                                layer.msg(res.msg, {icon: 2});
                                            }
                                        }
                                    });
                                }
                            })
                            // 弹窗不出现滚动条
                            $(layero).children('.layui-layer-content').css('overflow', 'visible');
                            layui.form.render('select');
                        }
                    });
                }
            }
        });
    }
    function approval(planId, plannerId, dIdx) {
        let loadIndex = layer.load(2);
        $.ajax({
src/main/webapp/views/businessTrip/businessTripOther.html
@@ -84,6 +84,7 @@
        <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>
    <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">申请报销</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -155,5 +156,74 @@
        </div>
    </form>
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog2">
    <form id="editForm" lay-filter="editForm" class="layui-form model-form">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">报销类型: </label>
            <div class="layui-input-inline">
                <select class="layui-input" name="templateName" lay-vertype="tips" lay-verify="required">
                    <option style="display: none"></option>
                    <option value="项目未完成">项目未完成</option>
                    <option value="项目已完成在质保期内">项目已完成在质保期内</option>
                    <option value="非项目型报销">非项目型报销</option>
                    <option value="其它">其它</option>
                </select>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">是否冲账: </label>
            <div class="layui-input-inline">
                <select class="layui-input" name="checkData" lay-vertype="tips" lay-verify="required">
                    <option style="display: none"></option>
                    <option value="否">否</option>
                    <option value="是">是</option>
                </select>
            </div>
        </div>
        <div class="layui-form-item" style="position: relative;">
            <label class="layui-form-label">报销明细:</label>
            <div class="layui-input-block">
                <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
            </div>
            <button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
                    style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
                <i class="layui-icon">&#xe654;</i>添加明细
            </button>
        </div>
        <div class="layui-form-item text-right">
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
            <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>保存</button>
        </div>
    </form>
</script>
<!-- 表格操作列 -->
<script type="text/html" id="formSSXMTableBar">
    <!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>-->
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="matEditDialog">
    <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
        <input name="experimentId" type="hidden"/>
        <div class="layui-form-item" style="float: left">
            <label class="layui-form-label">费用类型 - 多选</label>
            <div class="layui-input-block">
                <div id="reimburseCostTypes" name="reimburseCostTypes">
                </div>
            </div>
        </div>
        <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
            <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>保存</button>
        </div>
    </form>
</script>
</html>