Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yangle

10 小时以前 76824fbc74817dc6a87cef54c2ab18705490356e

 WebTM/views/Éú²ú¹ÜÀí/Ç·ÁÏÔËËã/JIT_MaterialLevelShorAnalysisReport.html

@@ -52,7 +52,13 @@
                                        </select>
                                    </div>
                                </div>

                                <div class="layui-inline">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">欠料日期</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
@@ -92,7 +98,7 @@
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">导出</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="bthHideColumn" id="bthHideColumn">列设置</button>
                                </div>
                                

                                <!--<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
        <div class="layui-row" style="margin-top:10px;">
            <div class="layui-inline">
@@ -224,6 +230,45 @@

        //#endregion

        //日期间隔下拉列表监听
        form.on('select(HInitTimeCycle)', function (data) {
            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
            //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
            if (HInitTimeCycle == 30) {
                //$('#HBeginDate').prop('disabled', true);
                //$('#HEndDate').prop('disabled', true);

                $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//欠料日期
                $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//至

                //执行查询方法
                get_FastQuery();
            } else if (HInitTimeCycle==45) {
                //$('#HBeginDate').prop('disabled', true);
                //$('#HEndDate').prop('disabled', true);

                $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()-15), "yyyy-MM-dd"));//欠料日期
                $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//至

                //执行查询方法
                get_FastQuery();
            }
            else if (HInitTimeCycle == 60) {
                //$('#HBeginDate').prop('disabled', true);
                //$('#HEndDate').prop('disabled', true);

                $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate() - 30), "yyyy-MM-dd"));//欠料日期
                $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//至

                //执行查询方法
                get_FastQuery();
            }
            else {
                $('#HBeginDate').prop('disabled', false);
                $('#HEndDate').prop('disabled', false);
            }
        });

        //#endregion

        //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法
@@ -261,10 +306,21 @@
                    
                }
            })

            //初始化日期
            $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate() - 30), "yyyy-MM-dd"));//欠料日期
            $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//至
            //初始化日期间隔、开始日期、结束日期
            setSelect_HInitTimeCycle();
            //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
            if (HInitTimeCycle == 30) {
                $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//欠料日期
                $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//至
            } else if (HInitTimeCycle == 45) {
                $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate() - 15), "yyyy-MM-dd"));//欠料日期
                $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//至
            }
            else if (HInitTimeCycle == 60) {
                $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate() - 30), "yyyy-MM-dd"));//欠料日期
                $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//至
            }
            //生产组织加载
            Organ();
            //车间
@@ -460,17 +516,35 @@
                            } else if (data[i].name == '未匹配订单数量') {
                                col.push({
                                    field: '未匹配订单数量', title: '未匹配订单数量', sort: true, filter: true, templet: function (d) {
                                        return d.未匹配订单数量 > 0 ? '<span style="color: red;">' + d.未匹配订单数量 + '</span>' : d.未匹配订单数量;
                                        return d.未匹配订单数量 > 0 ? '<span style="color: black;">' + d.未匹配订单数量 + '</span>' : d.未匹配订单数量;
                                    } });
                            }
                            else if (data[i].name == '未匹配要料计划信息数量') {
                                col.push({
                                    field: '未匹配要料计划信息数量', title: '未匹配要料计划信息数量', sort: true, filter: true, templet: function (d) {
                                        return d.未匹配要料计划信息数量 > 0 ? '<span style="color: red;">' + d.未匹配要料计划信息数量 + '</span>' : d.未匹配要料计划信息数量;
                                        return d.未匹配要料计划信息数量 > 0 ? '<span style="color: black;">' + d.未匹配要料计划信息数量 + '</span>' : d.未匹配要料计划信息数量;
                                    }
                                });
                            } else if (isValidDate(data[i].name)) {
                                col.push({ field: data[i].name, title: Format(data[i].name, 'MM.dd'), width: 70, totalRow: true, filter: true })
                                col.push({
                                    field: data[i].name, title: Format(data[i].name, 'MM.dd'), width: 70, totalRow: true, filter: true, templet: function (d) {
                                        //获取当前今天明天后天三天的日期字符串
                                        const dates = [];
                                        const today = new Date();
                                        for (let i = 0; i < 3; i++) {
                                            const date = new Date(today);
                                            date.setDate(today.getDate() + i);
                                            const dateStr = date.toISOString().slice(0, 10);
                                            dates.push(`${dateStr}`);
                                        }
                                        // å¦‚果行日期在当前日期三天后，则内容标红
                                        if ((this.field == dates[0] || this.field == dates[1] || this.field == dates[2]) && d[this.field] != null) {
                                            return '<span style="color:Orange">' + (d[this.field] == null ? 0 : d[this.field]) + '</span>';
                                        } else {
                                            return d[this.field] == null ? 0 : d[this.field]
                                        }
                                    }
                                })
                            }
                            else {
                                switch (data[i].Type) {
@@ -622,6 +696,24 @@
            })
        }

        //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
        function setSelect_HInitTimeCycle() {
            var valueList = [30, 45, 60];
            var titleList = ["近一月", "近45天", "近60天"];

            var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';
            for (var i = 0; i < valueList.length; i++) {
                HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
            }

            $("#HInitTimeCycle").empty();
            $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
            form.render('select');

            $("#HInitTimeCycle").val("30");
        }
            //#endregion

        //#endregion
        //以上是layui模块
    });