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

zrg

2024-10-18 77aac4ae4c153356f69882db6f870d7d69ec200d

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

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,7 +8,7 @@
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)

 WebTM/views/grf/·µ¹¤Á÷ת¿¨ - A5.grf

New file
@@ -0,0 +1,683 @@
{
    "Version":"6.8.9.1",
    "Font":{
        "Name":"宋体",
        "Size":105000,
        "Weight":400,
        "Charset":134
    },
    "Printer":{
        "Size":11,
        "Width":14.8,
        "Height":21,
        "Oriention":"Landscape",
        "LeftMargin":1.5,
        "TopMargin":0,
        "RightMargin":1.5,
        "BottomMargin":0,
        "PrintOffsetY":0.55
    },
    "DetailGrid":{
        "Recordset":{
            "Field":[
                {
                    "Name":"单据号"
                },
                {
                    "Name":"日期",
                    "Type":"DateTime",
                    "Format":"yyyy/MM/dd"
                },
                {
                    "Name":"生产订单号"
                },
                {
                    "Name":"派工单号"
                },
                {
                    "Name":"生产车间"
                },
                {
                    "Name":"产品代码"
                },
                {
                    "Name":"产品名称"
                },
                {
                    "Name":"产品规格"
                },
                {
                    "Name":"流转卡数量"
                },
                {
                    "Name":"卡数量"
                },
                {
                    "Name":"批号"
                },
                {
                    "Name":"流水号"
                },
                {
                    "Name":"工序代码"
                },
                {
                    "Name":"工序名称"
                },
                {
                    "Name":"班组"
                },
                {
                    "Name":"机台"
                },
                {
                    "Name":"实作数量"
                },
                {
                    "Name":"工序说明"
                },
                {
                    "Name":"班号"
                },
                {
                    "Name":"工段名称"
                },
                {
                    "Name":"工艺工作中心"
                },
                {
                    "Name":"工艺工艺参数"
                },
                {
                    "Name":"生产订单数量"
                },
                {
                    "Name":"已汇报数量"
                }
            ]
        },
        "Column":[
            {
                "Name":"Column14",
                "Width":0.978958
            },
            {
                "Name":"Column1",
                "Width":1.61396
            },
            {
                "Name":"Column2",
                "Width":2.19604
            },
            {
                "Name":"Column16",
                "Width":2.01083
            },
            {
                "Name":"Column3",
                "Width":1.98438
            },
            {
                "Name":"Column8",
                "Width":2.38125
            },
            {
                "Name":"Column9",
                "Width":1.64042
            },
            {
                "Name":"Column17",
                "Width":1.6404
            },
            {
                "Name":"Column12",
                "Width":2.35479
            },
            {
                "Name":"Column15",
                "Width":0.978958
            }
        ],
        "ColumnContent":{
            "Height":0.79375,
            "AdjustRowHeight":false,
            "RowsPerPage":10,
            "ColumnContentCell":[
                {
                    "Column":"Column14",
                    "FreeCell":true,
                    "Control":[
                        {
                            "Type":"SystemVarBox",
                            "Name":"SystemVarBox3",
                            "Left":0.5,
                            "Top":-0.8,
                            "Width":1.5875,
                            "Height":0.608542,
                            "SystemVar":"RowNo"
                        },
                        {
                            "Type":"FieldBox",
                            "Name":"FieldBox14",
                            "Dock":"Fill",
                            "DataField":"流水号"
                        }
                    ]
                },
                {
                    "Column":"Column1",
                    "DataField":"工序代码"
                },
                {
                    "Column":"Column2",
                    "CanGrow":true,
                    "CanShrink":true,
                    "ShrinkFontToFit":true,
                    "DataField":"工序名称"
                },
                {
                    "Column":"Column16",
                    "ShrinkFontToFit":true,
                    "DataField":"工段名称"
                },
                {
                    "Column":"Column3",
                    "ShrinkFontToFit":true,
                    "DataField":"班组"
                },
                {
                    "Column":"Column8",
                    "WordWrap":true,
                    "DataField":"工艺工作中心"
                },
                {
                    "Column":"Column9",
                    "WordWrap":true,
                    "ShrinkFontToFit":true,
                    "DataField":"实作数量"
                },
                {
                    "Column":"Column17",
                    "DataField":"已汇报数量"
                },
                {
                    "Column":"Column12",
                    "ShrinkFontToFit":true,
                    "DataField":"工艺工艺参数"
                },
                {
                    "Column":"Column15",
                    "DataField":"班号"
                }
            ]
        },
        "ColumnTitle":{
            "Height":0.608542,
            "RepeatStyle":"OnPage",
            "ColumnTitleCell":[
                {
                    "GroupTitle":false,
                    "Column":"Column14",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "ShrinkFontToFit":true,
                    "Text":"工序号"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column1",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"工序代码"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column2",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"工序名称"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column16",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"工段名称"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column3",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"班组"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column8",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"机台"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column9",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "ShrinkFontToFit":true,
                    "Text":"数量"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column17",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "WordWrap":true,
                    "TextAlign":"MiddleCenter",
                    "ShrinkFontToFit":true,
                    "Text":"已汇报数量"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column12",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"工序说明"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column15",
                    "Font":{
                        "Name":"宋体",
                        "Size":105000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"班号"
                }
            ]
        }
    },
    "Parameter":[
        {
            "Name":"页码"
        }
    ],
    "ReportHeader":[
        {
            "Name":"ReportHeader1",
            "CanGrow":true,
            "CanShrink":true,
            "Height":3.99521,
            "Font":{
                "Name":"宋体",
                "Size":105000,
                "Bold":true,
                "Charset":134
            },
            "Control":[
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox1",
                    "Center":"Horizontal",
                    "Left":7.19667,
                    "Width":3.59833,
                    "Height":0.687917,
                    "Font":{
                        "Name":"宋体",
                        "Size":180000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"返工流转卡"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox3",
                    "Left":5.60917,
                    "Top":2.19604,
                    "Width":2.61938,
                    "Height":0.608542,
                    "Text":"生产车间:"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox4",
                    "Left":4.39208,
                    "Top":1.00542,
                    "Width":2.98979,
                    "Height":0.608542,
                    "TextAlign":"MiddleCenter",
                    "Text":"QC检查方式："
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox8",
                    "Left":0.396875,
                    "Top":2.19604,
                    "Width":1.19063,
                    "Height":0.608542,
                    "Text":"日期："
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox1",
                    "Left":7.40833,
                    "Top":2.19604,
                    "Width":3.99521,
                    "Height":0.608542,
                    "DataField":"生产车间"
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox6",
                    "Left":1.5875,
                    "Top":2.19604,
                    "Width":3.78354,
                    "Height":0.608542,
                    "DataField":"日期"
                },
                {
                    "Type":"SystemVarBox",
                    "Name":"SystemVarBox1",
                    "Left":15.6104,
                    "Top":1.40229,
                    "Width":1.79917,
                    "Height":0.423333,
                    "Format":"共0页",
                    "SystemVar":"PageCount"
                },
                {
                    "Type":"SystemVarBox",
                    "Name":"SystemVarBox2",
                    "Left":14.3933,
                    "Top":1.40229,
                    "Width":1.21708,
                    "Height":0.423333,
                    "Format":"第0页"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox18",
                    "Left":11.2713,
                    "Top":2.19604,
                    "Width":2.61938,
                    "Height":0.608542,
                    "Text":"产品代码："
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox10",
                    "Left":13.2027,
                    "Top":2.19604,
                    "Width":4.33917,
                    "Height":0.608542,
                    "DataField":"产品代码"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox21",
                    "Left":11.43,
                    "Top":3.33375,
                    "Width":2.80458,
                    "Height":0.582083,
                    "Text":"批次："
                },
                {
                    "Type":"Barcode",
                    "Name":"Barcode1",
                    "Left":12.2502,
                    "Top":0.899583,
                    "Width":1.98438,
                    "Height":1.21708,
                    "BarcodeType":"QRCode",
                    "CaptionPosition":"None",
                    "CaptionAlignment":"Far",
                    "CheckSum":true,
                    "Text":"[#单据号#]"
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox11",
                    "Left":12.5677,
                    "Top":3.33375,
                    "Width":4.60375,
                    "Height":0.582083,
                    "DataField":"批号"
                },
                {
                    "Type":"Barcode",
                    "Name":"Barcode2",
                    "Left":0.211667,
                    "Top":0.608542,
                    "Width":2.59292,
                    "Height":1.40229,
                    "BarcodeType":"QRCode",
                    "CaptionPosition":"None",
                    "Text":"[#生产订单号#]"
                },
                {
                    "Type":"StaticBox",
                    "Name":"StaticBox1",
                    "Left":12.0121,
                    "Top":0.211667,
                    "Width":1.79917,
                    "Height":0.582083,
                    "Text":"流转卡号"
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox13",
                    "Left":13.8113,
                    "Top":0.211667,
                    "Width":4.20688,
                    "Height":0.582083,
                    "DataField":"单据号"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox24",
                    "Left":0.211667,
                    "Width":5.79438,
                    "Height":0.582083,
                    "Text":"任务单号：[#生产订单号#]"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox25",
                    "Left":7.19667,
                    "Top":1.00542,
                    "Width":1.19063,
                    "Height":0.608542,
                    "Font":{
                        "Name":"宋体",
                        "Size":90000,
                        "Bold":true,
                        "Charset":134
                    },
                    "Text":"抽检"
                },
                {
                    "Type":"ShapeBox",
                    "Name":"ShapeBox1",
                    "Left":8.38729,
                    "Top":1.00542,
                    "Width":0.58,
                    "Height":0.58
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox26",
                    "Left":9.2075,
                    "Top":1.00542,
                    "Width":1.40229,
                    "Height":0.608542,
                    "Font":{
                        "Name":"宋体",
                        "Size":90000,
                        "Bold":true,
                        "Charset":134
                    },
                    "Text":"抽检"
                },
                {
                    "Type":"ShapeBox",
                    "Name":"ShapeBox2",
                    "Left":10.2129,
                    "Top":1.00542,
                    "Width":0.58,
                    "Height":0.58
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox27",
                    "Left":0.396875,
                    "Top":2.75167,
                    "Width":9.60438,
                    "Height":0.608542,
                    "Text":"产品名称：[#产品名称#]"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox28",
                    "Left":11.2713,
                    "Top":2.77813,
                    "Width":6.21771,
                    "Height":0.608542,
                    "Text":"规格型号：[#产品规格#]"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox29",
                    "Left":0.396875,
                    "Top":3.30729,
                    "Width":5.18583,
                    "Height":0.608542,
                    "Text":"生产数量：[#生产订单数量#]"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox30",
                    "Left":5.76792,
                    "Top":3.30729,
                    "Width":4.81542,
                    "Height":0.608542,
                    "Text":"卡数量：[#流转卡数量#]"
                }
            ],
            "RepeatOnPage":true
        }
    ],
    "ReportFooter":[
        {
            "Name":"ReportFooter1",
            "Height":1.19063,
            "Control":[
                {
                    "Type":"FreeGrid",
                    "Name":"FreeGrid1",
                    "AlignColumn":"(GridLeft)",
                    "AlignColumnEx":"(GridRight)",
                    "Border":{
                        "Styles":"[DrawLeft|DrawRight|DrawBottom]"
                    },
                    "ColumnCount":7,
                    "RowCount":2,
                    "FreeGridColumn":[
                        {
                            "index":1,
                            "Width":2.593
                        },
                        {
                            "index":2,
                            "Width":2.19604
                        },
                        {
                            "index":3,
                            "Width":2.0108
                        },
                        {
                            "index":4,
                            "Width":1.98438
                        },
                        {
                            "index":5,
                            "Width":2.38125
                        },
                        {
                            "index":6,
                            "Width":1.6404
                        },
                        {
                            "index":7,
                            "Width":4.9744
                        }
                    ],
                    "FreeGridRow":[
                        {
                            "index":1,
                            "Height":0.449792
                        }
                    ],
                    "FreeGridCell":[
                        {
                            "row":1,
                            "col":1,
                            "Text":"入库记录"
                        },
                        {
                            "row":2,
                            "col":1,
                            "Text":"领用记录"
                        }
                    ]
                }
            ]
        }
    ]
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList.aspx

@@ -14,7 +14,7 @@
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,case when ISNULL(a.生产幅宽,0)=0 then a.幅宽 else a.生产幅宽 end å¹…宽,case when ISNULL(a.生产克重,0) = 0 then a.克重 else a.生产克重 end å…‹é‡,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求,a.辅数量2,a.HAuxUnit2,a.辅助单位2 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.流水号 as int)","select 1");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,case when ISNULL(a.生产幅宽,0)=0 then a.幅宽 else a.生产幅宽 end å¹…宽,case when ISNULL(a.生产克重,0) = 0 then a.克重 else a.生产克重 end å…‹é‡,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求,a.辅数量2,a.HAuxUnit2,a.辅助单位2,b.HRelationQty_Out å·²æ±‡æŠ¥æ•°é‡ from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.流水号 as int)","select 1");
        }
    </script>
</head>

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier.html

@@ -253,7 +253,11 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });

            //#region é‡æ–°åŒæ­¥æŒ‰é’®

 WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer.html

@@ -302,7 +302,11 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });
            //#endregion


 WebTM/views/¹¤×ʹÜÀí/¶¨¶îÉêÇë/Pay_ProcPriceRequestBillList.html

@@ -308,88 +308,193 @@
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        type: "GET",
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        async: false,
            //        data: { "HModName": HModName, "user": HMaker },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {
            //                var dataCol = [];//数据库查询出的列数据
            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //                ins = table.render(option);
            //            } else {
            //                table.render(option);
            //                ins = table.render(option);
            //            }

            //            //刷新按钮显示
            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            Display_HideButton(btns, HBillType, HModName, HMaker);

            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}
            //#endregion


            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": HMaker },
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                            
                        } else {
                            table.render(option);
                            ins = table.render(option);
                            
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName, HMaker);

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion


            //#endregion

@@ -865,7 +970,7 @@
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
@@ -874,7 +979,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -925,7 +1030,11 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });

            //快速查询
@@ -1174,7 +1283,7 @@
                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>';
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName").empty();

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillList.html

@@ -303,69 +303,174 @@
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        type: "GET",
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        async: false,
            //        data: { "HModName": HModName, "user": HMaker },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {
            //                var dataCol = [];//数据库查询出的列数据
            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //                ins = table.render(option);
            //            } else {
            //                table.render(option);
            //                ins = table.render(option);
            //            }

            //            //刷新按钮显示
            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            Display_HideButton(btns, HBillType, HModName, HMaker);

            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": HMaker },
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
@@ -374,17 +479,16 @@
                            table.render(option);
                            ins = table.render(option);
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName, HMaker);

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion


            //#endregion

