From 3a2f299e58f0e87a853881e3354310273f202ea1 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Tue, 19 May 2026 09:30:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E8=B4=A6=E5=8F=B7=E7=9B=B8=E5=85=B3=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=A4=E6=98=93=E6=98=8E=E7=BB=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/invest/accounts/index.vue | 15 ++-- src/views/invest/creditcard/index.vue | 110 ++++++++++++++++++++++- src/views/invest/debitcard/index.vue | 110 ++++++++++++++++++++++- src/views/invest/financials/index.vue | 109 ++++++++++++++++++++++- src/views/invest/futures/index.vue | 109 ++++++++++++++++++++++- src/views/invest/lend/index.vue | 107 ++++++++++++++++++++++ src/views/invest/posmachine/index.vue | 122 +++++++++++++++++++++++++- src/views/invest/stocks/index.vue | 109 ++++++++++++++++++++++- 8 files changed, 777 insertions(+), 14 deletions(-) diff --git a/src/views/invest/accounts/index.vue b/src/views/invest/accounts/index.vue index d0d8080..2d3a4a4 100644 --- a/src/views/invest/accounts/index.vue +++ b/src/views/invest/accounts/index.vue @@ -149,20 +149,21 @@ - + - + - + - + + @@ -266,7 +267,7 @@ const operateList = ref([ { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:accounts:query'] }, { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:accounts:edit'] }, // { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:accounts:remove'] }, - { id: 'dealRecord', icon: 'Tickets', title: '交易记录', hasPermi: ['invest:accounts:query'] }, + { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:accounts:query'] }, { id: 'transDeal', icon: 'Cellphone', title: '转账记录', hasPermi: ['invest:accounts:query'] } ]) const data = reactive({ @@ -465,13 +466,13 @@ function handleExport() { ) } -/** 历史数据按钮操作 */ +/** 交易明细按钮操作 */ function handleDealRecord(row) { const _id = row.id || ids.value queryDealRecordParams.value.time = '' queryDealRecordParams.value.dealType = '' queryDealRecordParams.value.dealCategory = '' - titleDealRecord.value = row.nameCode + '历史交易记录' + titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细` currentAccountId.value = _id getDealRecordList(1) openDealRecord.value = true diff --git a/src/views/invest/creditcard/index.vue b/src/views/invest/creditcard/index.vue index 585e687..d2cb8b1 100644 --- a/src/views/invest/creditcard/index.vue +++ b/src/views/invest/creditcard/index.vue @@ -73,7 +73,7 @@ - + @@ -272,11 +312,14 @@ import { listBankcardLend, getBankcardLend, delBankcardLend, addBankcardLend, updateBankcardLend } from '@/api/invest/bankcardlend' import { listLimitHistory, getLimitHistory, delLimitHistory, addLimitHistory, updateLimitHistory } from '@/api/invest/limitHistory' import { listBankBaseInfo } from '@/api/invest/bankBaseInfo' +import { listAccountDealRecord } from '@/api/invest/accountDealRecord' +import dayjs from 'dayjs' // eslint-disable-next-line no-unused-vars import { require } from '@/utils/require' const { proxy } = getCurrentInstance() const { is_zero_bill, is_next_bill_date, account_status, card_tier } = proxy.useDict('is_zero_bill', 'is_next_bill_date', 'account_status', 'card_tier') const { limit_history_type, adjust_type } = proxy.useDict('limit_history_type', 'adjust_type') +const { deal_type, deal_category } = proxy.useDict('deal_type', 'deal_category') const bankcardList = ref([]) const open = ref(false) const loading = ref(true) @@ -286,6 +329,19 @@ const single = ref(true) const multiple = ref(true) const total = ref(0) const title = ref('') +const titleDealRecord = ref('') +const openDealRecord = ref(false) +const currentAccountId = ref('') +const loadingDealRecord = ref(false) +const tableDealRecordData = ref([]) +const dealRecordTotal = ref(0) +const queryDealRecordParams = ref({ + time: '', + dealType: null, + dealCategory: null, + pageNum: 1, + pageSize: 10 +}) const detailOpen = ref(false) const openDetail = ref(false) @@ -297,6 +353,7 @@ const bankList = ref([]) const operateList = ref([ { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:bankcard:query'] }, + { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:bankcard:query'] }, { id: 'limit', icon: 'Grid', title: '调额记录', hasPermi: ['invest:bankcard:edit'] }, { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:bankcard:edit'] }, { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:bankcard:remove'] } @@ -339,6 +396,9 @@ const data = reactive({ const handleOperate = (operate, row) => { switch (operate) { + case 'dealRecord': + handleDealRecord(row) + break case 'limit': handleDetail(row) break @@ -474,6 +534,54 @@ function handleDetail(row) { }) } +/** 交易明细按钮操作 */ +function handleDealRecord(row) { + queryDealRecordParams.value.time = '' + queryDealRecordParams.value.dealType = '' + queryDealRecordParams.value.dealCategory = '' + titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细` + currentAccountId.value = row.id || ids.value + getDealRecordList(1) + openDealRecord.value = true +} + +const handleCurrentDealRecordChange = (num) => { + getDealRecordList(num) +} + +const handleDealRecordQuery = () => { + getDealRecordList(1) +} + +const resetDealRecordQuery = () => { + proxy.resetForm('queryDealRecordRef') + queryDealRecordParams.value.time = '' + queryDealRecordParams.value.dealType = '' + queryDealRecordParams.value.dealCategory = '' + dealRecordTotal.value = 0 + getDealRecordList(1) +} + +const getDealRecordList = (num) => { + loadingDealRecord.value = true + const timeRange = queryDealRecordParams.value.time + let st = '' + let et = '' + if (timeRange && timeRange.length === 2) { + st = dayjs(timeRange[0]).format('YYYY-MM-DD') + et = dayjs(timeRange[1]).format('YYYY-MM-DD') + } + queryDealRecordParams.value.startTime = st + queryDealRecordParams.value.endTime = et + queryDealRecordParams.value.pageNum = num + queryDealRecordParams.value.accountId = currentAccountId.value + listAccountDealRecord(queryDealRecordParams.value).then((response) => { + loadingDealRecord.value = false + tableDealRecordData.value = response.rows + dealRecordTotal.value = response.total + }) +} + /** 查询信用卡信息列表 */ function getList() { loading.value = true diff --git a/src/views/invest/debitcard/index.vue b/src/views/invest/debitcard/index.vue index 5da60ee..cac5bf7 100644 --- a/src/views/invest/debitcard/index.vue +++ b/src/views/invest/debitcard/index.vue @@ -72,7 +72,7 @@ - + @@ -231,11 +271,14 @@ import { listBankcardLend, getBankcardLend, delBankcardLend, addBankcardLend, updateBankcardLend } from '@/api/invest/bankcardlend' import { listLimitHistory, getLimitHistory, delLimitHistory, addLimitHistory, updateLimitHistory } from '@/api/invest/limitHistory' import { listBankBaseInfo } from '@/api/invest/bankBaseInfo' +import { listAccountDealRecord } from '@/api/invest/accountDealRecord' +import dayjs from 'dayjs' // eslint-disable-next-line no-unused-vars import { require } from '@/utils/require' const { proxy } = getCurrentInstance() const { bank_card_type, debit_type, account_status, card_tier } = proxy.useDict('bank_card_type', 'debit_type', 'account_status', 'card_tier') const { limit_history_type, adjust_type } = proxy.useDict('limit_history_type', 'adjust_type') +const { deal_type, deal_category } = proxy.useDict('deal_type', 'deal_category') const bankcardList = ref([]) const open = ref(false) const loading = ref(true) @@ -245,6 +288,19 @@ const single = ref(true) const multiple = ref(true) const total = ref(0) const title = ref('') +const titleDealRecord = ref('') +const openDealRecord = ref(false) +const currentAccountId = ref('') +const loadingDealRecord = ref(false) +const tableDealRecordData = ref([]) +const dealRecordTotal = ref(0) +const queryDealRecordParams = ref({ + time: '', + dealType: null, + dealCategory: null, + pageNum: 1, + pageSize: 10 +}) const detailOpen = ref(false) const openDetail = ref(false) @@ -256,6 +312,7 @@ const bankList = ref([]) const operateList = ref([ { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:bankcard:query'] }, + { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:bankcard:query'] }, { id: 'limit', icon: 'Grid', title: '非柜面限额记录', hasPermi: ['invest:bankcard:edit'] }, { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:bankcard:edit'] }, { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:bankcard:remove'] } @@ -295,6 +352,9 @@ const data = reactive({ const handleOperate = (operate, row) => { switch (operate) { + case 'dealRecord': + handleDealRecord(row) + break case 'limit': handleDetail(row) break @@ -429,6 +489,54 @@ function handleDetail(row) { limitHistoryList.value = response.rows }) } + +/** 交易明细按钮操作 */ +function handleDealRecord(row) { + queryDealRecordParams.value.time = '' + queryDealRecordParams.value.dealType = '' + queryDealRecordParams.value.dealCategory = '' + titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细` + currentAccountId.value = row.id || ids.value + getDealRecordList(1) + openDealRecord.value = true +} + +const handleCurrentDealRecordChange = (num) => { + getDealRecordList(num) +} + +const handleDealRecordQuery = () => { + getDealRecordList(1) +} + +const resetDealRecordQuery = () => { + proxy.resetForm('queryDealRecordRef') + queryDealRecordParams.value.time = '' + queryDealRecordParams.value.dealType = '' + queryDealRecordParams.value.dealCategory = '' + dealRecordTotal.value = 0 + getDealRecordList(1) +} + +const getDealRecordList = (num) => { + loadingDealRecord.value = true + const timeRange = queryDealRecordParams.value.time + let st = '' + let et = '' + if (timeRange && timeRange.length === 2) { + st = dayjs(timeRange[0]).format('YYYY-MM-DD') + et = dayjs(timeRange[1]).format('YYYY-MM-DD') + } + queryDealRecordParams.value.startTime = st + queryDealRecordParams.value.endTime = et + queryDealRecordParams.value.pageNum = num + queryDealRecordParams.value.accountId = currentAccountId.value + listAccountDealRecord(queryDealRecordParams.value).then((response) => { + loadingDealRecord.value = false + tableDealRecordData.value = response.rows + dealRecordTotal.value = response.total + }) +} /** 查询储蓄账户信息列表 */ function getList() { loading.value = true diff --git a/src/views/invest/financials/index.vue b/src/views/invest/financials/index.vue index 742450a..0b8a609 100644 --- a/src/views/invest/financials/index.vue +++ b/src/views/invest/financials/index.vue @@ -46,7 +46,7 @@ - + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + diff --git a/src/views/invest/stocks/index.vue b/src/views/invest/stocks/index.vue index a1ee0ad..3c39022 100644 --- a/src/views/invest/stocks/index.vue +++ b/src/views/invest/stocks/index.vue @@ -46,7 +46,7 @@ - + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + +