From b79c300768db0aa78723c0b7f5a6a4d6d4c94bc9 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 05 二月 2024 11:13:29 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/ArrivalNotice.html | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index f6fbcab..3c4ae48 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -100,6 +100,7 @@
<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
<option value="5">鍏跺畠鍏ュ簱</option>
<option value="6">浠ｅ偍鍏ュ簱</option>
+ <option value="7">瀵勫瓨鍏ュ簱</option>
<!-- JC09 -->
<!-- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
<option value="1">闈炴爣浜у搧鍏ュ簱</option> -->
@@ -177,9 +178,7 @@
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
- <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>
- <a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs">
- <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>`;
+ <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
break;
case "1" :
html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
@@ -243,6 +242,8 @@
html = `鍏跺畠鍏ュ簱`;
}else if(d.Type=='6') {
html = `浠ｅ偍鍏ュ簱`;
+ }else if(d.Type=='7') {
+ html = `瀵勫瓨鍏ュ簱`;
}else {
}
@@ -302,14 +303,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;
@@ -890,6 +892,8 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
+ $(".addLabelClass").hide(); //澶嶆牳
+
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -927,6 +931,11 @@
if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
$(function() {
$(".checkClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ $(function() {
+ $(".addLabelClass").show();
});
}
}
@@ -1178,7 +1187,7 @@
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html',
+ content: 'LabelPrintSelect.html?Id='+id,
maxmin: true,
area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
--
Gitblit v1.8.0