From 6933522e3f1ffe8f8b1b7e169e2c54a7d24f0443 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 02 九月 2025 14:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/order/order/orderList.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 9e37593..9c855c5 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -395,6 +395,7 @@
key: "action",
align: "center",
width: 150,
+ fixed:"right",
render: (h, params) => {
const buttons = [];
@@ -641,21 +642,22 @@
deliverOrder(order) {
console.log('------------->鑾峰彇璁㈠崟淇℃伅',order);
console.log('璁㈠崟sn缂栧彿',order.sn);
- // 杩欓噷鍙互璋冪敤鐩稿叧鐨凙PI杩涜鍙戣揣鎿嶄綔
+ // 璋冪敤鍙戣揣API
API_Order.sendMessage(order.sn).then((res) => {
console.log('-------------->',res);
if (res.success) {
this.$Message.success('鏇存柊鐘舵�佹垚鍔�');
- this.getDataList(); // 鍒锋柊鍒楄〃
+ // 寤惰繜5绉掑埛鏂板垪琛╩q娑堟伅鏄紓姝ョ殑鏃犳硶瀹炴椂鍚屾闇�瑕佹墽琛屽欢杩熷埛鏂�
+ setTimeout(() => {
+ this.getDataList();
+ }, 5000);
} else {
this.$Message.error('鏇存柊鐘舵�佸け璐�');
}
+ }).catch((error) => {
+ console.error('鏇存柊鐘舵�佸け璐�:', error);
+ this.$Message.error('鏇存柊鐘舵�佸け璐ワ紝璇烽噸璇�');
});
-
- // 鏆傛椂妯℃嫙鎿嶄綔
- this.$Message.success(`璁㈠崟 ${order.sn} 鏇存柊鐘舵�佹垚鍔燂紒`);
- // 鍒锋柊鍒楄〃鏁版嵁
- this.getDataList();
},
// 瀵煎嚭璁㈠崟
async exportOrder() {
--
Gitblit v1.8.0