From 1310b47a24f0cc70f0128c820bd490dca6a1a921 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期四, 22 八月 2024 14:08:03 +0800
Subject: [PATCH] Merge branch 'master' into yyk
---
HTML/views/ASNSetting/ArrivalNotice.html | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 3d4ae65..396741c 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -291,7 +291,10 @@
<i class="layui-icon"></i>娣诲姞
</button>
</script>
-
+ <!-- if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (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>`;
+ } -->
<script type="text/html" id="toolbarDemoList">
{{# function GetBtn2(d){
console.log(d);
@@ -300,10 +303,7 @@
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.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (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;
}
@@ -401,7 +401,7 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer', 'laydate'], function () {
+ }).use(['index', 'form','table', 'laypage', 'layer', 'laydate'], function () {
var doing = true;
@@ -600,7 +600,7 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
- $(".addLabelClass").hide(); //澶嶆牳
+ //$(".addLabelClass").hide(); //鐢熸垚鏍囩
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
@@ -641,11 +641,11 @@
$(".checkClass").show();
});
}
- if (res.data[k].MenuName == "鐢熸垚鏍囩") {
- $(function () {
- $(".addLabelClass").show();
- });
- }
+ // if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ // $(function () {
+ // $(".addLabelClass").show();
+ // });
+ // }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
--
Gitblit v1.8.0