@@ -700,7 +804,7 @@
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
@@ -709,7 +813,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -760,7 +864,11 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });

            //快速查询
@@ -1012,7 +1120,7 @@
                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>';
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName").empty();

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¼¯Ìå)/Pay_GroupBalBillList.html

@@ -302,83 +302,201 @@
            })
            //#endregion

            table.on('sort(mainTable)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
                //刷新按钮显示
                var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                Display_HideButton(btns, HBillType, HModName, HMaker);
            });

            ////#region æ˜¾ç¤ºåˆ—数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        type: "GET",
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        async: false,
            //        data: { "HModName": HModName, "user": HMaker },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {
            //                var dataCol = [];//数据库查询出的列数据
            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //                ins = table.render(option);
            //            } else {
            //                table.render(option);
            //                ins = table.render(option);
            //            }

            //            //刷新按钮显示
            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            Display_HideButton(btns, HBillType, HModName, HMaker);

            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}
            ////#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": HMaker },
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                            
                        } else {
                            table.render(option);
                            ins = table.render(option);
                            
                        }

                        //刷新按钮显示
                         //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName, HMaker);

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
@@ -710,7 +828,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -761,7 +879,11 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });

            //快速查询
@@ -967,7 +1089,7 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            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 HH:mm:ss')}}</div>", width: 160 });
                                            break;
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
@@ -976,7 +1098,7 @@
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                    }
                                }
                            }
