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

zrg

2024-03-14 e6a79f899f356f0090bd3385c0bb0aaca7a93a4f

 WebTM/views/»ù´¡×ÊÁÏ/É豸»ù´¡×ÊÁÏ/Gy_CardAddressList.html

@@ -74,14 +74,14 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="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_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button> 
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                            </div>
                        </script>
@@ -197,7 +197,7 @@
                            table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "Gy_Unit";
                            var HBillType = "Gy_CardAddress";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                            //刷新表格数据
                            DisPlay_HideColumn();
@@ -252,7 +252,7 @@
                    //按钮设置
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "Gy_Unit";
                        var HBillType = "Gy_CardAddress";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                };
@@ -267,6 +267,9 @@
                    , title: '资产位置-新增'
                    , shift: 0//弹出动画
                    , content: '../设备基础资料/Gy_CardAddress.html?OperationType=1&linterid=&HSouceBillType='
                    , end: function () {
                        get_FastQuery();
                    }
                })
            }
            //#endregion
@@ -284,6 +287,9 @@
                        , title: '资产位置列表-编辑'
                        , shift: 0//弹出动画
                        , content: '../设备基础资料/Gy_CardAddress.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
@@ -335,6 +341,9 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                //初始化过滤条件
                sWhere = "";

                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                var ColName = $("#ColName").val();//复选框
@@ -500,6 +509,12 @@
                        } else {
                            table.render(option);
                        }

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

                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
@@ -534,11 +549,11 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HItemID.toString();
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Unit/AuditGy_Unit", //方法所在页面和方法名
                        url: GetWEBURL() + "/Gy_CardAddress/AuditGy_CardAddress", //方法所在页面和方法名
                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
@@ -570,11 +585,11 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HItemID.toString();
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Unit/StopGy_Unit", //方法所在页面和方法名
                        url: GetWEBURL() + "/Gy_CardAddress/StopGy_CardAddress", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {