1

zrg

2024-10-15 f295b937340bd2199dc202b777af310aa69ca36c

1

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

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

@@ -132,6 +132,7 @@
                            <div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <div id="page" style="position: relative; bottom: 0;"></div>
                        </div>
                    </div>
                </div>
@@ -169,7 +170,8 @@
            var HModName = "Gy_Supplier";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "HCurID", "货币", "汇率", "HSSID", "结算方式", "HAreaID", "地区","HPSStyleID","采购方式"];

            var page = 1;//分页数据
            var size = 50;
            var params = getUrlVars();
            var Type = params[params[0]];
            var HSupTypeID = 0;
@@ -298,7 +300,7 @@
                set_InitGrid();

                //查询
                get_Display(sWhere);
                get_DisplayPage(sWhere);

                //树状图生成
                get_Display_Tree();
@@ -310,7 +312,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90
@@ -326,6 +328,28 @@
                    //    , { field: '禁用标记', title: '禁用标记' }
                    //]]
                };
                optionPage = {
                    elem: 'page', //注意，这里的 page æ˜¯ ID，不用加 # å·
                    count: 10000, //数据总数，从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数，比如：
                        //console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }

            //查询
@@ -403,6 +427,85 @@
                layer.close(index);
            }

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                sWhere += addSWhereByOpenType();
                $.ajax({
                    url: GetWEBURL() + '/Gy_Supplier/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size, "Organization": Organization},
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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 });
                                            break;
                                        case 'Int32':
                                            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 });
                                    }
                                }
                            }

                            columns = col;
                            option.cols = [col];
                            option.data = data1.data;
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//加载方案
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion


            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -459,7 +562,8 @@
                if (HName) {
                    sWhere += " and ä¾›åº”商名称 like '%" + HName + "%'";
                }
                get_Display(sWhere);
                
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

@@ -740,7 +844,7 @@
                            HSupClsName = data.title;
                            HSupTypeID = data.id;
                        }
                        get_Display(sql);
                        get_DisplayPage(sql);
                    }
                });
            }
@@ -884,8 +988,16 @@
                                }
                            }
                            table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "Gy_Supplier";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        } else {
                            table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "Gy_Supplier";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });

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

@@ -164,6 +164,7 @@
                            <div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <div id="page" style="position:relative;bottom:0;"></div>
                        </div>
                    </div>

@@ -204,6 +205,8 @@
            var titleData1 = ["HCusID"];
            var HCusTypeID = 0;
            var HCusClsName = '';
            var page = 1;//分页数据
            var size = 50;
            var ins;                        //用于导出excel

            var data_Tree = {};             //获取树状图数据
@@ -351,7 +354,7 @@
                //查询
                //根据页面的打开方式，判断过滤条件是否需要进行额外的添加
                addSWhereByOpenType();
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                //树状图生成
                get_Display_Tree();

@@ -364,7 +367,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90
@@ -382,6 +385,28 @@
                        $("#mainTable").css("width", "100%");
                    },
                };
                optionPage = {
                    elem: 'page', //注意，这里的 page æ˜¯ ID，不用加 # å·
                    count: 10000, //数据总数，从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数，比如：
                        //console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion

@@ -473,6 +498,83 @@
                    }
                });
                layer.close(index);
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_Customer/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size, "Organization": Organization },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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 });
                                            break;
                                        case 'Int32':
                                            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 });
                                    }
                                }
                            }

                            columns = col;
                            option.cols = [col];
                            option.data = data1.data;
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//加载方案
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

@@ -620,26 +722,27 @@
                if (HName) {
                    sWhere += " and å®¢æˆ·åç§° like '%" + HName + "%'";
                }
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_Customer/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization  },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                //$.ajax({
                //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                //    url: GetWEBURL() + '/Gy_Customer/list',
                //    type: "GET",
                //    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization  },
                //    success: function (data1) {
                //        if (data1.count == 1) {
                //            option.data = data1.data;
                //            table.render(option);
                //            layer.close(ajaxLoad);
                //            //layer.alert("查询成功", { icon: 1 });
                //        } else {
                //            layer.close(ajaxLoad);
                //            layer.alert(data1.code + data1.Message, { icon: 5 });
                //        }
                //    }, error: function () {
                //        layer.close(ajaxLoad);
                //        layer.alert("接口请求失败!", { icon: 5 });
                //    }
                //});
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
@@ -958,8 +1061,18 @@
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "Gy_Customer";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        } else {
                            table.render(option);
                            ins = table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "Gy_Customer";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
@@ -1197,7 +1310,7 @@
                            HCusTypeID = data.id;
                            HCusClsName = data.title;
                        }
                        get_Display(sql);
                        get_DisplayPage(sql);
                    }
                });
            }

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

@@ -150,6 +150,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
@@ -204,6 +205,8 @@
            var sWhere = "";
            var ins;                //用于导出excel
            var option = [];
            var page = 1;//分页数据
            var size = 50;
            var columns = "";
            var titleData = [];     //不需要显示的字段
            //#endregion
@@ -248,7 +251,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , page: false
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
@@ -258,6 +261,28 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意，这里的 page æ˜¯ ID，不用加 # å·
                    count: 10000, //数据总数，从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数，比如：
                        //console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion

@@ -349,8 +374,10 @@
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                        } else {
                            table.render(option);
                            ins = table.render(option);
                        }

                        //刷新按钮显示
@@ -989,7 +1016,7 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

@@ -1065,6 +1092,83 @@
                });
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Pay_ProcPriceRequestBillController/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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 });
                                            break;
                                        case 'Int32':
                                            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 });
                                    }
                                }
                            }

                            columns = col;
                            option.cols = [col];
                            option.data = data1.data;
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region åˆ—明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';

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

@@ -150,6 +150,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
@@ -200,6 +201,8 @@
            var ins;                //用于导出excel
            var option = [];
            var columns = "";
            var page = 1;//分页数据
            var size = 50;
            var titleData = [];     //不需要显示的字段
            //#endregion

@@ -243,7 +246,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , page: false
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
@@ -253,6 +256,28 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意，这里的 page æ˜¯ ID，不用加 # å·
                    count: 10000, //数据总数，从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数，比如：
                        //console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion

@@ -344,8 +369,10 @@
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                        } else {
                            table.render(option);
                            ins = table.render(option);
                        }

                        //刷新按钮显示
@@ -824,7 +851,7 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

@@ -903,6 +930,82 @@
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Pay_SingleBalBillController/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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 });
                                            break;
                                        case 'Int32':
                                            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 });
                                    }
                                }
                            }

                            columns = col;
                            option.cols = [col];
                            option.data = data1.data;
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion


            //#region åˆ—明显示下拉框
            function ColFilter() {

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

@@ -150,6 +150,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
@@ -199,6 +200,8 @@
            var sWhere = "";
            var ins;                //用于导出excel
            var option = [];
            var page = 1;//分页数据
            var size = 50;
            var columns = "";
            var titleData = [];     //不需要显示的字段
            //#endregion
@@ -243,7 +246,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , page: false
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
@@ -253,6 +256,28 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意，这里的 page æ˜¯ ID，不用加 # å·
                    count: 10000, //数据总数，从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数，比如：
                        //console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion

@@ -344,8 +369,10 @@
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                        } else {
                            table.render(option);
                            ins = table.render(option);
                        }

                        //刷新按钮显示
@@ -825,7 +852,7 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

@@ -905,6 +932,82 @@
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Pay_GroupBalBillController/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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 });
                                            break;
                                        case 'Int32':
                                            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 });
                                    }
                                }
                            }

                            columns = col;
                            option.cols = [col];
                            option.data = data1.data;
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion


            //#region åˆ—明显示下拉框
            function ColFilter() {

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

@@ -150,6 +150,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
@@ -199,6 +200,8 @@
            var sWhere = "";
            var ins;                //用于导出excel
            var option = [];
            var page = 1;//分页数据
            var size = 50;
            var columns = "";
            var titleData = [];     //不需要显示的字段
            //#endregion
@@ -243,7 +246,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , page: false
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
@@ -253,6 +256,28 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意，这里的 page æ˜¯ ID，不用加 # å·
                    count: 10000, //数据总数，从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数，比如：
                        //console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion

@@ -344,8 +369,10 @@
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                        } else {
                            table.render(option);
                            ins = table.render(option);
                        }

                        //刷新按钮显示
@@ -825,7 +852,7 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

@@ -901,6 +928,83 @@
                });
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Pay_ErrWorkTimesRequestBillController/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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 });
                                            break;
                                        case 'Int32':
                                            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 });
                                    }
                                }
                            }

                            columns = col;
                            option.cols = [col];
                            option.data = data1.data;
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region åˆ—明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';

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

@@ -150,6 +150,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
@@ -200,6 +201,8 @@
            var sWhere = "";
            var ins;                //用于导出excel
            var option = [];
            var page = 1;//分页数据
            var size = 50;
            var columns = "";
            var titleData = [];     //不需要显示的字段
            //#endregion
@@ -244,7 +247,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , page: false
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
@@ -254,6 +257,28 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意，这里的 page æ˜¯ ID，不用加 # å·
                    count: 10000, //数据总数，从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数，比如：
                        //console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion

@@ -345,8 +370,10 @@
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                        } else {
                            table.render(option);
                            ins = table.render(option);
                        }

                        //刷新按钮显示
@@ -848,7 +875,7 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

@@ -928,6 +955,81 @@
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                var ajaxLoad = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/Pay_WorkTimesBillController/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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 });
                                            break;
                                        case 'Int32':
                                            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 });
                                    }
                                }
                            }

                            columns = col;
                            option.cols = [col];
                            option.data = data1.data;
                            option.totalRow = true;
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region åˆ—明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBillList.html

@@ -187,7 +187,7 @@
                , soulTable = layui.soulTable
            var option = [];
            var sWhere = "";

            var HModName = "Sc_QualityReportStepBillList";
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

            //过滤条件的classç±» 

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html

@@ -258,7 +258,8 @@
            <option value="放行">放行</option>
            <option value="工废">工废</option>
            <option value="料废">料废</option>
             <option value="样件保留">样件保留</option>
            <option value="样件保留">样件保留</option>
            <option value="">请选择</option>
        </select>
    </script>
    <script>
@@ -332,6 +333,11 @@
                //子表初始化
                set_InitGrid();
                set_ProcessBill(linterid, HEntryID);
            }
            else if (OperationType == 6) {                                                  //出站汇报单下推
                //子表初始化
                set_InitGrid();
                set_StationOutBill(linterid);
            }
            //#endregion

@@ -1049,6 +1055,95 @@
                })
            }
            //#endregion
            
            //#region (出站汇报单)下推页面初始化
            function set_StationOutBill(linterid) {
                //生成并设置主表的内码和单据号
                createBillNo();

                //相关文本框信息初始化
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));

                var ajaxLoad = layer.load();

                $.ajax({
                    url: GetWEBURL() + "/Cj_StationOutBill/PushDownBackInfo",
                    type: "GET",
                    async: false,
                    data: { "linterid": linterid,"user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            //主表赋值
                            $("#HEmpID").val(sessionStorage["HEmpID"] == undefined ? 0 : sessionStorage["HEmpID"]);
                            $("#HEmpName").val(sessionStorage["HEmpName"]);
                            $("#HDeptID").val(data.HDeptID);
                            $("#HDeptName").val(data.车间);
                            $("#HGroupID").val(data.HGroupID);
                            $("#HGroupName").val(data.生产班组);

                            //组织的值HOrgID变化，重新渲染
                            HOrgIDBar = data.组织;

                            //子表  èµ‹å€¼
                            var rowdata = [];
                            for (var i = 0; i < result.data.length; i++) {
                                rowdata.push(
                                    {
                                        "HMaterID": result.data[i]["HMaterID"],
                                        "物料代码": result.data[i]["产品代码"],
                                        "物料名称": result.data[i]["产品名称"],
                                        "规格型号": result.data[i]["规格型号"],
                                        "HProcID": result.data[i]["HProcID"],
                                        "工序": result.data[i]["工序"],
                                        "HUnitID": result.data[i]["HUnitID"],
                                        "计量单位": result.data[i]["计量单位"],
                                        "HQty": result.data[i]["出站数量"],
                                        "HSourceID": result.data[i]["HSourceID"],
                                        "生产资源": result.data[i]["生产资源"],
                                        "HBadProcID": "0",
                                        "责任工序": "",
                                        "HRemark": "",
                                        "HProcExchInterID": result.data[i]["HProcExchInterID"],
                                        "HProcExchEntryID": result.data[i]["HProcExchEntryID"],
                                        "HProcExchBillNo": result.data[i]["工序流转卡号"],
                                        "HICMOInterID": result.data[i]["HICMOInterID"],
                                        "HICMOEntryID": result.data[i]["HICMOEntryID"],
                                        "HICMOBillNo": result.data[i]["生产订单号"],                                     
                                        "HSourceInterID": result.data[i]["hmainid"],
                                        "HSourceEntryID": "0",
                                        "HSourceBillNo": result.data[i]["单据号"],
                                        "HSourceBillType": result.data[i]["单据类型"],
                                        "HResult": "",
                                        "HEmpID": "0",
                                        "检验员": "",
                                        "HBadReasonID": "0",
                                        "不良原因": "",
                                        "HBarCode": "",
                                        "HReportType": "3",
                                        "HAddr": "",
                                        "HMaker": "",
                                        "HMakeDate": Format(new Date(), 'yyyy-MM-dd')
                                    }
                                );
                            }
                            option.data = rowdata;

                            table.render(option);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("发生错误!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region å¼¹çª—选择方法
            //#region ç”Ÿäº§è½¦é—´é€‰æ‹©é¡µé¢
@@ -1134,7 +1229,7 @@
            function set_SaveBill(data) {
                //记录操作类型
                var refSav = "";
                if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5) {
                if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5 || OperationType == 6) {
                    refSav = "Add";
                    data.field.HChangeDate = new Date();
                    data.field.HSTOCKORGID = data.field.HOrgID;
@@ -1206,7 +1301,7 @@
                //    return false;
                //}

                if ($("#HEmpID").val() == "0") {
                if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null) {
                    layer.msg("登记人未选择!");
                    return false;
                }
@@ -1226,6 +1321,22 @@
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i+1) + "行：数量请输入大于0的数字！");
                        return false;
                    }
                    if (option.data[i]["HMaterID"] == 0 || option.data[i]["HMaterID"] == undefined || option.data[i]["HMaterID"] == null) {
                        layer.msg("第" + (i + 1) + "行：物料信息不允许为空！");
                        return false;
                    }
                    if (option.data[i]["HProcID"] == 0 || option.data[i]["HProcID"] == undefined || option.data[i]["HProcID"] == null) {
                        layer.msg("第" + (i + 1) + "行：工序信息不允许为空！");
                        return false;
                    }
                    if (option.data[i]["HResult"] == 0 || option.data[i]["HResult"] == undefined || option.data[i]["HResult"] == null) {
                        layer.msg("第" + (i + 1) + "行：判定结果不允许为空！");
                        return false;
                    }
                    if (option.data[i]["HBadReasonID"] == 0 || option.data[i]["HBadReasonID"] == undefined || option.data[i]["HBadReasonID"] == null) {
                        layer.msg("第" + (i + 1) + "行：不良原因不允许为空！");
                        return false;
                    }
                }
@@ -1430,7 +1541,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                     if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HMaterID": HDataTemp.HItemID
@@ -1473,7 +1584,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                     if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HUnitID": HDataTemp.HItemID
@@ -1512,7 +1623,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                     if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HEmpID": HDataTemp.HItemID
@@ -1551,7 +1662,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                     if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HSourceID": HDataTemp.HItemID
@@ -1590,7 +1701,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                    if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HBadReasonID": HDataTemp.HItemID

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

@@ -1166,18 +1166,20 @@
                            option.data = [];
                            ins = table.render(option);
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

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

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            //刷新表格数据
                            //DisPlay_HideColumn();

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

                            //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                            //    ColFilter();
                            //}
                            //layer.close(ajaxLoad);
                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                        }
                    }, error: function () {

 WebTM/views/Éú²ú¹ÜÀí/Éú²úͶÁϵ¥/Sc_PPBomBillList.html

@@ -212,15 +212,16 @@
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -249,6 +250,7 @@
                , laypage = layui.laypage
                , laydate = layui.laydate
                , soulTable = layui.soulTable
            var ins;
            var sWhere = "";
            var option = [];
            var page = 1;//分页数据
@@ -392,6 +394,22 @@
                            layer.msg('请选择一行数据删除！');
                        }
                        break;
                    //导出excel
                    case 'get_export':
                        var data = option.data
                        data.forEach((item) => {
                            for (let itemobj in item) {
                                if (item[itemobj] == null) {
                                    item[itemobj] = "";
                                }
                                if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                                    item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                }
                            }
                        });

                        table.exportFile(ins.config.id, option.data, "xls");
                        break;
                }
            })
             //#endregion

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -191,6 +191,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">工序检验</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-NoPassProd" id="btn-NoPassProd">下推不良品评审处理单</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-QualityReport" id="btn-QualityReport">下推质量汇报单</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>保存列宽</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>默认列宽</button>-->
@@ -728,6 +729,9 @@
                    //下推工序出站汇报单
                    case 'btn-NoPassProd': set_NoPassProd();
                        break;
                    //下推质量汇报单
                    case 'btn-QualityReport': set_QualityReport();
                        break;                        
                    //预览
                    case 'btn-Cell': layer.msg('预览！');
                        break;
@@ -818,7 +822,7 @@
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                    colName += option.cols[0][i]["field"] + ",";
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
@@ -830,7 +834,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) {
                        //刷新表格数据
@@ -842,93 +846,194 @@
            }

            //显示列数据 ä¸»è¡¨
            //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 = ["HMaterID", "HUnitID", "HSourceID"];//不需要显示的字段 å¯æ‰©å±•*/

            //                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");     //获取本页所有按钮对象
            //            Display_HideButton(btns, "3791", 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 titleData = ["HMaterID", "HUnitID", "HSourceID"];//不需要显示的字段 å¯æ‰©å±•*/

                            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");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);

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



             //隐藏列设置 å·¥è‰ºå‚æ•°
            function get_HideColumn_TechParam() {
@@ -1545,6 +1650,51 @@
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //下推质量汇报单            
            function set_QualityReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length > 0) {

                    var linterid = [];
                    var HERR = "";
                    var HGroupID_JY = data[0].HGroupID;
                    var HDeptID_JY = data[0].HDeptID;

                    for (var i = 0; i < checkStatus.data.length; i++) {
                        if (data[i].HGroupID != HGroupID_JY || data[i].HDeptID || HDeptID_JY) {
                            HERR += "第" + (i+1) + "行，生产班组或者生产车间，与其余行不一致，不允许合并下推！"
                        }

                        linterid.push(data[i].hmainid.toString());
                    }

                    if (HERR != "") {
                        layer.msg(HERR,{ time: 3000, })
                        return;
                    }
                   
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '质量汇报单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html?OperationType=' + 6 + '&linterid=' + linterid.toString() + '&HEntry=0&HProcNo=' + 0 + '&HEntryID=' + 0 + '', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery(table, option);
                        }
                    })
                } else {
                    layer.msg('请选择数据下推！');
                }
            }

@@ -2307,7 +2457,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/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -1612,9 +1612,6 @@
                            //刷新表格数据
                            DisPlay_HideColumn();

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

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                ColFilter();
                            }
@@ -1669,9 +1666,6 @@
                            //刷新表格数据
                            DisPlay_HideColumn();

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

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                ColFilter();
                            }
@@ -1693,8 +1687,8 @@
            //#region éšè—åˆ—设置 (主列表)
            function get_HideColumn1() {
                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 è¿›è¡Œç¼–码
@@ -1706,7 +1700,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) {
                        //刷新表格数据
@@ -2165,95 +2159,196 @@
            //    }
            //}

            //#region æ˜¾ç¤ºåˆ—数据 (主列表)
            ////#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 = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//不需要显示的字段 å¯æ‰©å±•*/
            //                var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "批号", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "销售订单号", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID", "HCusID", "HBillSubType"];
            //                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;
            //                    }
            //                }

            //                //取消冻结列
            //                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);
            //            }

            //            //$(".layui-table-cell").css({
            //            //    "height": "21px",
            //            //    "line-height": "21px;"
            //            //});


            //            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
            //            Display_HideButton(btns, "3772", 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 = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//不需要显示的字段 å¯æ‰©å±•*/
                            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "批号", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "销售订单号", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID", "HCusID", "HBillSubType"];
                            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 (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);
                        }

                        //$(".layui-table-cell").css({
                        //    "height": "21px",
                        //    "line-height": "21px;"
                        //});


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

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
@@ -3213,7 +3308,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();