Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/purchasereturnRecordMain/index.ts

@@ -75,6 +75,17 @@ export const exportPurchasereturnRecordMain = async (params) => {
   }
 }
 
+
+// 导出采购退货记录主 Excel
+export const exportPurchasereturnRecordMainMorderType = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior-mordertype`, data })
+  } else {
+    return await request.download({url: `/wms/purchasereturn-record-main/export-excel-mordertype`, params})
+  }
+}
+
 // 导出维修备件退货记录主 Excel
 export const exportPurchasereturnRecordMainSpare = async (params) => {
   if (params.isSearch) {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue

@@ -175,7 +175,7 @@ const handleExport = async () => {
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     }else{
-      const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
+      const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainMorderType(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {