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

wtt

2025-10-30 d9d78499cf3aaa6165bb1bc9fe3d8a9537e4d26a

 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainList.html

@@ -443,7 +443,8 @@

            //查询
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });              
                var index = layer.load(0, { shade: false });
                sWhere += addSWhereByOpenType();//添加单据模块选择基础资料时的过滤条件，已审核未关闭
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Gy_EquipFileMain/GetList',
@@ -641,7 +642,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增器具档案列表',
                    title: '新增设备档案列表',
                    closeBtn: false,
                    shift: 2,
                    area: ['100%', '100%'],
@@ -666,7 +667,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑器具档案列表'
                        , title: '编辑设备档案列表'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
@@ -693,7 +694,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑器具档案列表'
                        , title: '编辑设备档案列表'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
@@ -915,7 +916,12 @@
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length >= 1) {
                    var rows = [];
                    for (var i = 0; i < data.length; i++) {
                        rows.push(data[i].hmainid.toString());
                    }

                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
@@ -923,12 +929,12 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HEquipFileMainBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择一行数据打印！');
                    layer.msg('请选择数据打印！');
                }
            }

@@ -1030,8 +1036,36 @@
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#HUSEORGID").val(sessionStorage["Organization"]);
                form.render('select');
                $("#btnSearch").click();
            }

            //#region èŽ·å–参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            //#endregion

            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var addSWhere = "";
                if (typeof (openType) != "undefined") {
                    addSWhere = " and isnull(关闭人,'') = '' and isnull(审核人,'') != ''";
                }
                return addSWhere;
            }
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

            //获取当前用户的默认过滤方案