diff --git a/src/locales/en.json b/src/locales/en.json index ff1fd745..1f0ea8ea 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1509,7 +1509,11 @@ "No data to import": "No data to import", "Cannot import invalid transactions": "Cannot import invalid transactions", "Unable to parse import file": "Unable to parse import file", - "Batch Replace": "Batch Replace", + "Batch Replace Selected Expense Categories": "Batch Replace Selected Expense Categories", + "Batch Replace Selected Income Categories": "Batch Replace Selected Income Categories", + "Batch Replace Selected Transfer Categories": "Batch Replace Selected Transfer Categories", + "Batch Replace Selected Accounts": "Batch Replace Selected Accounts", + "Batch Replace Selected Destination Accounts": "Batch Replace Selected Destination Accounts", "Replace Invalid Expense Categories": "Replace Invalid Expense Categories", "Replace Invalid Income Categories": "Replace Invalid Income Categories", "Replace Invalid Transfer Categories": "Replace Invalid Transfer Categories", diff --git a/src/locales/zh_Hans.json b/src/locales/zh_Hans.json index f2dfe90b..64796537 100644 --- a/src/locales/zh_Hans.json +++ b/src/locales/zh_Hans.json @@ -1509,7 +1509,11 @@ "No data to import": "没有可以导入的数据", "Cannot import invalid transactions": "不能导入无效的交易", "Unable to parse import file": "无法解析导入的文件", - "Batch Replace": "批量替换", + "Batch Replace Selected Expense Categories": "批量替换选中的支出分类", + "Batch Replace Selected Income Categories": "批量替换选中的收入分类", + "Batch Replace Selected Transfer Categories": "批量替换选中的转账分类", + "Batch Replace Selected Accounts": "批量替换选中的账户", + "Batch Replace Selected Destination Accounts": "批量替换选中的目标账户", "Replace Invalid Expense Categories": "替换无效的支出分类", "Replace Invalid Income Categories": "替换无效的收入分类", "Replace Invalid Transfer Categories": "替换无效的转账分类", diff --git a/src/views/desktop/transactions/list/dialogs/ReplaceInvalidItemDialog.vue b/src/views/desktop/transactions/list/dialogs/BatchReplaceDialog.vue similarity index 84% rename from src/views/desktop/transactions/list/dialogs/ReplaceInvalidItemDialog.vue rename to src/views/desktop/transactions/list/dialogs/BatchReplaceDialog.vue index 6c7c81f9..44b0d0b8 100644 --- a/src/views/desktop/transactions/list/dialogs/ReplaceInvalidItemDialog.vue +++ b/src/views/desktop/transactions/list/dialogs/BatchReplaceDialog.vue @@ -3,16 +3,21 @@ - + - + - + - +
- {{ $t('OK') }} + {{ $t('OK') }} {{ $t('Cancel') }}
@@ -198,6 +203,7 @@ export default { data() { return { showState: false, + mode: '', type: '', invalidItems: [], sourceItem: null, @@ -264,9 +270,16 @@ export default { methods: { open(options) { const self = this; + self.mode = options.mode; self.type = options.type; - self.invalidItems = options.invalidItems; self.sourceItem = null; + + if (self.mode === 'batchReplace') { + self.invalidItems = null; + } else if (self.mode === 'replaceInvalidItems') { + self.invalidItems = options.invalidItems; + } + self.targetItem = null; self.showState = true; @@ -277,10 +290,16 @@ export default { }, confirm() { if (this.resolve) { - this.resolve({ - sourceItem: this.sourceItem, - targetItem: this.targetItem - }); + if (this.mode === 'batchReplace') { + this.resolve({ + targetItem: this.targetItem + }); + } else if (this.mode === 'replaceInvalidItems') { + this.resolve({ + sourceItem: this.sourceItem, + targetItem: this.targetItem + }); + } } this.showState = false; diff --git a/src/views/desktop/transactions/list/dialogs/ImportDialog.vue b/src/views/desktop/transactions/list/dialogs/ImportDialog.vue index 2dfbf6dd..860abcd3 100644 --- a/src/views/desktop/transactions/list/dialogs/ImportDialog.vue +++ b/src/views/desktop/transactions/list/dialogs/ImportDialog.vue @@ -12,6 +12,27 @@ + + + + + + {{ item.originalSourceAccountName }} - + {{allAccountsMap[item.destinationAccountId].name }}
@@ -431,14 +452,14 @@ - +