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

zrg

2024-08-05 0bb62fe67ee95aa878b18c2b5c719c2584825b0e

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

 WebTM/WebTM.csproj

@@ -452,8 +452,10 @@
    <Content Include="views\质量管理\质量报表\QC_ErrMsgBackBillList.html" />
    <Content Include="views\质量管理\质量报表\QC_InspectionFormReport.html" />
    <Content Include="views\质量管理\质量报表\QC_MoistureContentDataLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_PerformanceScrapLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_ProcessPerformancePass.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityStatisticsDailyReport.html" />
    <Content Include="views\质量管理\质量报表\QC_RegistrationForTestingReport.html" />
    <Content Include="views\质量管理\质量报表\QC_MoistureContentDataLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityStatisticsDailyReport.html" />
    <Content Include="views\质量管理\质量报表\SB_TechnologyParameterList.html" />

 WebTM/views/index.html

@@ -712,6 +712,8 @@
                                        <dd><a lay-href="质量管理/质量报表/QC_InspectionFormReport.html">SPC检验单分析</a></dd>
                                        <dd><a lay-href="质量管理/质量报表/QC_QualityStatisticsDailyReport.html">生产质量统计日报</a></dd>
                                        <dd><a lay-href="质量管理/质量报表/QC_MoistureContentDataLedger.html">含水率数据台账</a></dd>
                                        <dd><a lay-href="质量管理/质量报表/QC_PerformanceScrapLedger.html">性能报废台账</a></dd>
                                        <dd><a lay-href="质量管理/质量报表/QC_RegistrationForTestingReport.html">送测登记数据台账</a></dd>
                                    </dl>
                                </dd>
                            </dl>

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·À´í/Sc_MaterToSourceStepBillList.html

@@ -410,7 +410,7 @@
                        , { field: '规格型号', title: '规格型号', sort: true }
                        , { field: '物料批次', title: '物料批次', sort: true }
                        , { field: '流转卡批次', title: '流转卡批次', sort: true }
                        , { field: '数量', title: '数量', sort: true }
                        , { field: '数量', title: '数量', sort: true, totalRow: true }
                        , { field: '制单人', title: '制单人', sort: true }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '审核人', title: '审核人', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_NutInspectionCCDPassRate.html

@@ -208,9 +208,9 @@

        // åˆå§‹åŒ–界面
        function set_ClearBill() {
            set_InitGrid();
          
            //查询
            //get_FastQuery();
            get_FastQuery();
        }

        function set_InitGrid() {
@@ -242,7 +242,6 @@
                    , { field: '备注', title: '备注', sort: true }
                ]]
            };
            table.render(option);
        }

        // æŸ¥è¯¢
@@ -256,56 +255,62 @@
                data: { "HBatchNo": $("#HBatchNo").val(), "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        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 });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        col.push({ type: 'numbers', title: '序号' });
                        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列
                        if (data1.list.length>0) {
                            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 });
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    case 'long':
                                    case 'Int32':
                                    case 'Int64':
                                    case 'double':
                                    case 'Decimal':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            col.push({ type: 'numbers', title: '序号' });
                            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: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 180 });
                                    }
                                }
                            }
                        }

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

                        //刷新表格数据

 WebTM/views/ϵͳ¹ÜÀí/¶à¼¶ÉóÅú/ÉóºËÁ÷³Ìµ¥/Xt_CheckFlowEdit.html

@@ -51,7 +51,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据类型</label>
                                            <div class="layui-inline">
                                                <select name="HBillTypeID" id="HBillTypeID" lay-filter="HBillTypeID" style="width:190px;">
                                                <select name="HBillTypeID" id="HBillTypeID" lay-filter="HBillTypeID" style="width:190px;" lay-search>
                                                    <!--动态渲染-->
                                                </select>
                                            </div>

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

@@ -47,8 +47,9 @@
                                    <label class="layui-form-label" style="width: 85px;">判定结果</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HResult" id="HResult" lay-verify="HResult">
                                            <option value="合格">合格</option>
                                            <option value="不合格">不合格</option>
                                            <option value="-1">全部</option>
                                            <option value="1">合格</option>
                                            <option value="0">不合格</option>
                                        </select>
                                    </div>
                                </div>
@@ -193,7 +194,7 @@
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var HModName = "QC_QualityStatisticsDailyReport";
        var HModName = "QC_MoistureContentDataLedger";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

        //#endregion
