From fd3d16522e131cc20e82bec2c197409f6dcd80ab Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 31 一月 2024 08:51:16 +0800
Subject: [PATCH] Merge branch 'wxw' into csc
---
HTML/views/ASNSetting/ArrivalNotice.html | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 690df4d..1629f2e 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 clossClass" 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 {
}
@@ -962,6 +967,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 +1009,7 @@
}, function () { doing = true });
}
});
- });
+ });
break;
case "chexiao" :
--
Gitblit v1.8.0