From f1fdbb9fbe3614e1b9b798e0219e17e8c520e0ce Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 19 八月 2025 16:29:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/webapp/static/js/order/out.js | 9 ++++++---
src/main/webapp/views/order/out.html | 5 +++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 +++
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 6b0c862..33494b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2293,6 +2293,9 @@
order.setStatus(Integer.valueOf(param.getGroupStatus()));
orderMapper.updateById(order);
}
+ orderDetlMapper.delete(
+ new EntityWrapper<OrderDetl>().eq("order_no", param.getGroupOrderNumber())
+ );
// 2. 涓�涓�瀵瑰簲閬嶅巻
List<GroupOrderConfirmParam.PackageGroupNo> pkgList = param.getPackageGroupNos();
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 9123594..14e31ec 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -332,7 +332,7 @@
}
,yes: function(layerIndex, layero){
// 绔嬪嵆鍑哄簱鎸夐挳鐐瑰嚮 鈫� 鍏堣姹備笅鎷夊垪琛�
- let loadIndex = layer.load(10);
+ let loadIndex = layer.load(2);
$.ajax({
url: baseUrl + "/getMesOrder/auth", // 浣犳彁渚涚殑鎺ュ彛
headers: {'token': localStorage.getItem('token')},
@@ -349,11 +349,14 @@
success: function(layero2, index2){
// 娓叉煋涓嬫媺妗�
let select = $(layero2).find('#batchSelectStaBox');
- select.empty().append(`<option value="">璇烽�夋嫨缁勮揣鍗曞彿</option>`); // 淇濇寔榛樿绌�
+ select.empty().append(`<option value="">璇烽�夋嫨缁勮揣鍗曞彿</option>`);
res.data.forEach(item => {
select.append(`<option value="${item}">${item}</option>`);
});
- layui.form.render('select'); // 閲嶆柊娓叉煋涓嬫媺妗�
+ // 娉ㄦ剰杩欓噷 select 瑕佸姞 lay-search 灞炴��
+ select.attr("lay-search", "");
+ layui.form.render('select');
+
// 纭鎸夐挳
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 1b8cb79..8e9bd0e 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -193,9 +193,10 @@
<script type="text/html" id="staBatchSelectDialog">
<form class="layui-form" style="padding: 25px 50px 30px 50px;text-align: center">
- <select id="batchSelectStaBox" name="batchSta" >
- <option value="">璇烽�夋嫨缁勮揣鍗曞彿</option> <!-- 榛樿绌哄�� -->
+ <select id="batchSelectStaBox" name="batchSta" lay-search>
+ <option value="">璇烽�夋嫨缁勮揣鍗曞彿</option>
</select>
+
<button style="margin-top: 30px" class="layui-btn" lay-filter="staBatchSelectConfirm" lay-submit="">纭畾</button>
</form>
</script>
--
Gitblit v1.9.1