diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js index 65849078..f0341dad 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js @@ -64,7 +64,8 @@ export default function (businessType, type) { service = "invoice_service"; } const queryUrl = `settleaccount/${service}/main-query`; - const exportUrl = `settleaccount/invoice_service/export-detail`; + const exportUrl = `settleaccount/invoice_service/export`; + const exportGroupUrl = `settleaccount/invoice_service/export-detail`; const invoiceUrl = `settleaccount/${service}/generate-invoice`; const receivedUrl = `settleaccount/${service}/received`; const rejectUrl = `settleaccount/${service}/reject`; @@ -73,6 +74,7 @@ export default function (businessType, type) { const importUrl = `settleaccount/${service}/excel-import`; const queryMethod = "POST"; const exportMethod = "POST"; + const exportGroupMethod = "POST"; const invoiceMethod = "POST"; const receivedMethod = "POST"; const rejectMethod = "POST"; @@ -150,6 +152,7 @@ export default function (businessType, type) { }, edit: { exportUrl, + exportGroupUrl, invoiceUrl, receivedUrl, rejectUrl, @@ -157,6 +160,7 @@ export default function (businessType, type) { approvalUrl, importUrl, exportMethod, + exportGroupMethod, invoiceMethod, receivedMethod, rejectMethod, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js index 4b9364a9..2379ccdc 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js @@ -90,6 +90,7 @@ function createCommerceCheckList(path, business, client, title = "商务审批") component: "/settle/commerce", children: [ createButton("query", "title=查询&isTop=true"), + createButton("export", "title=导出&isTop=true&pattern=paged"), createButton( "approval", "title=商务审核通过&isTop=true", @@ -360,6 +361,7 @@ export default [ component: "/settle/finance", children: [ createButton("query", "title=查询&isTop=true"), + createButton("export", "title=导出&isTop=true&pattern=paged"), createButton( "import", "title=导入开票文件&isTop=true", diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js index 318f61f5..298a2d65 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js @@ -32,8 +32,8 @@ export default { await appListRef.value.onClick(async () => await request(url, data, { method: "POST" }), message, true); } } else if (item.path === "export-group") { - const url = config.edit.exportUrl; - const method = config.edit.exportMethod; + const url = config.edit.exportGroupUrl; + const method = config.edit.exportGroupMethod; const postData = { filters: [ { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js index 10734a21..7b01f9d6 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js @@ -32,7 +32,7 @@ export default { await appListRef.value.onClick(async () => await request(url, data, { method: "POST" }), message, true); } } else if (item.path === "export-group") { - const url = config.edit.exportUrl; + const url = config.edit.exportGroupUrl; const method = config.edit.exportMethod; const postData = { filters: [