欠料运算添加日期间隔，登录页面修改按钮大小，三升排产页面添加客户订单号

wtt

9 天以前 214fb0ba9f88a44d9c71d82622e89a296bdbf1ee

欠料运算添加日期间隔，登录页面修改按钮大小，三升排产页面添加客户订单号

 WebTM/views/user/login.html

@@ -67,7 +67,7 @@
                                                    <input name="LAY-user-login-username" value="" placeholder="输入登录名称" type="text" id="LAY-user-login-username">
                                                    <span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
                                                </div>
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="position: absolute;margin-top:-3.5rem;margin-left:36rem"><i class="layui-icon layui-icon-layer" style="width:20px"></i></button>
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="position: absolute;margin-top:-3.5rem;margin-left:36rem"><i class="layui-icon layui-icon-layer" style="width: 7px; margin-left: -4px"></i></button>
                                            </div>
                                        </div>
                                    </div>

 WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatForm.html

@@ -1383,7 +1383,8 @@
            columns.push({ type: 'numbers', field: '序号', title: '序号'});
            columns.push({ field: '单据号', title: '单据号', hide: true});
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150});
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;'});
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;' });
            columns.push({ field: '客户订单号', title: '客户订单号', width: 150, style: 'background-color: #f9f9f9;' });
            columns.push({ field: '生产组织', title: '生产组织', width: 150 });
            columns.push({ field: '物料代码', title: '物料编码', width: 150});
            columns.push({ field: '物料名称', title: '物料名称', width: 150});
@@ -1982,9 +1983,9 @@
                sWhere_ICMO += " and concat(产品代码,产品名称,规格型号) like '%" + HMaterName_ICMO + "%'";
            }
            if (HICMOBillNo_ICMO) {
                sWhere_ICMO += " and å•æ®å· like '%" + HICMOBillNo_ICMO + "%'";
                sWhere_ICMO += " and (客户订单号 like '%" + HICMOBillNo_ICMO + "%' or å•æ®å· like '%" + + HICMOBillNo_ICMO + "%')";
            }
            sWhere_ICMO += " and çŠ¶æ€ like '%开工%'";
            sWhere_ICMO += " and çŠ¶æ€ like '%开工%' or çŠ¶æ€ like '%计划确认%'";
            get_Display2(sWhere_ICMO);
            sWhere_ICMO = ""//调用接口后清空sWhere缓存
        }

 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();
            //车间
@@ -622,6 +678,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模块
    });