@@ -1014,7 +1136,7 @@
                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>';
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName").empty();

 WebTM/views/¹¤×ʹÜÀí/Òì³£¹¤Ê±ÉêÇëµ¥/Pay_ErrWorkTimesRequestBillList.html

@@ -303,88 +303,191 @@
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        type: "GET",
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        async: false,
            //        data: { "HModName": HModName, "user": HMaker },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {
            //                var dataCol = [];//数据库查询出的列数据
            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //                ins = table.render(option);
            //            } else {
            //                table.render(option);
            //                ins = table.render(option);
            //            }

            //            //刷新按钮显示
            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            Display_HideButton(btns, HBillType, HModName, HMaker);

            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": HMaker },
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                            
                        } else {
                            table.render(option);
                            ins = table.render(option);
                            
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName, HMaker);

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion


            //#endregion

@@ -701,7 +804,7 @@
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
@@ -710,7 +813,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -761,7 +864,11 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });

            //快速查询
@@ -1010,7 +1117,7 @@
                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>';
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName").empty();

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillList.html

@@ -306,86 +306,189 @@
            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": HMaker },
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                            
                        } else {
                            table.render(option);
                            ins = table.render(option);
                            
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, HBillType, HModName, HMaker);

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion

            ////#region æ˜¾ç¤ºåˆ—数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        type: "GET",
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        async: false,
            //        data: { "HModName": HModName, "user": HMaker },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {
            //                var dataCol = [];//数据库查询出的列数据
            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //                ins = table.render(option);
            //            } else {
            //                table.render(option);
            //                ins = table.render(option);
            //            }

            //            //刷新按钮显示
            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            Display_HideButton(btns, HBillType, HModName, HMaker);

            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}
            ////#endregion

            //#endregion

