Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 HTML/views/SystemSettings/Category.html

@@ -125,10 +125,49 @@
                     }, function() {});
                  }
               });
               sendData(IP + "/basis/GetRoleRightList", {}, 'get', function (res) {
                  $(function () {
                     $(".approvalBtn").hide();
                  });
                  $(function () {
                     $(".approvalBtnupt").hide();
                  });
                  $(function () {
                     $(".approvalBtndel").hide();
                  });
                  if (res.code == 0) { //成功
                     for (var k = 0; k < res.data.length; k++) {
                        if (res.data[k].MenuName == "新增类别") {
                           $(function () {
                              $(".approvalBtn").show();
                           });
                        }
                        if (res.data[k].MenuName == "删除类别") {
                           $(function () {
                              $(".approvalBtndel").show();
                           });
                        }
                        if (res.data[k].MenuName == "编辑类别") {
                           console.log(1)
                           $(function () {
                              $(".approvalBtnupt").show();
                           });
                        }
                     }
                  }
                  else { //不成功
                     layer.msg('获取信息失败', {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                     }, function () {
                        //回调
                     });
                  }
               });
            }
            sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
               $(function() {
                  $("#approvalBtn").hide();
                  $(".approvalBtn").hide();
               });
               $(function() {
                  $(".approvalBtnupt").hide();
@@ -140,7 +179,7 @@
                  for (var k = 0; k < res.data.length; k++) {
                     if (res.data[k].MenuName == "新增类别") {
                        $(function() {
                           $("#approvalBtn").show();
                           $(".approvalBtn").show();
                        });
                     }
                     if (res.data[k].MenuName == "删除类别") {