diff --git a/src/api/cash/financialAccount.js b/src/api/cash/financialAccount.js index 109259e..d6db0c3 100644 --- a/src/api/cash/financialAccount.js +++ b/src/api/cash/financialAccount.js @@ -26,3 +26,12 @@ export const performanceSelect = (data) => { data }) } + +// 导出业绩归属 +export const exportPerformance = (data) => { + return http({ + method: 'POST', + url: '/export/exportPerformance', + data + }) +} diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index e8ba32a..7b1b7b8 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -41,7 +41,7 @@ const queryParams = reactive({ orderCode: '', statuses: [], pageNum: 1, - pageSize: 50 + pageSize: 20 }) const total = ref(0) @@ -86,8 +86,8 @@ const fetchData = async () => { fundsDTO:{ jwcode: queryParams.jwcode, markets: queryParams.markets, - startTime: queryParams.timeRange?.[0] || '', - endTime: queryParams.timeRange?.[1] || '', + startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', + endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', payType: queryParams.payType, orderCode: queryParams.orderCode, statuses: queryParams.statuses, @@ -119,7 +119,7 @@ const handleSearch = () => { const handleReset = () => { queryParams.jwcode = '' queryParams.markets = [] - queryParams.timeRange = [] + queryParams.timeRange = null queryParams.payType = '' queryParams.orderCode = '' queryParams.statuses = [] @@ -166,8 +166,8 @@ const handleExport = async () => { fundsDTO:{ jwcode: queryParams.jwcode, markets: queryParams.markets, - startTime: queryParams.timeRange?.[0] || '', - endTime: queryParams.timeRange?.[1] || '', + startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', + endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', payType: queryParams.payType, orderCode: queryParams.orderCode, statuses: queryParams.statuses, @@ -290,14 +290,15 @@ onMounted(() => { - - - -
订单号:
+
+ + +
+
付款时间: { - + - + - + - + - + diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue index 75c4ffb..e0f16d5 100644 --- a/src/views/moneyManage/financialAccount/performanceAttribution.vue +++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue @@ -1,10 +1,15 @@