From 1e65e680519a32480219e1866baa245df1a8fd17 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-admin/src/components/orderLog/index.vue |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-admin/src/components/orderLog/index.vue b/zy-asrs-admin/src/components/orderLog/index.vue
index 227aab7..5e808b1 100644
--- a/zy-asrs-admin/src/components/orderLog/index.vue
+++ b/zy-asrs-admin/src/components/orderLog/index.vue
@@ -194,7 +194,8 @@
 
 const showDetl = (item) => {
   showOrderDetlChild.value.openDetl = true;
-  showOrderDetlChild.value.orderId = item.id;
+  showOrderDetlChild.value.orderId = item.orderNo;
+  
 }
 
 const handleExport = async (intl) => {
@@ -211,6 +212,8 @@
 
 const onSearch = () => {
   // console.log('search');
+      currentPage = 1;
+
   getPage()
 }
 

--
Gitblit v1.9.1