From 1403ec7e5c62962fd5d20123defedae97a4abb75 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 02 二月 2024 09:12:49 +0800
Subject: [PATCH] 1
---
HTML/views/ASNSetting/ArrivalNotice.html | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index b5b194c..3ddf22a 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -62,6 +62,7 @@
<option value="1">姝ｅ湪鎵ц</option>
<option value="2">鎵ц瀹屾垚</option>
<option value="3">璁㈠崟鍏抽棴</option>
+ <option value="4">涓婁紶瀹屾瘯</option>
</select>
</div>
</div>
@@ -91,9 +92,17 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
+ <!-- JC24 -->
+ <option value="0">鎴愬搧鍏ュ簱</option>
+ <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="2">涓棿鍝佸叆搴�</option>
+ <option value="3">閫�璐у叆搴�</option>
+ <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
+ <option value="5">鍏跺畠鍏ュ簱</option>
+ <option value="6">浠ｅ偍鍏ュ簱</option>
<!-- JC09 -->
- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
- <option value="1">闈炴爣浜у搧鍏ュ簱</option>
+ <!-- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
+ <option value="1">闈炴爣浜у搧鍏ュ簱</option> -->
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
@@ -181,7 +190,7 @@
<a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
break;
case "3" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
break;
default :
break;
@@ -221,10 +230,20 @@
{{# function GetBtn4(d){
var html = ``;
if(d.Type=='0'){
- html = `鏍囧噯浜у搧鍏ュ簱`;
+ html = `鎴愬搧鍏ュ簱`;
} else if(d.Type=='1') {
- html = `闈炴爣浜у搧鍏ュ簱`;
- } else {
+ html = `閲囪喘鍏ュ簱`;
+ } else if(d.Type=='2') {
+ html = `涓棿鍝佸叆搴揱;
+ }else if(d.Type=='3') {
+ html = `閫�璐у叆搴揱;
+ }else if(d.Type=='4') {
+ html = `杞﹂棿浣欐枡閫�鍥炲叆搴揱;
+ }else if(d.Type=='5') {
+ html = `鍏跺畠鍏ュ簱`;
+ }else if(d.Type=='6') {
+ html = `浠ｅ偍鍏ュ簱`;
+ }else {
}
return html;
@@ -255,6 +274,14 @@
}
}}
{{ GetBtn7(d) }}
+ </script>
+
+ <script type="text/html" id="templetCheckTime">
+ {{# function GetBtn11(d){
+ return formatDate(d.CheckTime);
+ }
+ }}
+ {{ GetBtn11(d) }}
</script>
<!-- #endregion -->
</div>
@@ -390,6 +417,8 @@
{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',templet: '#templetCreateTime'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 110},
{field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',templet: '#templetUpdateTime'},
+ {field: 'CheckUserName',title: '澶嶆牳浜�',align: 'center',width: 110},
+ {field: 'CheckTime',title: '澶嶆牳鏃堕棿',align: 'center',templet: '#templetCheckTime'},
{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -860,6 +889,7 @@
$(".cheXiaoClass").hide();
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
+ $(".checkClass").hide(); //澶嶆牳
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -894,6 +924,11 @@
$(".editDemoClass").show();
});
}
+ if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
+ $(function() {
+ $(".checkClass").show();
+ });
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
--
Gitblit v1.8.0