1.销售钉钉 问题：保存并设置默认过滤方案后，加载页面时任意字段过滤与保存的不符 原因：动态列，在未加载默认过滤方案前，未更新列数据 处理：在加...

duhe

2024-09-03 839e33c88837be376fa9cece4970eb6498371a0e

1.销售钉钉
 问题：保存并设置默认过滤方案后，加载页面时任意字段过滤与保存的不符
 原因：动态列，在未加载默认过滤方案前，未更新列数据
 处理：在加载默认过滤方案前，先执行一次查询，获取动态列数据
 问题：缺少合计
 处理：判断数据类型未decimal或int，或列名包含在合计列数组中时，设置合计

2.销售出库单
 问题：加载页面时，当日期间隔不为任意间隔时，也可以修改日期
 处理：将 当日期间隔不为任意间隔时禁用日期组件 控制取消
 问题：缺少合计
 处理：判断数据类型未decimal或int，或列名包含在合计列数组中时，设置合计

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillList.html

@@ -594,7 +594,7 @@
                set_InitGrid();
                //查询
                //get_FastQuery();
                //get_Display(sWhere);
                get_Display(" and 1=0 ");

                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -758,7 +758,7 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            
                            if (data1.data.length == 0) {
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = [];
@@ -778,14 +778,57 @@
                                if ($.inArray(data[i].name, titleData) > -1) {//检查data【i】.name是否在数组中  //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列  
                                    else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "int")) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号'
                                        , event: '单据号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;' });
                                            }, style: 'cursor: pointer;'
                                        });
                                    } else {
                                        switch (data[i].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                                break;
                                            default:
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                        }
                                    }
                                }

                                option.cols = [col];
                            } else {
                                var data = [];//列字段数据
                                var col = [];
                                var totalArray = [];
                                //给空的数组赋值
                                for (var key in data1.list) {//循序遍历数组
                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据
                                }
                                col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                                //设置列表同一个单据只有第一条数据显示主表信息，其它记录只显示子表信息
                                //获取子表列数据
                                var colList = [];
                                for (var i = 0; i < option.cols[0].length; i++) {
                                    colList.push(option.cols[0][i].field);
                                }
                                for (var i = 0; i < data.length; i++) {//遍历data数组重的数据
                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                    if ($.inArray(data[i].name, titleData) > -1) {//检查data【i】.name是否在数组中  //计算列
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                    }
                                    else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "int")) { //计算列
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                    } else if (data[i].name == '单据号') {
                                        col.push({
                                            field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号'
                                            , event: '单据号', templet: function (d) {
                                                return '<span style="color: blue;">' + d.单据号 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                } else {
                                    switch (data[i].Type) {
                                        //int
@@ -832,6 +875,8 @@

                            option.data = result;
                            ins = table.render(option);
                            }
                            
                            layer.close(ajaxLoad);
                            DisPlay_HideColumn();
                            //刷新按钮显示

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html

@@ -445,8 +445,8 @@
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                if (HInitTimeCycle != -1) {
                    $('#HBeginDate').prop('disabled', true);
                    $('#HEndDate').prop('disabled', true);
                    //$('#HBeginDate').prop('disabled', true);
                    //$('#HEndDate').prop('disabled', true);

                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -469,8 +469,8 @@
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                if (HInitTimeCycle != -1) {
                    $('#HBeginDate').prop('disabled', true);
                    $('#HEndDate').prop('disabled', true);
                    //$('#HBeginDate').prop('disabled', true);
                    //$('#HEndDate').prop('disabled', true);
                } else {
                    $('#HBeginDate').prop('disabled', false);
                    $('#HEndDate').prop('disabled', false);
@@ -608,7 +608,7 @@
                            //}
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = [];
                            var totalArray = ["件数"];
                            //给空的数组赋值
                            for (var key in data1.list) {//循序遍历数组
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据
@@ -620,7 +620,7 @@
                                if ($.inArray(data[i].name, titleData) > -1) {//检查data【i】.name是否在数组中  //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "int")) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({
@@ -1753,8 +1753,8 @@
                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                            //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                            if (HInitTimeCycle != -1) {
                                $('#HBeginDate').prop('disabled', true);
                                $('#HEndDate').prop('disabled', true);
                                //$('#HBeginDate').prop('disabled', true);
                                //$('#HEndDate').prop('disabled', true);

                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));