From 156e0d593769d1c4438eb1c6d4547063f76331b3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 19 十一月 2025 15:52:31 +0800
Subject: [PATCH] 修改拣货拼托bug
---
HTML/views/ASNSetting/ArrivalNotice.html | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index da7278e..1194753 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -140,7 +140,7 @@
</div>
<div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ <button id="searchBtn" class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
@@ -175,7 +175,7 @@
<script type="text/html" id="toolbarDemo1">
{{# function GetBtn1(d){
var html = '';
- if (d.Status == '0' && (d.Origin == '褰曞叆' || d.Origin == '閲囪喘鍗�')) {
+ if (d.Status == '0' && (d.Origin == '褰曞叆' || d.Origin == '瀵煎叆' || d.Origin == '閲囪喘鍗�' || d.Origin == 'SAP')) {
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>`;
}
@@ -689,17 +689,16 @@
var param = {
"ListArrivalNotice": noticeList,
}
- console.log('param:'+param)
+ //console.log('param:'+param)
layer.load();//鎵撳紑loading
sendData(IP + "/BllAsn/ImportArrivalNotice", param, 'post', function (res) {
- console.log(res);
layer.closeAll(); //鍏抽棴loading
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
- refreshTable();
+ $('#searchBtn').click();
doing = true
});
} else { //涓嶆垚鍔�
@@ -707,12 +706,12 @@
layer.msg("瀵煎叆鏁版嵁鏍煎紡鏈夎锛�", {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { refreshTable(); doing = true });
+ }, function () { $('#searchBtn').click(); doing = true });
} else {
layer.msg(res.msg, {
icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { refreshTable(); doing = true });
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { $('#searchBtn').click(); doing = true });
}
}
});
@@ -876,26 +875,34 @@
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, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- refreshTable();
- doing = true
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true });
- }
- });
+ if (doing == true) {
+ doing = false;
+ // 浠ｇ爜鍖哄煙
+ var param = {
+ Id: data.Id,
+ };
+ sendData(IP + "/UpApi/FinishAsn", 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 });
+ }
+ });
+ } else {
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
});
break;
--
Gitblit v1.8.0