Merge branch 'dev'

src/api/podOrder.ts

@@ -37,7 +37,7 @@ export function getSubOrderBySubOrderNumber(thirdSubOrderNumber: string) {
   )
   )
 }
 }
 
 
-export function getSubOrderBySubOrder(factorySubOrderNumber: string,orderFrom:string) {
+export function getSubOrderBySubOrder(factorySubOrderNumber: string, orderFrom: string) {
   return axios.get<never, BaseRespData<PodProductList>>(
   return axios.get<never, BaseRespData<PodProductList>>(
     'factory/podJomallOrderProductCnUs/getSubOrderBySubOrderNumber',
     'factory/podJomallOrderProductCnUs/getSubOrderBySubOrderNumber',
     {
     {
@@ -259,9 +259,13 @@ export function completeDeliveryApi(
     { productIdList, ...data },
     { productIdList, ...data },
   )
   )
 }
 }
-export function exportStatementApi(data: SearchForm, status: string) {
+export function exportStatementApi(
+  data: SearchForm,
+  status: string,
+  currentPage: number,
+  pageSize: number) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrder/exportPodJomallReconciliation',
     'factory/podJomallOrder/exportPodJomallReconciliation',
-    { ...data, status },
+    { ...data, status, currentPage, pageSize },
   )
   )
 }
 }

src/views/order/pod/index.vue

@@ -220,7 +220,7 @@
             申请补胚</ElButton
             申请补胚</ElButton
           >
           >
         </ElFormItem>
         </ElFormItem>
-        <ElFormItem v-if="['TO_BE_RECEIPT','COMPLETE'].includes(status)">
+        <ElFormItem v-if="['TO_BE_RECEIPT', 'COMPLETE'].includes(status)">
           <ElButton type="success" @click="toExport"> 导出对账单</ElButton>
           <ElButton type="success" @click="toExport"> 导出对账单</ElButton>
         </ElFormItem>
         </ElFormItem>
         <ElFormItem
         <ElFormItem
@@ -1529,7 +1529,12 @@ const exportData = async () => {
     // tagIds: searchForm.value.tagIds.length > 0 ? searchForm.value.tagIds : null,
     // tagIds: searchForm.value.tagIds.length > 0 ? searchForm.value.tagIds : null,
   }
   }
   try {
   try {
-    const res = await exportStatementApi(params, status.value)
+    const res = await exportStatementApi(
+      params,
+      status.value,
+      currentPage.value,
+      pageSize.value,
+    )
     if (res.code !== 200) return
     if (res.code !== 200) return
     ElMessage.success('导出成功')
     ElMessage.success('导出成功')
     window.open(filePath + res.message)
     window.open(filePath + res.message)