合并代码

src/views/think/thinkOrder/components/search.vue

@@ -73,6 +73,9 @@
         <a-button @click="reset">重置</a-button>
         <a-button @click="setHasInvoice" :disabled="!selection?.length">设置已开票</a-button>
         <a-button @click="openInvoiceByList" :disabled="!selection?.length" type="primary">合并开票</a-button>
+        <a-button class="ele-btn-icon" @click="handleExport">
+          <span>导出订单</span>
+        </a-button>
       </a-space>
     </div>
   </div>
@@ -104,6 +107,7 @@ const emit = defineEmits<{
   (e: "remove"): void;
   (e: "advanced"): void;
   (e: "invoice"): void;
+  (e: 'export'): void;
 }>();
 
 // 表单数据
@@ -153,8 +157,21 @@ const reset = () => {
   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)[][] = [
     [