@@ -277,13 +278,13 @@

            var columns = [];
            columns.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
            columns.push({ field: '日期', title: '日期', sort: true, width: 90});
            columns.push({ field: '日期', title: '日期', sort: true, width: 180});
            columns.push({ field: '机台号', title: '机台号', sort: true, width: 110 });
            columns.push({ field: '取样重量', title: '取样重量', sort: true, width: 110 });
            columns.push({ field: '测量结果', title: '测量结果', sort: true, totalRow: true, width: 110});
            columns.push({ field: '判定结果', title: '判定结果', sort: true, totalRow: true, width: 110});
            columns.push({ field: '检测人', title: '检测人', sort: true, totalRow: true, width: 110});
            columns.push({ field: '备注', title: '备注', sort: true, totalRow: true, width: 110});
            columns.push({ field: '取样重量', title: '取样重量', sort: true, totalRow: true, width: 110 });
            columns.push({ field: '测量结果', title: '测量结果', sort: true, width: 110});
            columns.push({ field: '判定结果', title: '判定结果', sort: true, width: 110});
            columns.push({ field: '检测人', title: '检测人', sort: true, width: 110});
            columns.push({ field: '备注', title: '备注', sort: true, width: 110});
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo1'
@@ -314,7 +315,57 @@
                success: function (data1) {
                    if (data1.count == 1) {

                        option.data=data1.data
                        if (data1.list.length > 0) {
                            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 });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计行' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo1'
                                , height: 'full-50'
                                , page: true
                                , totalRow: true
                                , limit: 500
                                , data: data1.data
                                , limits: [50, 500, 5000, 20000]
                                //, done: function (res, curr, count) {
                                //    soulTable.render(this);
                                //}
                                , cols: [col]
                            };
                        } else {
                            set_InitGrid();
                            option.data = data1.data
                        }

                        table.render(option);

                        //刷新表格数据
@@ -424,7 +475,7 @@
                , HResult: HResult
                , HSourceID: HSourceID
            }
            set_InitGrid();
            //set_InitGrid();
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//调用接口后清空sWhere缓存
        }

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