@@ -724,7 +827,7 @@
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
@@ -733,7 +836,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -784,7 +887,11 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });

            //快速查询
@@ -1035,7 +1142,7 @@
                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>';
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName").empty();

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html

@@ -862,8 +862,8 @@
            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
@@ -875,7 +875,7 @@
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
@@ -887,93 +887,197 @@
            }

            //显示列数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        type: "GET",
            //        data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {


            //                var dataCol = [];//数据库查询出的列数据
                         
                         
            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
            //                    var dataCols = dataCol[i].split('|');
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //设置列宽
            //                    //if (data1.data[0].HColumnWidth != 0) {
            //                    //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
            //                    //} else {
            //                    //    option.cols[0][i + 1]["width"] = "";
            //                    //}
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //            } else {
            //                table.render(option);
            //            }

            //            //刷新按钮显示
            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            var HBillType = "条码主档";
            //            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {


                            var dataCol = [];//数据库查询出的列数据
                         
                         
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
                            
                        } else {
                            table.render(option);
                            
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "条码主档";
                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function get_Export() {

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -782,7 +782,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-80'
                    //, page: true
                    , page: false
                    , cellMinWidth: 'auto'
                    , totalRow: true
                    , limit: 50
@@ -1129,23 +1129,8 @@
                                    }
                                }
                            }

                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , totalRow: true
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-120'
                                //, page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            ins = table.render(option);

                            laypage.render(optionPage);

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -275,8 +275,7 @@

            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            //初始化表格
            DisPlay_HideColumn();

            //初始化界面
            set_ClearBill();

@@ -364,7 +363,11 @@
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {//选择仓位

                get_FastQuery(2);
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery(2);
                }
            });
            //#endregion

@@ -1492,7 +1495,7 @@
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
@@ -1502,7 +1505,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -1524,88 +1527,188 @@
            }

            //显示列数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        type: "GET",
            //        async: "false",
            //        data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {


            //                var dataCol = [];//数据库查询出的列数据
            //                var titleData = [];//不需要显示的字段 å¯æ‰©å±•

            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
                                
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //设置列宽
            //                    //if (data1.data[0].HColumnWidth != 0) {
            //                    //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
            //                    //} else {
            //                    //    option.cols[0][i + 1]["width"] = "";
            //                    //}
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //统计列
            //                    if (dataCols[6] == 1) {
            //                        option.cols[0][i + 1]["totalRow"] = true;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                    //设置表格title属性显示别名
            //                    if (dataCols[4] != null && dataCols[4] != "") {
            //                        option.cols[0][i + 1]["title"] = dataCols[4];
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //            } else {
            //                table.render(option);
            //            }
            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: "false",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [];//不需要显示的字段 å¯æ‰©å±•

                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //统计列
                                if (dataCols[6] == 1) {
                                    option.cols[0][i + 1]["totalRow"] = true;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                                //设置表格title属性显示别名
                                if (dataCols[4] != null && dataCols[4] != "") {
                                    option.cols[0][i + 1]["title"] = dataCols[4];
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
@@ -1619,6 +1722,9 @@
                    }
                })
            }
            //#endregion


            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillList2.html

