diff --git a/src/views/think/thinkOrder/components/search.vue b/src/views/think/thinkOrder/components/search.vue
index 230c472..8c3ad3b 100644
--- a/src/views/think/thinkOrder/components/search.vue
+++ b/src/views/think/thinkOrder/components/search.vue
@@ -86,14 +86,11 @@
/>
重置
设置已开票
-
-
-
-
-
-
+ >设置已开票
+
+
+ 导出订单
+
@@ -126,6 +123,7 @@
(e: 'add'): void;
(e: 'remove'): void;
(e: 'advanced'): void;
+ (e: 'export'): void;
}>();
// 表单数据
@@ -175,8 +173,21 @@
search();
};
+ const handleExport = () => {
+ const [d1, d2] = dateRange.value ?? [];
+ xlsFileName.value = `${d1}至${d2}`;
+ where.forAdmin = true;
+ where.limit = 5000;
+ where.page = 1;
+ where.timeStart = d1 ? dayjs(d1).valueOf() / 1000 : undefined;
+ where.timeEnd = d2 ? dayjs(d2).valueOf() / 1000 : undefined;
+ emit('export', {
+ ...where
+ });
+ };
+
// 导出
- const handleExport = async () => {
+ const handleExport2 = async () => {
loading.value = true;
const array: (string | number)[][] = [
[
diff --git a/src/views/think/thinkOrder/index.vue b/src/views/think/thinkOrder/index.vue
index ee1f287..0a0ef8b 100644
--- a/src/views/think/thinkOrder/index.vue
+++ b/src/views/think/thinkOrder/index.vue
@@ -20,6 +20,7 @@
@add="openEdit"
@remove="removeBatch"
@batchMove="openMove"
+ @export="handleExport"
/>
@@ -263,6 +264,7 @@