New file
@@ -0,0 +1,639 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>性能报废台账</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">物料</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" lay-verify="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">批次号</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
                                    </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>
                                </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-colla-content" style="padding: 0px; margin-left: 6%;">
        <div class="layui-row" style="margin-top:10px;margin-left:5%;">

        </div>
        <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
            <div class="layui-inline">
                <label class="layui-form-label">过滤</label>
                <div class="layui-input-block">
                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                    </select>
                </div>
            </div>
            <div class="layui-inline">
                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                    <option value="0" selected="selected"></option>
                    <option value="=">=</option>
                    <option value=">=">>=</option>
                    <option value=">">></option>
                    <option value="<="><=</option>
                    <option value="<"><</option>
                    <option value="<>"><></option>
                    <option value="7">包含</option>
                    <option value="8">左包含</option>
                    <option value="9">右包含</option>
                    <option value="10">不包含</option>
                </select>
            </div>
            <div class="layui-inline">
                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
            </div>
        </div>
        <div class="layui-row" style=" margin-top: 10px;">
            <div class="layui-inline">
                <label class="layui-form-label">过滤</label>
                <div class="layui-input-block">
                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                    </select>
                </div>
            </div>
            <div class="layui-inline">
                <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                    <option value="0" selected="selected"></option>
                    <option value="=">=</option>
                    <option value=">=">>=</option>
                    <option value=">">></option>
                    <option value="<="><=</option>
                    <option value="<"><</option>
                    <option value="<>"><></option>
                    <option value="7">包含</option>
                    <option value="8">左包含</option>
                    <option value="9">右包含</option>
                    <option value="10">不包含</option>
                </select>
            </div>
            <div class="layui-inline">
                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
            </div>
        </div>

        <div class="layui-row" style=" margin-top: 10px;">
            <div class="layui-inline">
                <label class="layui-form-label">过滤</label>
                <div class="layui-input-block">
                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                    </select>
                </div>
            </div>
            <div class="layui-inline">
                <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                    <option value="0" selected="selected"></option>
                    <option value="=">=</option>
                    <option value=">=">>=</option>
                    <option value=">">></option>
                    <option value="<="><=</option>
                    <option value="<"><</option>
                    <option value="<>"><></option>
                    <option value="7">包含</option>
                    <option value="8">左包含</option>
                    <option value="9">右包含</option>
                    <option value="10">不包含</option>
                </select>
            </div>
            <div class="layui-inline">
                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
            </div>
        </div>
    </div>-->
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {

        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var HModName = "QC_PerformanceScrapLedger";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

        //#endregion

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

        //初始化表格
        DisPlay_HideColumn();
        //初始化界面
        set_ClearBill();

        //#endregion

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

        // å¤´å·¥å…·æ äº‹ä»¶
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
            };
        });

        //查询按钮
        form.on('submit(btnSearch)', function (data) {//选择仓位
            get_FastQuery();
        });

        //重置
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });


        //选择生产资源
        form.on('submit(btnHMaterID)', function () {
            btnHMaterID();
        });

        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        // åˆå§‹åŒ–界面
        function set_ClearBill() {
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            //set_InitGrid();
            //查询
            get_FastQuery();
        }

        //生产资源选择页面
        function btnHMaterID() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '物料列表'//标题
                , shift: 2//弹出动画
                , content: ['../../基础资料/公用基础资料/Gy_Material.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('请选择数据');
                    }
                    //获取数据
                    $("#HMaterID").val(checkStatus.data[0].HItemID);
                    $("#HMaterName").val(checkStatus.data[0].物料名称);

                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }

        function set_InitGrid() {

            var columns = [];
            columns.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
            columns.push({ field: '日期', title: '日期', sort: true, width: 180});
            columns.push({ field: '物料代码', title: '物料代码', sort: true, width: 180 });
            columns.push({ field: '物料', title: '物料', sort: true, width: 110 });
            columns.push({ field: '工序', title: '工序', sort: true, width: 110 });
            columns.push({ field: '批次号', title: '批次号', sort: true, width: 110 });
            columns.push({ field: '报废人', title: '报废人', sort: true, width: 110});
            columns.push({ field: '报废数量', title: '报废数量', sort: true, totalRow: true, width: 110});
            columns.push({ field: '报废内容', title: '报废内容', sort: true, width: 110});
            columns.push({ field: '备注', title: '备注', sort: true, totalRow: true, width: 110});
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo1'
                , height: 'full-50'
                , page: true
                //, cellMinWidth: 'auto'
                , totalRow: true
                , limit: 500
                , data:[]
                , limits: [50, 500, 5000, 20000]
                //, done: function (res, curr, count) {
                //    soulTable.render(this);
                //}
                , cols: [columns]
            };
            table.render(option);
        }

        // æŸ¥è¯¢
        function get_Display(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/QC_CustomerAppealReport/QC_PerformanceScrapLedger',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {

                        if (data1.list.length > 0) {
                            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 });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计行' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo1'
                                , height: 'full-50'
                                , page: true
                                , totalRow: true
                                , limit: 500
                                , data: data1.data
                                , limits: [50, 500, 5000, 20000]
                                //, done: function (res, curr, count) {
                                //    soulTable.render(this);
                                //}
                                , cols: [col]
                            };
                        } else {
                            set_InitGrid();
                            option.data = data1.data
                        }

                        table.render(option);

                        //刷新表格数据
                        DisPlay_HideColumn();

                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                        //    ColFilter();
                        //}

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

        // å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var HBeginDate = $("#HBeginDate").val();
            var HEndDate = $("#HEndDate").val();
            var HMaterID = $("#HMaterID").val();
            var HBatchNo = $("#HBatchNo").val();

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }


            sWhere = {
                HBeginDate: HBeginDate
                ,HEndDate: HEndDate
                , HMaterID: HMaterID
                , HBatchNo: HBatchNo
            }
            //set_InitGrid();
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//调用接口后清空sWhere缓存
        }

        function set_ClearQuery() {
            $("#HICMOBillNo").val("");
            $("#HBardCode").val("");
            $("#HProcExchBillNo").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');

            sWhere = "";
        }

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

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

            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }

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


                        var dataCol = [];//数据库查询出的列数据


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

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

                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                    } else {
                        table.render(option);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }

        // åˆ—明显示下拉框
        function ColFilter() {
            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>';
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);     $("#ColName1").empty();
            $("#ColName1").append(Organization);     $("#ColName2").empty();
            $("#ColName2").append(Organization);
            form.render('select');
        }
        //#endregion

        //以上是layui模块
    });




