From 00be30b877dacd58befbfb0638486dd36ab9869b Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 14 七月 2025 07:54:33 +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/order/order/orderOut.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 223037e..2551e97 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.vue
@@ -155,13 +155,12 @@
         ellipsis: true,
         ...getColumnSearchProps('memo'),
     },
-
     {
         title: formatMessage('common.operation', '鎿嶄綔'),
         name: 'oper',
         dataIndex: 'oper',
         key: 'oper',
-        width: 240,
+        width: 350,
         fixed: 'right',
     },
 ];
@@ -274,12 +273,14 @@
         printData.push(newItem)
     })
     printChild.value.printData = printData;
+    printChild.value.data = record.__v_raw;
     printChild.value.orderNo = record.__v_raw.orderNo
     printChild.value.open = true;
 }
 
 const onSearch = () => {
     // console.log('search');
+    currentPage = 1;
     getPage()
 }
 

--
Gitblit v1.9.1