mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-17 00:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

add time and type parameter to link in statistics page

Browse Source
This commit is contained in:
MaysWind
2021-01-28 23:26:29 +08:00
parent b3a861d10a
commit bb7c6e36a1
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/mobile/statistics/Transaction.vue
+22 -1
View File
@@ -111,7 +111,7 @@
</f7-list-item> </f7-list-item>
<f7-list-item v-for="(data, idx) in statisticsData.items" :key="idx" <f7-list-item v-for="(data, idx) in statisticsData.items" :key="idx"
class="statistics-list-item" class="statistics-list-item"
:link="`/transaction/list?${data.type}Id=${data.id}`"> :link="data | itemLinkUrl(query, $constants.statistics.allChartDataTypes)">
<div slot="media" class="display-flex no-padding-horizontal"> <div slot="media" class="display-flex no-padding-horizontal">
<div class="display-flex align-items-center statistics-icon"> <div class="display-flex align-items-center statistics-icon">
<f7-icon v-if="data.icon" <f7-icon v-if="data.icon"
@@ -665,6 +665,27 @@ export default {
} }
return 'Statistics'; return 'Statistics';
},
itemLinkUrl(item, query, allChartDataTypes) {
const querys = [];
if (query.chartDataType === allChartDataTypes.IncomeByAccount || query.chartDataType === allChartDataTypes.IncomeByPrimaryCategory || query.chartDataType === allChartDataTypes.IncomeBySecondaryCategory) {
querys.push('type=2');
} else if (query.chartDataType === allChartDataTypes.ExpenseByAccount || query.chartDataType === allChartDataTypes.ExpenseByPrimaryCategory || query.chartDataType === allChartDataTypes.ExpenseBySecondaryCategory) {
querys.push('type=3');
}
if (query.chartDataType === allChartDataTypes.IncomeByAccount || query.chartDataType === allChartDataTypes.ExpenseByAccount) {
querys.push('accountId=' + item.id);
} else if (query.chartDataType === allChartDataTypes.IncomeByPrimaryCategory || query.chartDataType === allChartDataTypes.IncomeBySecondaryCategory || query.chartDataType === allChartDataTypes.ExpenseByPrimaryCategory || query.chartDataType === allChartDataTypes.ExpenseBySecondaryCategory) {
querys.push('categoryId=' + item.id);
}
querys.push('dateType=' + query.dateType);
querys.push('minTime=' + query.startTime);
querys.push('maxTime=' + query.endTime);
return '/transaction/list?' + querys.join('&');
} }
} }
}; };
src/views/mobile/transactions/List.vue
+12 -2
View File
@@ -396,13 +396,23 @@ export default {
const self = this; const self = this;
const query = self.$f7route.query; const query = self.$f7route.query;
const dateParam = self.$utilities.getDateRangeByDateType(query.dateType ? parseInt(query.dateType) : undefined); let dateParam = self.$utilities.getDateRangeByDateType(query.dateType ? parseInt(query.dateType) : undefined);
if (!dateParam &&
query.dateType === self.$constants.datetime.allDateRanges.Custom.type.toString() &&
parseInt(query.maxTime) > 0 && parseInt(query.minTime) > 0) {
dateParam = {
dateType: parseInt(query.dateType),
maxTime: parseInt(query.maxTime),
minTime: parseInt(query.minTime)
};
}
this.$store.dispatch('initTransactionListFilter', { this.$store.dispatch('initTransactionListFilter', {
dateType: dateParam ? dateParam.dateType : undefined, dateType: dateParam ? dateParam.dateType : undefined,
maxTime: dateParam ? dateParam.maxTime : undefined, maxTime: dateParam ? dateParam.maxTime : undefined,
minTime: dateParam ? dateParam.minTime : undefined, minTime: dateParam ? dateParam.minTime : undefined,
type: query.type, type: parseInt(query.type) > 0 ? parseInt(query.type) : undefined,
categoryId: query.categoryId, categoryId: query.categoryId,
accountId: query.accountId accountId: query.accountId
}); });