</script>

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

New file
@@ -0,0 +1,645 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>送测登记数据台账</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">物料</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" lay-verify="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">批次号</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
                                    </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>
                                </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-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>-->
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {

        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var HModName = "QC_RegistrationForTestingReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

        //#endregion

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

        //初始化表格
        DisPlay_HideColumn();
        //初始化界面
        set_ClearBill();

        //#endregion

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

        // å¤´å·¥å…·æ äº‹ä»¶
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
            };
        });

        //查询按钮
        form.on('submit(btnSearch)', function (data) {//选择仓位
            get_FastQuery();
        });

        //重置
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });


        //选择生产资源
        form.on('submit(btnHMaterID)', function () {
            btnHMaterID();
        });

        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        // åˆå§‹åŒ–界面
        function set_ClearBill() {
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            //set_InitGrid();
            //查询
            get_FastQuery();
        }

        //生产资源选择页面
        function btnHMaterID() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '物料列表'//标题
                , shift: 2//弹出动画
                , content: ['../../基础资料/公用基础资料/Gy_Material.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('请选择数据');
                    }
                    //获取数据
                    $("#HMaterID").val(checkStatus.data[0].HItemID);
                    $("#HMaterName").val(checkStatus.data[0].物料名称);

                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }

        function set_InitGrid() {

            var columns = [];
            columns.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
            columns.push({ field: '日期', title: '日期', sort: true, width: 180});
            columns.push({ field: '物料代码', title: '物料代码', sort: true, width: 180 });
            columns.push({ field: '物料', title: '物料', sort: true, width: 110 });
            columns.push({ field: '工序', title: '工序', sort: true, width: 110 });
            columns.push({ field: '批次号', title: '批次号', sort: true, width: 110 });
            columns.push({ field: '(1)产品单重/g', title: '(1)产品单重/g', sort: true, totalRow: true, width: 140});
            columns.push({ field: '(2)产品单重/g', title: '(2)产品单重/g', sort: true, totalRow: true, width: 140});
            columns.push({ field: '(3)产品单重/g', title: '(3)产品单重/g', sort: true, totalRow: true, width: 140});
            columns.push({ field: '送测内容', title: '送测内容', sort: true, width: 110});
            columns.push({ field: '送测数量', title: '送测数量', sort: true, totalRow: true, width: 110});
            columns.push({ field: '送测时间', title: '送测时间', sort: true, width: 180});
            columns.push({ field: '判定结果', title: '判定结果', sort: true, width: 110});
            columns.push({ field: '回收数量', title: '回收数量', sort: true, totalRow: true, width: 110});
            columns.push({ field: '回收时间', title: '回收时间', sort: true, width: 180});
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo1'
                , height: 'full-50'
                , page: true
                //, cellMinWidth: 'auto'
                , totalRow: true
                , limit: 500
                , data:[]
                , limits: [50, 500, 5000, 20000]
                //, done: function (res, curr, count) {
                //    soulTable.render(this);
                //}
                , cols: [columns]
            };
            table.render(option);
        }

        // æŸ¥è¯¢
        function get_Display(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/QC_CustomerAppealReport/QC_RegistrationForTestingReport',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {

                        if (data1.list.length > 0) {
                            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 });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计行' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo1'
                                , height: 'full-50'
                                , page: true
                                , totalRow: true
                                , limit: 500
                                , data: data1.data
                                , limits: [50, 500, 5000, 20000]
                                //, done: function (res, curr, count) {
                                //    soulTable.render(this);
                                //}
                                , cols: [col]
                            };
                        } else {
                            set_InitGrid();
                            option.data = data1.data
                        }

                  
                        table.render(option);

                        //刷新表格数据
                        DisPlay_HideColumn();

                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                        //    ColFilter();
                        //}

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

        // å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var HBeginDate = $("#HBeginDate").val();
            var HEndDate = $("#HEndDate").val();
            var HMaterID = $("#HMaterID").val();
            var HBatchNo = $("#HBatchNo").val();

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }


            sWhere = {
                HBeginDate: HBeginDate
                ,HEndDate: HEndDate
                , HMaterID: HMaterID
                , HBatchNo: HBatchNo
            }
            //set_InitGrid();
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//调用接口后清空sWhere缓存
        }

        function set_ClearQuery() {
            $("#HICMOBillNo").val("");
            $("#HBardCode").val("");
            $("#HProcExchBillNo").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');

            sWhere = "";
        }

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

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

            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }

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


                        var dataCol = [];//数据库查询出的列数据


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

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

                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                    } else {
                        table.render(option);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }

        // åˆ—明显示下拉框
        function ColFilter() {
            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>';
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);     $("#ColName1").empty();
            $("#ColName1").append(Organization);     $("#ColName2").empty();
            $("#ColName2").append(Organization);
            form.render('select');
        }
        //#endregion

        //以上是layui模块
    });




