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

wtt

2024-10-28 07cf94734c36d4eae6ddbc4dd338bf5af81a2193

 WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsList.html

@@ -53,6 +53,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: 80px;">
@@ -125,6 +132,89 @@
                                            <select name="Organization" id="Organization" lay-verify="Organization">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <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" 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-bottom: 10px ">
                                        <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" lay-filter="Comparator1" class="ForFilteringSchemes" 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-bottom: 10px ">
                                        <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" lay-filter="Comparator2" class="ForFilteringSchemes" 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>
@@ -226,7 +316,24 @@


        //#endregion
        //日期间隔下拉列表监听
        form.on('select(HInitTimeCycle)', function (data) {
            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
            //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
            if (HInitTimeCycle != -1) {
                $('#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"));

                //执行查询方法
                get_FastQuery();
            } else {
                $('#HBeginDate').prop('disabled', false);
                $('#HEndDate').prop('disabled', false);
            }
        });
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        //初始化界面
@@ -235,8 +342,21 @@
            set_InitGrid();
            get_Display(sWhere);
            Organ();
            //时间初始化
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));

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

            //根据日期间隔设置开始时间与结束时间
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            DisPlay_HideColumn();
        }
@@ -268,6 +388,7 @@
                //, toolbar: '#toolbarDemo'
                , height: 'full-120'
                , page: true
                , totalRow: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
@@ -285,8 +406,8 @@
                , { field: '物料代码', title: '物料代码', width: 160, sort: true}
                , { field: '物料名称', title: '物料名称', width: 160, sort: true}
                    , { field: '规格型号', title: '规格型号', width: 160, sort: true}
                    , { field: '拣料数量', title: '拣料数量', width: 160, sort: true}
                    , { field: '已调拨数量', title: '已调拨数量', width: 160, sort: true}
                    , { field: '拣料数量', title: '拣料数量', totalRow: true,width: 160, sort: true}
                    , { field: '已调拨数量', title: '已调拨数量', totalRow: true, width: 160, sort: true}
                    , { field: '计量单位', title: '计量单位', width: 160, sort: true}
                    , { field: '车间', title: '车间', width: 160, sort: true}
                    , { field: '工段', title: '工段', width: 160, sort: true}
@@ -499,7 +620,79 @@
            var HDeptName = $("#HDeptName").val(); //部门
            var HJLStatus = $("#HJLStatus").val(); //拣料状态
            var user = sessionStorage["HUserName"]; //制单人
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }
            sWhere = {
                MaterialNumber: MaterialNumber,
                MaterialName: MaterialName,
@@ -596,6 +789,27 @@
                })
            }
        }

        //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
        table.on('row(mainTablemainTable)', function (obj) {
            //选中行改变颜色
            var flag = !obj.tr.find(':checkbox:first').prop('checked');
            obj.tr.find(':checkbox').prop('checked', flag);
            if (flag) {
                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
            } else {
                obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
            }
            //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
            layui.each(table.cache.mainTable, function (i, l) {
                if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                    l.LAY_CHECKED = flag;
                }
            });
        })
            //#endregion

        //隐藏列设置
        function get_HideColumn() {
@@ -701,6 +915,42 @@
        }


        //#region ä»»æ„å­—段过滤：列名显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);
            $("#ColName1").empty();
            $("#ColName1").append(Organization);
            $("#ColName2").empty();
            $("#ColName2").append(Organization);

            form.render('select');
        }
        //#endregion

        //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
        function setSelect_HInitTimeCycle() {
            var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist数组包含与时间相关的整数值
            var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];  //itilelist与valuelist值相对于的表，且作为下拉框文本显示

            var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';//定义字符串HInitTimeCycle_ArrayList ä½œç”¨äºŽä¸‹æ‹‰åˆ—çš„html内容 åŒ…含option元素，值为—1，且在下拉框显示任意间隔
            for (var i = 0; i < valueList.length; i++) {                                   // éåŽ†valueList  æ•°ç»„  ä½¿æ¯ä¸€ä¸ªå€¼ç”Ÿæˆä¸€ä¸ªå¯¹åº”option元素
                HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// æŠŠç”Ÿæˆçš„option元素添加入HInitTimeCycle_ArrayList字符串中
            }

            $("#HInitTimeCycle").empty();           //使用jquery的empty方法清空HInitTimeCycle_ArrayList <select>元素的值
            $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //使用append方法构建之前HInitTimeCycle_ArrayList字符串 çš„内容传入HInitTimeCycle  
            form.render('select');       //调用 é‡æ–°æ¸²æŸ“select元素

            $("#HInitTimeCycle").val("29");   //使用jQuery的val()方法将下拉列表的选中值设置为"29   ï¼Œä¸”显示《近三時天》
        }
            //#endregion
        //#endregion

    });