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

fix the bug that the filter does not take effect when navigating from the account or statistics page to the transaction list page

Browse Source
This commit is contained in:
MaysWind
2024-07-07 14:08:53 +08:00
parent 7b70b2db29
commit dad3f1041e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stores/statistics.js
+2 -2
View File
@@ -754,12 +754,12 @@ export const useStatisticsStore = defineStore('statistics', {
|| this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.ExpenseByAccount.type || this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.ExpenseByAccount.type
|| this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.AccountTotalAssets.type || this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.AccountTotalAssets.type
|| this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.AccountTotalLiabilities.type) { || this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.AccountTotalLiabilities.type) {
querys.push('accountId=' + item.id); querys.push('accountIds=' + item.id);
} else if (this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.IncomeByPrimaryCategory.type } else if (this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.IncomeByPrimaryCategory.type
|| this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.IncomeBySecondaryCategory.type || this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.IncomeBySecondaryCategory.type
|| this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.ExpenseByPrimaryCategory.type || this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.ExpenseByPrimaryCategory.type
|| this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.ExpenseBySecondaryCategory.type) { || this.transactionStatisticsFilter.chartDataType === statisticsConstants.allChartDataTypes.ExpenseBySecondaryCategory.type) {
querys.push('categoryId=' + item.id); querys.push('categoryIds=' + item.id);
} }
if (analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis if (analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis
src/views/desktop/accounts/ListPage.vue
+1 -1
View File
@@ -204,7 +204,7 @@
<div class="d-flex account-toolbar align-center"> <div class="d-flex account-toolbar align-center">
<v-btn class="px-2" density="comfortable" color="default" variant="text" <v-btn class="px-2" density="comfortable" color="default" variant="text"
:disabled="loading" :prepend-icon="icons.transactions" :disabled="loading" :prepend-icon="icons.transactions"
:to="`/transaction/list?accountId=${accountOrSubAccountId(element)}`"> :to="`/transaction/list?accountIds=${accountOrSubAccountId(element)}`">
{{ $t('Transaction List') }} {{ $t('Transaction List') }}
</v-btn> </v-btn>
<v-btn class="px-2 ml-1" density="comfortable" color="default" variant="text" <v-btn class="px-2 ml-1" density="comfortable" color="default" variant="text"
src/views/mobile/accounts/ListPage.vue
+2 -2
View File
@@ -84,7 +84,7 @@
:id="getAccountDomId(account)" :id="getAccountDomId(account)"
:class="{ 'has-child-list-item': account.type === allAccountTypes.MultiSubAccounts && hasVisibleSubAccount(account), 'actual-first-child': account.id === firstShowingIds.accounts[accountCategory.id], 'actual-last-child': account.id === lastShowingIds.accounts[accountCategory.id] }" :class="{ 'has-child-list-item': account.type === allAccountTypes.MultiSubAccounts && hasVisibleSubAccount(account), 'actual-first-child': account.id === firstShowingIds.accounts[accountCategory.id], 'actual-last-child': account.id === lastShowingIds.accounts[accountCategory.id] }"
:after="accountBalance(account)" :after="accountBalance(account)"
:link="!sortable ? '/transaction/list?accountId=' + account.id : null" :link="!sortable ? '/transaction/list?accountIds=' + account.id : null"
:key="account.id" :key="account.id"
v-for="account in categorizedAccounts[accountCategory.id].accounts" v-for="account in categorizedAccounts[accountCategory.id].accounts"
v-show="showHidden || !account.hidden" v-show="showHidden || !account.hidden"
@@ -117,7 +117,7 @@
:class="{ 'actual-first-child': subAccount.id === firstShowingIds.subAccounts[account.id], 'actual-last-child': subAccount.id === lastShowingIds.subAccounts[account.id] }" :class="{ 'actual-first-child': subAccount.id === firstShowingIds.subAccounts[account.id], 'actual-last-child': subAccount.id === lastShowingIds.subAccounts[account.id] }"
:id="getAccountDomId(subAccount)" :id="getAccountDomId(subAccount)"
:title="subAccount.name" :footer="subAccount.comment" :after="accountBalance(subAccount)" :title="subAccount.name" :footer="subAccount.comment" :after="accountBalance(subAccount)"
:link="!sortable ? '/transaction/list?accountId=' + subAccount.id : null" :link="!sortable ? '/transaction/list?accountIds=' + subAccount.id : null"
:key="subAccount.id" :key="subAccount.id"
v-for="subAccount in account.subAccounts" v-for="subAccount in account.subAccounts"
v-show="showHidden || !subAccount.hidden" v-show="showHidden || !subAccount.hidden"