fix: 修正 系统上机日志查询 没有显示默认方案的问题

chenhaozhe

2025-05-21 94853e46b9d4911fb4cf00389f00a4b820db5d3c

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportMOMaterReadysBillList.html

@@ -48,6 +48,13 @@
                                    </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;">
                                        <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 58px;width:160px;">
@@ -102,88 +109,88 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
                                                    <option value=">=">>=</option>
                                                    <option value=">">></option>
                                                    <option value="<="><=</option>
                                                    <option value="<"><</option>
                                                    <option value="<>"><></option>
                                                    <option value="7">包含</option>
                                                    <option value="8">左包含</option>
                                                    <option value="9">右包含</option>
                                                    <option value="10">不包含</option>
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
                <div class="layui-inline">
                    <label class="layui-form-label">过滤</label>
                    <div class="layui-input-block">
                        <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                        </select>
                    </div>
                </div>
                <div class="layui-inline">
                    <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                        <option value="0" selected="selected"></option>
                        <option value="=">=</option>
                        <option value=">=">>=</option>
                        <option value=">">></option>
                        <option value="<="><=</option>
                        <option value="<"><</option>
                        <option value="<>"><></option>
                        <option value="7">包含</option>
                        <option value="8">左包含</option>
                        <option value="9">右包含</option>
                        <option value="10">不包含</option>
                    </select>
                </div>
                <div class="layui-inline">
                    <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                </div>
            </div>

                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
                                                    <option value=">=">>=</option>
                                                    <option value=">">></option>
                                                    <option value="<="><=</option>
                                                    <option value="<"><</option>
                                                    <option value="<>"><></option>
                                                    <option value="7">包含</option>
                                                    <option value="8">左包含</option>
                                                    <option value="9">右包含</option>
                                                    <option value="10">不包含</option>
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                            </div>
                                        </div>
            <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                <div class="layui-inline">
                    <label class="layui-form-label">过滤</label>
                    <div class="layui-input-block">
                        <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                        </select>
                    </div>
                </div>
                <div class="layui-inline">
                    <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                        <option value="0" selected="selected"></option>
                        <option value="=">=</option>
                        <option value=">=">>=</option>
                        <option value=">">></option>
                        <option value="<="><=</option>
                        <option value="<"><</option>
                        <option value="<>"><></option>
                        <option value="7">包含</option>
                        <option value="8">左包含</option>
                        <option value="9">右包含</option>
                        <option value="10">不包含</option>
                    </select>
                </div>
                <div class="layui-inline">
                    <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                </div>
            </div>

                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
                                                    <option value=">=">>=</option>
                                                    <option value=">">></option>
                                                    <option value="<="><=</option>
                                                    <option value="<"><</option>
                                                    <option value="<>"><></option>
                                                    <option value="7">包含</option>
                                                    <option value="8">左包含</option>
                                                    <option value="9">右包含</option>
                                                    <option value="10">不包含</option>
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                            </div>
                                        </div>-->
            <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                <div class="layui-inline">
                    <label class="layui-form-label">过滤</label>
                    <div class="layui-input-block">
                        <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                        </select>
                    </div>
                </div>
                <div class="layui-inline">
                    <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                        <option value="0" selected="selected"></option>
                        <option value="=">=</option>
                        <option value=">=">>=</option>
                        <option value=">">></option>
                        <option value="<="><=</option>
                        <option value="<"><</option>
                        <option value="<>"><></option>
                        <option value="7">包含</option>
                        <option value="8">左包含</option>
                        <option value="9">右包含</option>
                        <option value="10">不包含</option>
                    </select>
                </div>
                <div class="layui-inline">
                    <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                </div>
            </div>-->

                                    </div>
                                </div>
@@ -242,6 +249,26 @@
        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

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

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

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

        //#region äº§å“ç¼–码
        form.on('submit(btnHMATERIALID)', function (data) {
@@ -416,9 +443,13 @@

        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //初始化日期间隔、开始日期、结束日期
            setSelect_HInitTimeCycle();
            //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
            //初始化日期
            $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//提料日期
            $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//至
            $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//至
            //生产组织加载
            Organ();
            //初始化表格
@@ -438,8 +469,8 @@
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 1000
                , limits: [50, 500,1000, 5000, 20000]
                , limit: 50
                , limits: [50, 500,1000, 5000]
                //, loading: false               
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
@@ -458,7 +489,10 @@
                    , { field: '日计划数量', title: '日计划数量', sort: true, totalRow: true, filter: true }
                    , { field: '物料编码', title: '物料编码', sort: true, filter: true  }
                    , { field: '物料名称', title: '物料名称', sort: true, filter: true  }
                    , { field: '物料规格型号', title: '物料规格型号', sort: true, filter: true  }
                    , { field: '物料规格型号', title: '物料规格型号', sort: true, filter: true }
                    , { field: '单位用量', title: '单位用量', sort: true, filter: true }
                    , { field: '供货车间代码', title: '供货车间代码', sort: true, filter: true }
                    , { field: '供货车间', title: '供货车间', sort: true, filter: true }
                    , { field: '物料属性', title: '物料属性', sort: true, filter: true  }
                    , { field: '计划发料数量', title: '计划发料数量', sort: true, totalRow: true, filter: true  }
                    , { field: '齐套数量', title: '齐套数量', sort: true, totalRow: true, filter: true }
@@ -650,7 +684,8 @@
                                    item[itemobj] = "";
                                }
                                if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                                    item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                    item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                    item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                }
                            }
                        });
@@ -810,7 +845,7 @@
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//提料日期
            $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//至
            $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 30), "yyyy-MM-dd"));//至
            $("#HMaterAtt").val("");
            form.render('select');
            sWhere = "";
@@ -909,6 +944,24 @@
            form.render('select');
        }

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

        //#region éšè—åˆ—设置
        function get_HideColumn() {
            var colName = "";