Merge branch 'master' into wxw

wxw

2024-08-17 0464969366317154fdbb51e106ca778b855bdd08

 HTML/views/BaseSetting/Materials.html

@@ -275,7 +275,7 @@
               $(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 == "添加物料")
@@ -459,7 +459,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 +559,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 +641,7 @@
                              doing = false;
                              sendData(IP + "/Basis/ExitMate", param, 'post',
                              function(res) {
                                 if (res.code == 200) //成功
                                 if (res.code == 0) //成功
                                 {
                                    layer.msg("修改成功", {
                                       icon: 1,