Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 HTML/views/BaseSetting/Materials.html

@@ -264,10 +264,9 @@
                     }, function() {});
                  }
               });
            }
            sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
               $(function() {
                  $("#approvalBtn").hide();
                     $(".approvalBtn").hide();
               });
               $(function() {
                  $(".approvalBtndel").hide();
@@ -278,20 +277,17 @@
               if (res.code == 0) //成功
               {
                  for (var k = 0; k < res.data.length; k++) {
                     if (res.data[k].MenuName == "添加物料")
                     {
                        if (res.data[k].MenuName == "添加物料") {
                        $(function() {
                           $("#approvalBtn").show();
                              $(".approvalBtn").show();
                        });
                     }
                     if (res.data[k].MenuName == "删除物料")
                     {
                        if (res.data[k].MenuName == "删除物料") {
                        $(function() {
                           $(".approvalBtndel").show();
                        });
                     }
                     if (res.data[k].MenuName == "编辑物料")
                     {
                        if (res.data[k].MenuName == "编辑物料") {
                        $(function() {
                           $(".approvalBtnupt").show();
                        });
@@ -312,6 +308,55 @@
                  );
               }
            });
            }
				

				
            sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
               $(function () {
                  $(".approvalBtn").hide();
               });
               $(function () {
                  $(".approvalBtndel").hide();
               });
               $(function () {
                  $(".approvalBtnupt").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 == "编辑物料") {
                        $(function () {
                           $(".approvalBtnupt").show();
                        });
                     }
                  }
               }
               else //不成功
               {
                  layer.msg(
                     "获取信息失败",
                     {
                        icon: 2,
                        time: 2000, //2秒关闭（如果不配置，默认是3秒）
                     },
                     function () {
                        //回调
                     }
                  );
               }
            });
				
            
            var infoOptions = {
               elem: "#LAY-app-content-list",