From 56d8b770cdab485db837f60118abbd855f8011c4 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 04 二月 2024 09:10:21 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/views/ASNSetting/ArrivalNotice.html | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 7ba93ca..cf542ff 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -300,14 +300,15 @@
</script>
<script type="text/html" id="toolbarDemoList">
- {{# function GetBtn2(d){
+ {{# function GetBtn2(d){
+ console.log(d);
var html = ``;
if(d.Status == "0"){
html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
}
- if(d.Status == "0" || d.Status == "1"){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Addlabel">
+ if((d.AsnType =="1" || d.AsnType == "4") && (d.Status == "0" || d.Status == "1")){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
<i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
}
return html;
@@ -888,6 +889,8 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
+ $(".addLabelClass").hide(); //澶嶆牳
+
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -927,6 +930,11 @@
$(".checkClass").show();
});
}
+ if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ $(function() {
+ $(".addLabelClass").show();
+ });
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
--
Gitblit v1.8.0