From 9d6a02b54ea894771c48ff660d86b48990eccb7f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 09:48:03 +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 | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderLog/index.vue b/zy-asrs-admin/src/components/orderLog/index.vue
index 7ffd4f1..5e808b1 100644
--- a/zy-asrs-admin/src/components/orderLog/index.vue
+++ b/zy-asrs-admin/src/components/orderLog/index.vue
@@ -45,14 +45,14 @@
{
title: formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿'),
dataIndex: 'orderNo',
- width: 140,
+ width: 230,
ellipsis: true,
...getColumnSearchProps('orderNo'),
},
{
title: formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡'),
dataIndex: 'orderTime',
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('orderTime'),
},
@@ -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