</script>

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

@@ -2315,7 +2315,7 @@
                        , { field: 'HKeyInspect', title: '重点检查', templet: '#HKeyInspect', unresize: false }
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text'}
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }

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

@@ -23,7 +23,7 @@
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div style="width: 65%; height: calc(95vh); float: left; background-color: rgb(255 255 255) ">
                        <div style="width: 65%; height: calc(105vh); float: left; background-color: rgb(255 255 255) ">
                            <div id="top" style="width:100%;height:calc(40vh);">
                                <div id="top-left" style="width: 30%; height: calc(40vh); float: left;">
                                    <div class="layui-inline">
@@ -230,9 +230,37 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">报废数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">返工数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HBackWorkQty" id="HBackWorkQty" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">工废数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HWasterQty_Work" id="HWasterQty_Work" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">料废数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HWasterQty_Mater" id="HWasterQty_Mater" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div id="center" style="width: 100%; height: calc(40vh); margin-top: 1%;">
                            <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
                                <div id="center-left" style="width: 30%; height: calc(40vh); float: left;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">人员</span></label>
@@ -252,8 +280,7 @@
                                    <div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div>
                                </div>
                            </div>

                            <div id="bottom" style="width: 100%; height: calc(10vh);float:left;">
                            <div id="bottom" style="width: 100%; height: calc(10vh);">
                                <div id="bottom-left" style="width: 100%; height: calc(10vh);">
                                    <div style="text-align: left; width: 100%; height: calc(10vh); ">
                                        <button type="button" lay-submit="" lay-filter="tg" class="layui-btn layui-btn-radius " style="margin-left: 15%;" id="tg">停工挂起</button>
@@ -265,7 +292,7 @@
                                </div>
                            </div>
                        </div>
                        <div id="center-right-maintable" style="width: 34%; height: calc(95vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
                        <div id="center-right-maintable" style="width: 34%; height: calc(105vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
                            <div class="layui-tab" lay-filter="tab-POStockInBill">
                                <ul class="layui-tab-title" lay-filter="tab-all">
                                    <li lay-id="1" style="padding:1px;" class="layui-this">扫码记录</li>
@@ -813,7 +840,7 @@
                , totalRow: true
                //, cellMinWidth: 120
                , data: []
                , height: 700
                , height: 780
                , limit: Number.MAX_VALUE
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }

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

@@ -308,6 +308,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>查看审批进度</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>多级审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>多级反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>行关闭</button>
@@ -440,6 +441,9 @@
                        break;
                    //多级反审核
                    case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
                        break;
                    //驳回
                    case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
                        break;
                    //关闭按钮        ï¼ˆ1:关闭、2:反关闭）
                    case 'btn-Close':
@@ -1322,6 +1326,8 @@
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                    //修改为功后刷新界面
                    $("#btnSearch").trigger('click');
                }
                else {
                    layer.msg('请选择一行数据审核！');
@@ -1372,7 +1378,7 @@
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cg_POOrderBill/AuditXs_POOrderBill_Flow", //方法所在页面和方法名
                        url: GetWEBURL() + "/Cg_POOrderBill/AuditCg_POOrderBill_Flow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
@@ -1382,11 +1388,7 @@
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    if (get_needClose_Bar == 0) {
                                        $("#btnSearch").trigger('click');
                                    } else if (get_needClose_Bar == 1) {
                                        $("#get_needClose").trigger('click');
                                    }
                                    $("#btnSearch").trigger('click');
                                });

                            } else {
@@ -1403,6 +1405,41 @@
            }
            //#endregion

            //#region é©³å›ž
            function set_RejectCheck_Flow(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cg_POOrderBill/RejectCheckFlow_POOrderBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }
            }
            //#endregion

            //#region åå…³é—­/关闭数据
            function set_CloseBill(num) {
                var checkStatus = table.checkStatus('mainTable')