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

yusijie

2026-01-30 cb2d97d64d7f506cf952d0bd468d31c842c4d891

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html

@@ -197,6 +197,7 @@
            var option = [];
            var HModName = "Gy_Group";
            var HBillType = "Gy_Group";
            var HBillType = "Gy_Group";
            var set_HideButton_ID = "toolbarDemo_ButtonSet";//需要设置的按钮的父级节点的id
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "HDeptID", "HUSEORGID", "HCREATEORGID"];
@@ -418,6 +419,7 @@
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    async: false,
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
@@ -491,7 +493,11 @@
                                } else if ($.inArray(data[i].name, totalArray) > -1) { //计算列  
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
                                } else if (data[i].name == '班组代码') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '班组代码' });
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '班组代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.班组代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -537,7 +543,7 @@

                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#ColName").find('option').length == 0) {
                                ColFilter();
                            }
                        } else {
@@ -634,12 +640,12 @@
                    sWhere += " and " + ColName2 + " " + com2;
                }
           
                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
                else {
                    HOrgID = $("#HOrgID").val();//组织
                }
                //if (number == 1) {
                //    HOrgID = sessionStorage["OrganizationID"];
                //}
                //else {
                //    HOrgID = $("#HOrgID").val();//组织
                //}

                if (HNumber) {
                    sWhere += " and ç­ç»„代码 like '%" + HNumber + "%'";
@@ -647,10 +653,13 @@
                if (HName) {
                    sWhere += " and ç­ç»„名称 like '%" + HName + "%'";
                }
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                //if (HOrgID) {
                //    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                //}

                sWhere += addSWhereByOpenType();
                sWhere += getOrgIDByUser();//用户关联组织查询过滤

                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -1117,14 +1126,39 @@
            function addSWhereByOpenType() {
                //获取参数
                var params = get_UrlVars();
                var openType = params[params[1]]; //1为直接列表模块打开  2为从其他模块打开基础资料列表
                if (openType == "2") {
                var openType = params[params[0]]; //1为直接列表模块打开  2为从其他模块打开基础资料列表
                if (typeof (openType) != "undefined") {
                    return " and ç¦ç”¨æ ‡è®° != 'Y' and å®¡æ ¸äºº!=''";
                }
                return "";
            }
            //#endregion

             //#region æ ¹æ®ç”¨æˆ·èŽ·å–用户关联组织的过滤条件
            function getOrgIDByUser() {
                var res = "";
                $.ajax({
                    type: "GET",
                    async: false,
                    url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //方法所在页面和方法名       ä¼ å‚ ç»„织必须是列表头部查询的组织  ä¸èƒ½ä½¿ç”¨ç”¨æˆ·é»˜è®¤
                    data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HOrgID").val() },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data[0].sWhere == "1") {
                                res = " and HUSEORGID = '" + $("#HOrgID").val() + "'";
                            } else {
                                res = result.data[0].sWhere;
                            }
                        }
                    }, error: function (err) {
                        res = " and 1 = 0";
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                return res;
            }
            //#endregion

            //#endregion
            //以上是layui模块
        });