Merge branch 'master' into Liudl

bklLiudl

2024-08-22 5c40d83463c3db4455985f0302b10b79c63af23a

 HTML/views/BaseSetting/Materials.html

@@ -264,35 +264,79 @@
                     }, function() {});
                  }
               });
            }
            sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
               $(function() {
                  $("#approvalBtn").hide();
               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 () {
                           //回调
                        }
                     );
                  }
               });
               $(function() {
            }
				

				
            sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
               $(function () {
                  $(".approvalBtn").hide();
               });
               $(function () {
                  $(".approvalBtndel").hide();
               });
               $(function() {
               $(function () {
                  $(".approvalBtnupt").hide();
               });
               if (res.code == 200) //成功
               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 () {
                           $(".approvalBtn").show();
                        });
                     }
                     if (res.data[k].MenuName == "删除物料")
                     {
                        $(function() {
                     if (res.data[k].MenuName == "删除物料") {
                        $(function () {
                           $(".approvalBtndel").show();
                        });
                     }
                     if (res.data[k].MenuName == "编辑物料")
                     {
                        $(function() {
                     if (res.data[k].MenuName == "编辑物料") {
                        $(function () {
                           $(".approvalBtnupt").show();
                        });
                     }
@@ -312,6 +356,7 @@
                  );
               }
            });
				
            
            var infoOptions = {
               elem: "#LAY-app-content-list",
@@ -459,7 +504,7 @@
                                 doing = false;
                                 sendData(IP + "/Basis/AddMate", param, 'post',function(res) {
                                    console.log(res);
                                    if (res.code == 200) { //成功
                                    if (res.code == 0) { //成功
                                       layer.msg(res.msg, {
                                          icon: 1,
                                          time: 2000 //2秒关闭（如果不配置，默认是3秒）
@@ -559,7 +604,7 @@
                        doing = false;
                        sendData(IP + "/Basis/DelMate?Id="+data.Id+"", {} , 'get', function(res) {
                           console.log(res);
                           if (res.code == 200) { //成功
                           if (res.code == 0) { //成功
                              layer.msg(res.msg, {
                                 icon: 1,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
@@ -641,7 +686,7 @@
                              doing = false;
                              sendData(IP + "/Basis/ExitMate", param, 'post',
                              function(res) {
                                 if (res.code == 200) //成功
                                 if (res.code == 0) //成功
                                 {
                                    layer.msg("修改成功", {
                                       icon: 1,