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

yangle

2024-06-06 bd170f98bd06076af6af91ca29a67b3cc4db6790

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂ뱨±í/Kf_StockInOutSumQueryReport.html

@@ -76,6 +76,12 @@
                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">物料ID</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HMaterID" id="HMaterID" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -119,26 +125,39 @@
            var option = [];
            var ins;                        //用于导出excel
            var columns = "";
            var HModName = "Kf_MaterOutInReport";
            var HModName = "Kf_StockInOutSumQueryReport";
            var titleData = [];     //不需要显示的字段
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //获取页面跳转参数
            var params = get_UrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1查询
            var HMaterID = params[params[1]]; //从参数中获取 ç‰©æ–™id
            if (HMaterID != null) {
                $("#HMaterID").val(HMaterID);
                //获取开始日期、结束日期
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30 * 6), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            } else {
                //获取开始日期、结束日期
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            }


            //初始化界面
            set_ClearBill();

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //获取开始日期、结束日期
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                
                //获取组织
                Organ();
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_Display();
            }
            //#endregion

@@ -330,12 +349,13 @@
            function get_Display() {
                var HBeginDate = $("#HBeginDate").val();        //开始日期
                var HEndDate = $("#HEndDate").val();            //结束日期
                var HMaterID = $("#HMaterID").val();            //物料ID
                var HMaterNumber = $("#HMaterNumber").val();          //物料编码
                var HMaterName = $("#HMaterName").val();          //物料名称
                var HWHName = $("#HWHName").val();              //仓库
                var HModel = $("#HModel").val();               //规格型号

                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HWHName + "'" ;
                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HMaterID + "','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HWHName + "'" ;

                var ajaxLoad = layer.load();
                $.ajax({
@@ -344,7 +364,7 @@
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                        if (data1.data != null) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
@@ -401,6 +421,55 @@
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                        } else {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == '数量') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            }
                                    }
                                }
                            }
                            columns = col;

                            //设置赋值列宽
                            var colWidth = getColumnsWidth();
                            if (colWidth == "" || colWidth == []) {

                            }
                            else {
                                $.each(columns, function (x, m) {
                                    m["width"] = colWidth[x];
                                });
                            }
                            option.cols = [columns];
                            option.data = [[]];
                            option.totalRow = true;
                            table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
@@ -424,6 +493,7 @@
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));    //开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));   //结束日期
                $("#HMaterID").val("");            //物料ID
                $("#HMaterNumber").val("");           //物料编码
                $("#HMaterName").val("");         //物料名称
                $("#HModel").val("");          //规格型号