Merge branch 'master' into Liudl

bklLiudl

2024-09-07 8c6e292c508312eca0aef4c203e5857c4fc3094c

 HTML/views/SystemSettings/Role.html

@@ -96,7 +96,7 @@
                  RoleNo: RoleNo,
                  RoleName: RoleName,
               };
               sendData(IP + "/Basis/GetRolesList?RoleNo=" + RoleNo + "&&RoleName=" + RoleName, {}, "get", function (res) {
               sendData(IP + "/Basis/GetRolesList?RoleNo=" + RoleNo + "&RoleName=" + RoleName, {}, "get", function (res) {
                  if (res.code == 0)
                  {
                     //成功
@@ -122,10 +122,62 @@
                     );
                  }
               });
               sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                  $(function () {
                     $(".approvalBtn").hide();
                  });
                  $(function () {
                     $(".editClass").hide();
                  });
                  $(function () {
                     $(".roleClass").hide();
                  });
                  $(function () {
                     $(".approvalBtndel").hide();
                  });
                  if (res.code == 0) {
                     //成功
                     for (var k = 0; k < res.data.length; k++) {
                        if (res.data[k].MenuName == "编辑角色") {
                           $(function () {
                              $(".editClass").show();
                           });
                        }
                        if (res.data[k].MenuName == "分配权限") {
                           $(function () {
                              $(".roleClass").show();
                           });
                        }
                        if (res.data[k].MenuName == "添加角色") {
                           $(function () {
                              $(".approvalBtn").show();
                           });
                        }
                        if (res.data[k].MenuName == "删除角色") {
                           $(function () {
                              $(".approvalBtndel").show();
                           });
                        }
                     }
                  }
                  else {
                     //不成功
                     layer.msg(
                        "获取信息失败",
                        {
                           icon: 2,
                           time: 2000, //2秒关闭（如果不配置，默认是3秒）
                        },
                        function () {
                           //回调
                        }
                     );
                  }
               });
            }
            sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
               $(function() {
                  $("#approvalBtn").hide();
                  $(".approvalBtn").hide();
               });
               $(function() {
                  $(".editClass").hide();
@@ -156,7 +208,7 @@
                     if (res.data[k].MenuName == "添加角色")
                     {
                        $(function () {
                           $("#approvalBtn").show();
                           $(".approvalBtn").show();
                        });
                     }
                     if (res.data[k].MenuName == "删除角色")
@@ -260,6 +312,7 @@
            form.on("submit(LAY-app-contlist-search)", function (data) {
               var RoleNo = data.field.RoleNo;
               var RoleName = data.field.RoleName;
               console.log("roleno:"+RoleNo+" rolename:"+RoleName);
               refreshTable(RoleNo, RoleName);
            });