From 46110c2ac4776dc7106edfa49ba8449d518f7d90 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 01 二月 2024 09:35:27 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/ArrivalNotice.html | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 690df4d..e69f57a 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -180,6 +180,9 @@
html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
<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 checkClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
+ break;
default :
break;
}
@@ -203,6 +206,8 @@
html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">鎵ц瀹屾瘯</button>`;
} else if(d.Status=='3') {
html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">璁㈠崟鍏抽棴</button>`;
+ } else if(d.Status=='4') {
+ html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">涓婁紶瀹屾瘯</button>`;
} else {
}
@@ -216,10 +221,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;
@@ -250,6 +265,14 @@
}
}}
{{ GetBtn7(d) }}
+ </script>
+
+ <script type="text/html" id="templetCheckTime">
+ {{# function GetBtn11(d){
+ return formatDate(d.CheckTime);
+ }
+ }}
+ {{ GetBtn11(d) }}
</script>
<!-- #endregion -->
</div>
@@ -381,6 +404,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缂栫爜
@@ -851,6 +876,7 @@
$(".cheXiaoClass").hide();
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
+ $(".checkClass").hide(); //澶嶆牳
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -883,6 +909,11 @@
if (res.data[k].MenuName == "缁存姢鍏ュ簱鍗曞娉�") {
$(function() {
$(".editDemoClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
+ $(function() {
+ $(".checkClass").show();
});
}
}
@@ -962,6 +993,32 @@
var param = {
Id:data.Id,
};
+ sendData(IP + "/UpApi/CloseAsn", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ doing = true
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true });
+ }
+ });
+ });
+
+ break;
+ case "check" :
+ // 浠ｇ爜鍖哄煙
+ layer.confirm('纭畾澶嶆牳姝ゅ崟鎹悧锛�', function(index) {
+ // 浠ｇ爜鍖哄煙
+ var param = {
+ Id:data.Id,
+ };
sendData(IP + "/UpApi/FinishAsn", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
@@ -978,7 +1035,7 @@
}, function () { doing = true });
}
});
- });
+ });
break;
case "chexiao" :
--
Gitblit v1.8.0