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

yangle

2023-09-12 3d614a2e23e9fec2054ff73c70bcfcafc07d49fc

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

@@ -62,21 +62,22 @@
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <div class="layui-tab layui-tab-card">
                        <ul class="layui-tab-title">
                            <li class="layui-this">检测值</li>                          
                            <li class="layui-this">检测值</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <!--检测值-->
                                <table class="layui-hide" id="mainTable_Value" lay-filter="mainTable_Value"></table>
                            </div>                           
                            </div>
                        </div>
                    </div>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>新增</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            <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>
                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                        </div>
                    </script>
                </div>
@@ -89,6 +90,7 @@
    <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/HideButton.js"></script>
    <script>
        var _cur_page = 1;
        var sql = " ";
@@ -242,7 +244,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: '../首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&hID=' + hID 
                                , content: '../首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&hID=' + hID
                                , resize: false
                                , cancel: function () {
                                    //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -286,7 +288,7 @@
                                        layer.alert("接口请求失败!", { icon: 5 });
                                    }
                                });
                            })                            
                            })
                        }
                        else {
                            layer.msg('请选择一行数据删除！');
@@ -295,6 +297,12 @@
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumn();
                        break;
                    //按钮设置
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "7505";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                };
            });
@@ -387,6 +395,10 @@
                            //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            //    ColFilter();
                            //}
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "7505";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        } else {
                            layer.close(ajaxLoad);
                            layer.msg(data1.code + data1.Message, { icon: 5 });
@@ -413,7 +425,7 @@
                    url: GetWEBURL() + '/QC_ValueTable/getValueList',
                    type: "GET",
                    data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    async: false,                  
                    async: false,
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -480,7 +492,7 @@
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });            
                });
            });

            form.on('submit(f_Query)', function (data) {//查询
@@ -751,6 +763,11 @@
                        } else {
                            table.render(option);
                        }

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