From 5c40d83463c3db4455985f0302b10b79c63af23a Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 09:14:22 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
HTML/views/BaseSetting/Materials.html | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 441f040..60597c2 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -245,7 +245,7 @@
var url = "/Basis/GetMateList?SkuNo="+SkuNo+"&&SkuName="+SkuName+"&&AuditStatusNo="+AuditStatusNo+"&&Type="+Type+"&&IsControlled="+IsControlled+"&&IsInspect="+IsInspect+"&&Environment="+Environment+"&CategoryNo="+CategoryNo;
sendData(IP + url, {}, 'get', function(res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
var list = res.data;
$.extend(infoOptions, {
@@ -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,
--
Gitblit v1.8.0