@@ -965,7 +965,7 @@
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
@@ -974,7 +974,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -996,85 +996,190 @@
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        type: "GET",
            //        data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {

            //                var dataCol = [];//数据库查询出的列数据
            //                //var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•
            //                //不需要显示的字段 å¯æ‰©å±•
            //                var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 1; i++) {
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //设置列宽
            //                    //if (data1.data[0].HColumnWidth != 0) {
            //                    //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
            //                    //} else {
            //                    //    option.cols[0][i + 1]["width"] = "";
            //                    //}
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //            } else {
            //                table.render(option);
            //            }

            //            //刷新按钮显示
            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            var HBillType = "7507";
            //            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            //var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•
                            //不需要显示的字段 å¯æ‰©å±•
                            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
                            
                        } else {
                            table.render(option);
                            
                        }

                        //刷新按钮显示
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "7507";
@@ -1085,6 +1190,7 @@
                })
            }
            //#endregion


            //#region ä»»æ„å­—段过滤：列名显示下拉框
            function ColFilter() {
@@ -1101,7 +1207,7 @@

                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true && option.cols[0][i].field != HSelectedVal) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName1").empty();

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -1574,38 +1574,8 @@
                                }
                            }

                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 780
                                //, page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                //, limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                                //, done: function (res, curr, count) {
                                //    var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                                //    var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                                //    var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                                //    for (var i = 0; i < $data.length; i++) {
                                //        var l1 = $data.eq(i).find('div').width();
                                //        var l2 = $head.eq(i).find('div').width();
                                //        if (l1 > l2) {
                                //            $head.eq(i).find('div').width(l1);
                                //            $total.eq(i).find('div').width(l1);
                                //        } else {
                                //            $data.eq(i).find('div').width(l2);
                                //            $total.eq(i).find('div').width(l2);
                                //        }
                                //    }
                                //}
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            ins = table.render(option);

                            laypage.render(optionPage);
@@ -2769,7 +2739,7 @@
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {

 WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBill.html

@@ -24,6 +24,7 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button type="button" id="check-btn" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_CheckBill">审核</button>
                        <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>打印</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                    </div>
@@ -574,6 +575,13 @@
            //#endregion

            //#region æ“ä½œæŒ‰é’®è§¦å‘事件

            //#region å®¡æ ¸æŒ‰é’®
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(0);
            });
            //#endregion

            //#region ä¿å­˜æäº¤
            form.on('submit(btnSave)', function (data) {//提交
                //if (AllowLoadData(data)) {
@@ -1285,7 +1293,7 @@
                                //关闭当前frame
                                layer.close(index);
                            });

                            $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// ç¦ç”¨å®¡æ ¸æŒ‰é’®
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Cg_POInStockBillList.html

@@ -1368,7 +1368,7 @@
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
@@ -1378,7 +1378,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -1400,6 +1400,102 @@
            }

            //显示列数据
            //function DisPlay_HideColumn() {
            //    $.ajax({
            //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
            //        type: "GET",
            //        async: false,
            //        data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
            //        success: function (data1) {
            //            if (data1.data.length != 0) {


            //                var dataCol = [];//数据库查询出的列数据
            //                var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID","HSPID","计量单位代码","收料仓库代码","仓位代码"];//不需要显示的字段 å¯æ‰©å±•

            //                dataCol = data1.data[0].HGridString.split(',');

            //                for (var i = 0; i < option.cols[0].length - 2; i++) {
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
                               
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
            //                    }
            //                    //设置列宽
            //                    if (dataCols[3] > 0) {
            //                        option.cols[0][i + 1]["width"] = dataCols[3];
            //                    }
            //                    //设置内容字体大小
            //                    if (data1.data[0].HFontSize != 0) {
            //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
            //                    } else {
            //                        option.cols[0][i + 1]["style"] = "font-size:100%";
            //                    }
            //                    //设置列宽
            //                    //if (data1.data[0].HColumnWidth != 0) {
            //                    //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
            //                    //} else {
            //                    //    option.cols[0][i + 1]["width"] = "";
            //                    //}
            //                    //显示列
            //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
            //                        option.cols[0][i + 1]["hide"] = false;
            //                    }
            //                    //字体所在位置(å·¦ å±…中 å³)
            //                    switch (dataCols[2]) {
            //                        case "L":
            //                            option.cols[0][i + 1]["align"] = "left";
            //                            break;
            //                        case "M":
            //                            option.cols[0][i + 1]["align"] = "center";
            //                            break;
            //                        case "R":
            //                            option.cols[0][i + 1]["align"] = "right";
            //                            break;
            //                    }
            //                    //设置表格title属性显示别名
            //                    if (dataCols[4] != null && dataCols[4] != "") {
            //                        option.cols[0][i + 1]["title"] = dataCols[4];
            //                    }
            //                }

            //                //取消冻结列
            //                for (var i = 1; i < option.cols[0].length - 1; i++) {
            //                    if (option.cols[0][i]["fixed"] != null) {
            //                        option.cols[0][i]["fixed"] = null;
            //                    }
            //                    else {
            //                        break;
            //                    }
            //                }
            //                //冻结列
            //                if (data1.data[0].HFixCols != 0) {
            //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
            //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
            //                            data1.data[0].HFixCols += 1;
            //                        }
            //                        option.cols[0][i + 1]["fixed"] = "left";
            //                    }
            //                }
            //                table.render(option);
            //            } else {
            //                table.render(option);
            //            }

            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            var HBillType = "1103";
            //            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

            //        }, error: function () {
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    })
            //}

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -1409,91 +1505,99 @@
                    success: function (data1) {
                        if (data1.data.length != 0) {


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID","HSPID","计量单位代码","收料仓库代码","仓位代码"];//不需要显示的字段 å¯æ‰©å±•

                            var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID", "HSPID", "计量单位代码", "收料仓库代码", "仓位代码"];//不需要显示的字段 å¯æ‰©å±•
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                               
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                                //设置表格title属性显示别名
                                if (dataCols[4] != null && dataCols[4] != "") {
                                    option.cols[0][i + 1]["title"] = dataCols[4];
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            if (data1.data[0].HFontSize != 0) {
                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                            } else {
                                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                            }
                                            //显示列
                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            switch (dataCols[2]) {
                                                case "L":
                                                    option.cols[0][i + 1]["align"] = "left";
                                                    break;
                                                case "M":
                                                    option.cols[0][i + 1]["align"] = "center";
                                                    break;
                                                case "R":
                                                    option.cols[0][i + 1]["align"] = "right";
                                                    break;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
                                        if (option.cols[0][i]["fixed"] != null) {
                                            option.cols[0][i]["fixed"] = null;
                                        }
                                        else {
                                            break;
                                        }
                                    }
                                    //冻结列
                                    if (data1.data[0].HFixCols != 0) {
                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                                data1.data[0].HFixCols += 1;
                                            }
                                            option.cols[0][i + 1]["fixed"] = "left";
                                        }
                                    }
                                }
                            }
                            table.render(option);
                            
                        } else {
                            table.render(option);
                        }

                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "1103";
                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion


            //#region ä»»æ„å­—段过滤：列名显示下拉框
            function ColFilter() {

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -46,6 +46,7 @@
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">审核</button>
                            <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>打印</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                        </div>
@@ -546,6 +547,12 @@
            });

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

            //#region å®¡æ ¸æŒ‰é’®
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(0);
            });
            //#endregion

            //退出按钮
            form.on('submit(Exit)', function () {
@@ -1239,7 +1246,7 @@
                                    //关闭当前frame
                                    layer.close(index);
                                });

                                $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// ç¦ç”¨å®¡æ ¸æŒ‰é’®
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }

 WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html

@@ -46,6 +46,7 @@
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                            <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">审核</button>
                            <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>打印</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius " lay-submit="" lay-filter="Exit">退出</button>
                        </div>
@@ -482,6 +483,12 @@
            });

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

            //#region å®¡æ ¸æŒ‰é’®
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(0);
            });
            //#endregion

            //退出按钮
            form.on('submit(Exit)', function () {
@@ -1153,7 +1160,7 @@
                                //关闭当前frame
                                layer.close(index);
                            });

                            $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// ç¦ç”¨å®¡æ ¸æŒ‰é’®
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html

@@ -46,7 +46,7 @@
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                            <button type="button" id="set_CheckBill" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="set_CheckBill" disabled>审核</button>
                            <button type="button" id="set_CheckBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">审核</button>
                            <button type="button" id="btn-print" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn-print">打印</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                        </div>
@@ -618,7 +618,7 @@
            else if (OperationType == 3) {                                              //编辑
                if (closeType == 10) {
                    $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                    //$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#btn-print').addClass("layui-btn-disabled").attr("disabled", true);
                }
                //修改时主表ID
@@ -3501,7 +3501,7 @@
                                //关闭当前frame
                                layer.close(index);
                            });

                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }