首巡末库存,自检增加数据库分页,优化人机料法报表

zrg

2024-11-14 7b76ee644426a303433a47cccf3c9518994b46ba

首巡末库存,自检增加数据库分页,优化人机料法报表

 WebTM/WebTM.csproj.user

@@ -4,7 +4,7 @@
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <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/layuiadmin/Scripts/webConfig.js

@@ -5,12 +5,12 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
   /* var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
/*    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://localhost/API/";             //潘浙游本地配置
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_PatrolProcCheckOtherBillList.html

@@ -210,6 +210,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" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>新增</button>
@@ -254,6 +255,8 @@

            var option = [];
            var sWhere = "";
            var page = 1;//分页数据
            var size = 50;
            var HModName = "QC_PatrolProcCheckOtherBillList";

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
@@ -263,7 +266,7 @@
            //#endregion

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "HInspectinstruMentlD", "HShiftslD", "检测值基础资料","目标值基础资料"];
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "HInspectinstruMentlD", "HShiftslD", "检测值基础资料", "目标值基础资料","sorderid"];

            var sql = " ";
            //#endregion
@@ -456,9 +459,17 @@
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                if ($("#HProject").val() == 0) {
                    get_FastQuery();
                    if (page != 1) {
                        $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                    } else {
                        get_FastQuery();
                    }
                } else {
                    get_FastQuery(2);
                    if (page != 1) {
                        $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                    } else {
                        get_FastQuery(2);
                    }
                }
            });
            //#endregion
@@ -493,7 +504,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , sort: true  //重点1：这里的sort表示 table表在取得接口数据后，对页面渲染后的table数据进行排序。同时，这里的true ä¼šå½±å“é¡µé¢sort ä¸Šä¸‹å°ç®­å¤´çš„ æ˜¾ç¤ºæ•ˆæžœ
                    , totalRow: true
                    //, cellMinWidth: 90
@@ -503,6 +514,24 @@
                        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) {

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
            //#endregion  ç›‘听网格表体事件
@@ -617,6 +646,78 @@
                    }
                });

            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sqlWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillListPage',
                    type: "GET",
                    data: { "sWhere": sqlWhere, "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 ($.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();
                            }

                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

@@ -738,7 +839,9 @@
                        sqlWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }
                RoadHBillNo(sqlWhere);
                 //RoadHBillNo(sqlWhere);
                //分页查询
                get_DisplayPage(sqlWhere);
            }
            //#endregion


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

@@ -221,6 +221,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" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
@@ -265,6 +266,8 @@

            var option = [];
            var sWhere = "";
            var page = 1;//分页数据
            var size = 50;
            var HModName = "QC_ProcessCheckBillList";

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
@@ -274,7 +277,7 @@
            //#endregion

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "sorderid"];

            var sql = " ";
            //#endregion
@@ -408,9 +411,17 @@
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                if ($("#HProject").val() == 0) {
                    get_FastQuery();
                    if (page != 1) {
                        $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                    } else {
                        get_FastQuery();
                    }
                } else {
                    get_FastQuery(2);
                    if (page != 1) {
                        $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                    } else {
                        get_FastQuery(2);
                    }
                }
            });
            //#endregion
@@ -475,7 +486,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , sort: true  //重点1：这里的sort表示 table表在取得接口数据后，对页面渲染后的table数据进行排序。同时，这里的true ä¼šå½±å“é¡µé¢sort ä¸Šä¸‹å°ç®­å¤´çš„ æ˜¾ç¤ºæ•ˆæžœ
                    , totalRow: true
                    //, cellMinWidth: 90
@@ -485,6 +496,24 @@
                        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) {

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
            //#endregion  ç›‘听网格表体事件
@@ -600,6 +629,77 @@
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sqlWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_ProcessCheckMainBill/QC_ProcessCheckMainBillListPage',
                    type: "GET",
                    data: { "sWhere": sqlWhere, "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 ($.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();
                            }

                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
@@ -719,7 +819,9 @@
                        sqlWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }
                get_Display(sqlWhere);
                //get_Display(sqlWhere);
                //数据库分页查询
                get_DisplayPage(sqlWhere);
            }
            //#endregion


 WebTM/views/ÖÊÁ¿¹ÜÀí/¿â´æ¼ìÑéµ¥/QC_StockCheckBillList.html

@@ -218,6 +218,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" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>新增</button>
@@ -262,6 +263,8 @@

            var option = [];
            var sWhere = "";
            var page = 1;//分页数据
            var size = 50;
            var HModName = "QC_StockCheckBillList";

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
@@ -271,7 +274,7 @@
            //#endregion

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "HInspectinstruMentlD", "HShiftslD", "检测值基础资料","目标值基础资料"];
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "HInspectinstruMentlD", "HShiftslD", "检测值基础资料", "目标值基础资料", "sorderid"];

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

            });
@@ -533,7 +544,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , sort: true  //重点1：这里的sort表示 table表在取得接口数据后，对页面渲染后的table数据进行排序。同时，这里的true ä¼šå½±å“é¡µé¢sort ä¸Šä¸‹å°ç®­å¤´çš„ æ˜¾ç¤ºæ•ˆæžœ
                    , totalRow: true
                    //, cellMinWidth: 90
@@ -543,6 +554,24 @@
                        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) {

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
            //#endregion  ç›‘听网格表体事件
@@ -573,7 +602,8 @@
                    })
                }
            });
             //#endregion
            //#endregion

            //#region æŸ¥è¯¢
            function RoadHBillNo(sqlWhere) {
                var ajaxLoad = layer.load();
@@ -660,6 +690,77 @@
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sqlWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_StockCheckBill/QC_StockCheckBillListPage',
                    type: "GET",
                    data: { "sWhere": sqlWhere, "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 ($.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();
                            }

                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
@@ -780,7 +881,9 @@
                        sqlWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }
                RoadHBillNo(sqlWhere);
                //RoadHBillNo(sqlWhere);
                //数据库分页
                get_DisplayPage(sqlWhere);
            }
            //#endregion


 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FiveMenOneRingList.html

@@ -49,17 +49,20 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">SN码</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input ForFilteringSchemes" name="SN" id="SN" style="width:300px;">
                                                    <input type="text" class="layui-input ForFilteringSchemes" name="SN" id="SN" style="width:260px;">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">工序流转卡</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input ForFilteringSchemes" name="HProcHBillNo" id="HProcHBillNo">
                                                </div>
                                            </div>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    <input type="text" class="layui-input ForFilteringSchemes" name="HProcHBillNo" id="HProcHBillNo" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcExch" id="btnHProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>                                              
                                            </div>                                           
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"  style="padding: 0 10px;margin-left: 20px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn">查询</i>
                                            </button>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                            <div class="layui-inline">
@@ -832,6 +835,44 @@
            });
            //#endregion

            //#region å·¥åºæµè½¬å¡å¼¹çª—
            form.on('submit(btnHProcExch)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序流转卡列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProcHBillNo").val(checkStatus.data[0].单据号);                     
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });
            //#endregion

            //#region å‰¯è¡¨æ ¼  
            //人
            table.on('tool(mainTable_Man)', function (obj) {
@@ -1528,6 +1569,7 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query3
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            table.render(option_Method);
@@ -1539,6 +1581,7 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query4
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            table.render(option_Environments);
@@ -1550,6 +1593,7 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query5
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            table.render(option_Measure);

 WebTM/views/ÖÊÁ¿¹ÜÀí/³µ¼ä×Լ쵥/QC_WorkSelfCheckBillList.html

@@ -209,6 +209,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" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>新增</button>
@@ -253,6 +254,8 @@

            var option = [];
            var sWhere = "";
            var page = 1;//分页数据
            var size = 50;
            var HModName = "QC_WorkSelfCheckBillList";

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
@@ -262,7 +265,7 @@
            //#endregion

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "HInspectinstruMentlD", "HShiftslD", "检测值基础资料","目标值基础资料"];
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "HInspectinstruMentlD", "HShiftslD", "检测值基础资料", "目标值基础资料", "sorderid"];

            var sql = " ";
            //#endregion
@@ -455,9 +458,17 @@
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                if ($("#HProject").val() == 0) {
                    get_FastQuery();
                    if (page != 1) {
                        $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                    } else {
                        get_FastQuery();
                    }
                } else {
                    get_FastQuery(2);
                    if (page != 1) {
                        $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                    } else {
                        get_FastQuery(2);
                    }
                }
            });
            //#endregion
@@ -492,7 +503,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , sort: true  //重点1：这里的sort表示 table表在取得接口数据后，对页面渲染后的table数据进行排序。同时，这里的true ä¼šå½±å“é¡µé¢sort ä¸Šä¸‹å°ç®­å¤´çš„ æ˜¾ç¤ºæ•ˆæžœ
                    , totalRow: true
                    //, cellMinWidth: 90
@@ -502,6 +513,24 @@
                        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) {

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
            //#endregion  ç›‘听网格表体事件
@@ -533,6 +562,7 @@
                }
            });
             //#endregion

            //#region æŸ¥è¯¢
            function RoadHBillNo(sqlWhere) {
                var ajaxLoad = layer.load();
@@ -619,6 +649,77 @@
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sqlWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_WorkSelfCheckBill/QC_WorkSelfCheckBillListPage',
                    type: "GET",
                    data: { "sWhere": sqlWhere, "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 ($.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();
                            }

                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
@@ -739,7 +840,9 @@
                        sqlWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }
                RoadHBillNo(sqlWhere);
                //RoadHBillNo(sqlWhere);
                //数据库分页
                get_DisplayPage(sqlWhere);
            }
            //#endregion


 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList2.html

@@ -161,6 +161,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" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>新增</button>
@@ -205,6 +206,8 @@

            var option = [];
            var sWhere = "";
            var page = 1;//分页数据
            var size = 50;
            var HModName = "QC_FirstPieceCheckBillList";

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
@@ -214,7 +217,7 @@
            //#endregion

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID","sorderid"];

            var sql = " ";
            //#endregion
@@ -407,9 +410,17 @@
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                if ($("#HProject").val() == 0) {
                    get_FastQuery();
                    if (page != 1) {
                        $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                    } else {
                        get_FastQuery();
                    }                   
                } else {
                    get_FastQuery(2);
                    if (page != 1) {
                        $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                    } else {
                        get_FastQuery(2);
                    }
                }
            });
            //#endregion
@@ -444,7 +455,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , sort: true  //重点1：这里的sort表示 table表在取得接口数据后，对页面渲染后的table数据进行排序。同时，这里的true ä¼šå½±å“é¡µé¢sort ä¸Šä¸‹å°ç®­å¤´çš„ æ˜¾ç¤ºæ•ˆæžœ
                    , totalRow: true
                    //, cellMinWidth: 90
@@ -454,6 +465,24 @@
                        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) {

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

@@ -540,6 +569,77 @@
            }
            //#endregion

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {           
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainListPage',
                    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 ($.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();
                            }
                           
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
@@ -612,7 +712,8 @@
                        sqlWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }
                RoadHBillNo(sqlWhere);
                //RoadHBillNo(sqlWhere);
                get_DisplayPage(sqlWhere);
            }
            //#endregion

@@ -641,6 +742,7 @@
            }
            //#endregion


            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号