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

wtt

2025-03-25 12f860b99c61d0dc58a31a237bf8a912bd1da72f

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_InspectInstruMent.html

@@ -202,7 +202,7 @@
            var ins;                //用于导出excel
            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //需要设置的按钮的父级节点的id
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "短代码 ","父级ID", "等级", "末级标志", "助记码", "创建组织"];
            var titleData = ["HItemID", "短代码 ", "父级ID", "等级", "末级标志", "助记码", "创建组织","HUSEORGID"];

            //#endregion

@@ -333,25 +333,7 @@
                    , page: true
                    , limits: [50, 500, 5000, 20000]
                    , limit: 50
                    , cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: '不良原因代码', title: '不良原因代码' }
                    //    , { field: '不良原因名称', title: '不良原因名称' }
                    //    , { field: '条码编号', title: '条码编号' }
                    //    , { field: '禁用标记', title: '禁用标记' }
                    //    , { field: '备注', title: '备注' }
                    //]]
                    //将禁用的数据标红
                    //, done: function (res, cuur, count) {
                    //    for (var i = 0; i < res.data.length; i++)
                    //    {
                    //        if (res.data[i].禁用标记=='Y') {
                    //            $("table tbody tr").eq(i).css('color','red')
                    //        }
                    //    }
                    //}
                    , cellMinWidth: 90                   
                };
            }
            //#endregion  ç›‘听网格表体事件
@@ -361,7 +343,6 @@
                //单据号超链接
                if (obj.event == '检验仪器代码') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于，则执行if循环
                    var linterid = data.HItemID.toString();    //声明变量linterid ä¸º data.hmainid
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
@@ -389,7 +370,6 @@
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_BadReason/Gy_InspectInstruMentList',
                    type: "GET",
                    async:false,
@@ -572,6 +552,7 @@
                if (HUSEORGID) {
                    sWhere += " and ä½¿ç”¨ç»„织名称 = '" + HUSEORGID + "'";
                }
                addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -806,6 +787,18 @@
            }
            //#endregion

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


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

            //#region   èŽ·å–组织