Merge branch 'master' into Liudl

bklLiudl

2024-09-07 8c6e292c508312eca0aef4c203e5857c4fc3094c

 HTML/views/SystemSettings/Role.html

@@ -124,7 +124,7 @@
               });
               sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                  $(function () {
                     $("#approvalBtn").hide();
                     $(".approvalBtn").hide();
                  });
                  $(function () {
                     $(".editClass").hide();
@@ -150,7 +150,7 @@
                        }
                        if (res.data[k].MenuName == "添加角色") {
                           $(function () {
                              $("#approvalBtn").show();
                              $(".approvalBtn").show();
                           });
                        }
                        if (res.data[k].MenuName == "删除角色") {
@@ -177,7 +177,7 @@
            }
            sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
               $(function() {
                  $("#approvalBtn").hide();
                  $(".approvalBtn").hide();
               });
               $(function() {
                  $(".editClass").hide();
@@ -208,7 +208,7 @@
                     if (res.data[k].MenuName == "添加角色")
                     {
                        $(function () {
                           $("#approvalBtn").show();
                           $(".approvalBtn").show();
                        });
                     }
                     if (res.data[k].MenuName == "删除角色")
@@ -312,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);
            });