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

cwjbxqmz

2023-11-03 10933c3b600711a70b74ffbeea41b51f7e7c0924

 WebTM/views/ReportHtml.html

@@ -198,9 +198,10 @@
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
                        console.log(data1);
                        for (var key in data1.list)
                        {
                            resultTableHead.push({ "id": data1.list[key], "name": data1.list[key] });
                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        set_InitGrid(sWhere);
                    }, error: function (err) {
@@ -217,26 +218,39 @@
                //填充表格头数组
                var data = resultTableHead;
                cols_arr[0] = [];
                cols_arr[0][0] = { checkbox: true, fixed: true };
                cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '合计' };
                for (var i = 0; i < data.length; i++) {
                    if (data[i].name == 'HItemID') {
                        cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //隐藏id列
                    }
                    else
                    {
                        cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center'};
                        switch (data[i].Type)
                        {
                            //int
                            case 'Int32':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true ,sort: true};
                                break;
                            //Decimal
                            case 'Decimal': 
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true};
                                break;
                            default:
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center' ,sort: true};
                        }
                    }
                }
                //填充表格数据
                table.render({
                    elem: '#layTable',
                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportFromBillList',
                    toolbar: '#toolbarDemo', //开启头部工具栏，并为其绑定左侧模板
                    //toolbar: '#toolbarDemo', //开启头部工具栏，并为其绑定左侧模板
                    title: '用户数据表',
                    cols: cols_arr,    //填充表格头数据,
                    id: 'layTable', //表格id
                    where: { sWhere: sWhere}, //扩展参数,可以传数据到后台
                    page: true,   //开启分页
                    totalRow: true, //开启合计
                    limit: 10,     //一页能够显示的最大数目
                    limits: [10, 20, 40, 60,80,100], //控制多少行一页（默认五条一页）
                    method: 'get',  //提交方式