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

yusijie

2024-05-13 3411199198e289fe53a027679cb0a078afe127b7

 WebTM/views/É豸¹ÜÀí/Sb_EqpConkBookBillList.html

@@ -417,7 +417,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -470,7 +470,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , height: 780
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
@@ -588,7 +588,7 @@
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    //get_FastQuery();
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
@@ -621,6 +621,7 @@
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {