From c5dba286682d5d5383e9ab3a1ac4fa4216232bb3 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Wed, 24 Jul 2024 15:10:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/invest/accountAnalysis.js | 42 +- src/pages/index.vue | 885 +++++++++++------- .../accounts/accountsBalance/index.vue | 2 +- src/pages/work/base/debitCard/addEdit.vue | 26 +- src/pages/work/base/debitCard/details.vue | 8 +- src/pages/work/base/debitCard/list.vue | 8 +- src/pages/work/base/futures/addEdit.vue | 3 +- src/pages/work/base/posmachine/addEdit.vue | 3 +- src/pages/work/base/stocks/addEdit.vue | 3 +- 9 files changed, 624 insertions(+), 356 deletions(-) diff --git a/src/api/invest/accountAnalysis.js b/src/api/invest/accountAnalysis.js index 0d3852f..23a66ff 100644 --- a/src/api/invest/accountAnalysis.js +++ b/src/api/invest/accountAnalysis.js @@ -1,36 +1,54 @@ import request from '@/utils/request' -// 标题--投资收益 -export function getIncomeInfo(query) { +// 账户总览--信用卡信息 +export function getCreditAccountsInfo(query) { return request({ - url: '/invest/analysis/accountAnalysis/getIncomeInfo', + url: '/invest/analysis/getCreditAccountsInfo', method: 'get', params: query }) } -// 标题--基础信息 -export function getBaseAccountInfo(query) { +// 账户总览--POS机信息 +export function getPosAccountsInfo(query) { return request({ - url: '/invest/analysis/accountAnalysis/getBaseAccountInfo', + url: '/invest/analysis/getPosAccountsInfo', method: 'get', params: query }) } -// 标题--负债信息 -export function getDebetInfo(query) { +// 账户总览--储蓄账户信息 +export function getDebitAccountsInfo(query) { return request({ - url: '/invest/analysis/accountAnalysis/getDebetInfo', + url: '/invest/analysis/getDebitAccountsInfo', method: 'get', params: query }) } -// 标题--信用卡信息 -export function getCreditInfo(query) { +// 账户总览--投资账户信息 +export function getInvestAccountsInfo(query) { return request({ - url: '/invest/analysis/accountAnalysis/getCreditInfo', + url: '/invest/analysis/getInvestAccountsInfo', + method: 'get', + params: query + }) +} + +// 账户总览--借贷账户信息 +export function getLendAccountsInfo(query) { + return request({ + url: '/invest/analysis/getLendAccountsInfo', + method: 'get', + params: query + }) +} + +// 账户总览--征信报告信息 +export function getCreditReportInfo(query) { + return request({ + url: '/invest/analysis/getCreditReportInfo', method: 'get', params: query }) diff --git a/src/pages/index.vue b/src/pages/index.vue index 6b3b9e9..78d169d 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -4,177 +4,167 @@
-
    负债信息
+
    资产总览
净资产
-
{{ netAsset }}元
+
{{ (parseFloat(debitTotalBalance)+parseFloat(investBalance)-parseFloat(unClearedOnlineDebt)-parseFloat(creditBalance)- parseFloat(peopleLendHistory)).toFixed(2) }}元
总负债
-
{{ totalDebt }}元
+
{{ (parseFloat(unClearedOnlineDebt)+ parseFloat(creditBalance)+ parseFloat(peopleLendHistory)).toFixed(2)}}元
-
-
- +
+ +
+
-
储蓄卡余额
-
{{ debetBalance }}元
+
储蓄账户余额
+
{{ debitTotalBalance }}元
-
- +
+
投资账户余额
{{ investBalance }}元
-
-
+
+
-
网贷欠款
+
未结清网贷本息
{{ unClearedOnlineDebt }}元
-
+
-
信用卡已用额度
+
人情欠款
+
{{ peopleLendHistory}}元
+
+
+
+
+
+ +
+
信用卡已使用额度
{{ creditBalance }}元
-
-
- -
-
人情欠款
-
{{ peopleLendHistory }}元
-
-
-
-
    投资收益
-
+
    储蓄账户信息
+
- -
-
投资账户余额
-
{{ investBalance }}元
-
-
-
-
总收益
-
{{ totalIncome }}元
+
I类储蓄卡
+
{{ debitICount }}张
- -
-
-
+
-
期货收益
-
{{ futuresIncome }}元
-
-
-
- -
-
股票收益
-
{{ stocksIncome }}元
+
II类储蓄卡
+
{{ debitIICount }}张
-
    网贷信息
-
-
+
+
-
当月应还款
-
{{ dueOnlineDebt }}元
+
网络账户
+
{{ debitOnlineCount }}个
+
+
+
+ +
+
储值卡
+
{{ storedValueCardCount }}张
+
+
+
+
+
+ +
+
其他账户
+
{{ otherDebitCount }}个
-
当月已还款
-
{{ repaidOnlineDebt }}元
+
储蓄账户余额
+
{{ debitTotalBalance }}元
-
-
- -
-
当月待还款
-
{{ leftOnlineDebt }}元
-
-
-
- -
-
未结清网贷笔数
-
{{ unclearedOnlineDebtCount }}笔
-
-
-
-
- -
- -
-
未结清网贷本金
-
{{ unClearedOnlineDebtPrinciple }}元
-
-
-
- -
-
未结清网贷利息
-
{{ unClearedOnlineDebtInterest }}元
-
-
-
-
-
- -
-
已结清网贷笔数
-
{{ clearedOnlineDebtCount }}笔
-
-
-
- -
-
已结清网贷本金
-
{{ clearedOnlineDebtPrinciple }}元
-
-
-
-
+
- +
-
已结清网贷利息
-
{{ clearedOnlineDebtInterest }}元
+
储蓄卡余额
+
{{ debitBalance }}元
+
+
+
+ +
+
网络账户余额
+
{{ debitOnlineBalance }}元
- -
    信用卡信息
-
+
+
+ +
+
储值卡余额
+
{{ storedValueCardBalance }}元
+
+
+
+ +
+
住房公积金余额
+
{{ housingFundBalance }}元
+
+
+
+
+ +
+ +
+
职工医保余额
+
{{ personalPensionBalance }}元
+
+
+
+ +
+
其他余额
+
{{ otherDebitBalance }}元
+
+
+
+ +
    信用卡信息
+
@@ -190,23 +180,24 @@
-
+
+
- +
已使用额度
{{ creditBalance }}元
- +
可用额度
{{ creditAvailableLimit }}元
-
+
@@ -221,118 +212,388 @@
{{ currentCreditBill }}元
+
-
+
- +
当月分期本息
{{ creditInstallment }}元
- +
-
未结清分期笔数
+
未结清分期
{{ unclearedCreditInstallmentCount }}笔
-
+
- +
未结清分期本息
{{ unclearedCreditInstallment }}元
- +
未结清分期本金
{{ unclearedCreditInstallmentPrinciple }}元
-
+
- +
未结清分期利息
{{ unclearedCreditInstallmentInterest }}元
- +
-
已结清分期笔数
+
已结清分期
{{ clearedCreditInstallmentCount }}笔
-
- +
+
- +
已结清分期本息
{{ clearedCreditInstallmentDebt }}元
- +
已结清分期本金
{{ clearedCreditInstallmentPrinciple }}元
-
-
-
- -
-
已结清分期利息
-
{{ clearedCreditInstallmentInterest }}元
-
-
-
- +
+
+ +
+
已结清分期利息
+
{{ clearedCreditInstallmentInterest }}元
+
+
+
+
上月账单使用率
{{ lastMonthUsedRate }}%
- -
-
+
+
- +
上月账单
{{ lastMonthUsedLimit }}元
- +
近6月使用率
{{ lastSixMonthUsedRate }}%
-
+
- +
近6月平均使用额度
{{ lastSixMonthUsedLimit }}元
-
    征信信息
-
+ +
    借贷账户信息
+
+
+ +
+
网贷账户
+
{{ onlineLendCount }}个
+
+
+
+ +
+
未结清网贷本息
+
{{ unClearedOnlineDebt }}元
+
+
+
+
+
+ +
+
人情账户
+
{{ peopleLendCount }}人
+
+
+
+ +
+
人情欠款
+
{{ peopleLendHistory }}元
+
+
+
+
+
+ +
+
当月应还款
+
{{ dueOnlineDebt }}元
+
+
+
+ +
+
当月已还款
+
{{ repaidOnlineDebt }}元
+
+
+
+
+
+ +
+
当月待还款
+
{{ leftOnlineDebt }}元
+
+
+
+ +
+
未结清网贷
+
{{ unclearedOnlineDebtCount }}笔
+
+
+
+
+ +
+ +
+
未结清网贷本金
+
{{ unClearedOnlineDebtPrinciple }}元
+
+
+
+ +
+
未结清网贷利息
+
{{ unClearedOnlineDebtInterest }}元
+
+
+
+
+
+ +
+
已结清网贷
+
{{ clearedOnlineDebtCount }}笔
+
+
+
+ +
+
已结清网贷本金
+
{{ clearedOnlineDebtPrinciple }}元
+
+
+
+
+
+ +
+
已结清网贷利息
+
{{ clearedOnlineDebtInterest }}元
+
+
+
+
+     POS机信息 +
+
+
+ +
+
POS机
+
{{ posCount }}台
+
+
+
+ +
+
当月刷卡次数
+
{{ currentMonthCount }}次
+
+
+
+
+ +
+ +
+
当月刷卡金额
+
{{ currentMonthAmount }}元
+
+
+
+ +
+
当月刷卡手续费
+
{{ currentMonthCommission }}元
+
+
+
+
+
+ +
+
当年刷卡次数
+
{{ currentYearCount }}次
+
+
+
+ +
+
当年刷卡金额
+
{{ currentYearAmount }}元
+
+
+ +
+
+ +
+ +
+
当年刷卡手续费
+
{{ currentYearCommission }}元
+
+
+
+ +
+
累计刷卡次数
+
{{ accumulateCount }}次
+
+
+
+
+ +
+ +
+
累计刷卡金额
+
{{ accumulateAmount }}元
+
+
+
+ +
+
累计刷卡手续费
+
{{ accumulateCommission }}元
+
+
+
+
    投资账户信息
+
+
+ +
+
股票账户
+
{{ stocksCount }}个
+
+
+
+ +
+
期货账户
+
{{ futuresCount }}个
+
+
+ +
+
+
+ +
+
投资账户余额
+
{{ investBalance }}元
+
+
+
+ +
+
本月投资收益
+
{{ currentMonthInvest }}元
+
+
+
+
+ +
+ +
+
本月投资盈利
+
{{ currentMonthIncome }}元
+
+
+
+ +
+
本月投资亏损
+
{{ currentMonthExpenses }}元
+
+
+
+
+
+ +
+
总收益
+
{{ totalIncome }}元
+
+
+
+ +
+
期货收益
+
{{ futuresIncome }}元
+
+
+
+
+
+ +
+
股票收益
+
{{ stocksIncome }}元
+
+
+
+
    征信信息
+
@@ -348,23 +609,23 @@
-
+
- +
近3月硬查询
{{ lastThreeMonths }}次
- +
近6月硬查询
{{ lastSixMonths }}次
-
+
@@ -380,211 +641,179 @@
-
+
+
- +
总硬查询
{{ lastAllYears }}次
- +
近6月个人查询
{{ lastSixMonthQueryCount }}次
-
- +
+
- +
近6月贷后管理
{{ lastSixMonthsAfterLoan }}次
- +
近2年贷后管理
{{ lastTwoYearsAfterLoan }}次
-
-
- -
-
贷后管理总数
-
{{ totalAfterLoan }}次
-
-
-
-
    基础信息
-
-
- -
-
POS机总数
-
{{ posCount }}台
-
-
-
- -
-
信用卡总数
-
{{ creditCount }}张
-
-
-
-
-
- -
-
储蓄卡总数
-
{{ debitCount }}张
-
-
-
- -
-
股票账户总数
-
{{ stocksCount }}个
-
-
-
- -
- -
- -
-
期货账户总数
-
{{ futuresCount }}个
-
-
-
- -
-
人情总数
-
{{ peopleLendCount }}人
-
-
-
-
-
- -
-
网贷总数
-
{{ onlineLendCount }}个
-
-
-
+
+
+ +
+
贷后管理总数
+
{{ totalAfterLoan }}次
+
+
+
- + - diff --git a/src/pages/statistic/accounts/accountsBalance/index.vue b/src/pages/statistic/accounts/accountsBalance/index.vue index 1bd792c..337b4d4 100644 --- a/src/pages/statistic/accounts/accountsBalance/index.vue +++ b/src/pages/statistic/accounts/accountsBalance/index.vue @@ -57,7 +57,7 @@ + :text="item.account+'：'+item.availableLimit" size="30rpx" color="#333333" > diff --git a/src/pages/work/base/debitCard/addEdit.vue b/src/pages/work/base/debitCard/addEdit.vue index c1a607d..f21c0cb 100644 --- a/src/pages/work/base/debitCard/addEdit.vue +++ b/src/pages/work/base/debitCard/addEdit.vue @@ -3,7 +3,7 @@ @@ -11,12 +11,12 @@ - - + - - + @@ -28,8 +28,8 @@ - - + @@ -81,7 +81,7 @@ import { getBankcardLend, addBankcardLend, updateBankcardLend } from '@/api/inve import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue"; const datePickShow = ref(false) const showTeam = ref(false) -const title = ref("储蓄卡管理") +const title = ref("储蓄账户管理") const debitTypeList = ref([]) const dateType = ref(1) const showStatus = ref(false) @@ -113,11 +113,11 @@ const data = reactive({ }, // dateType:'1', rules: { - name: [{ type: 'string', required: true, message: '储蓄卡名称不能为空', trigger: ['change', 'blur'] }], - code: [{ type: 'string', required: true, message: '储蓄卡卡号不能为空', trigger: ['change', 'blur'] }], + name: [{ type: 'string', required: true, message: '储蓄账户名称不能为空', trigger: ['change', 'blur'] }], + code: [{ type: 'string', required: true, message: '储蓄账户卡号不能为空', trigger: ['change', 'blur'] }], balance: [{ type: 'number', required: true, message: '余额不能为空', trigger: ['change', 'blur'] }], statusName: [{ type: 'string', required: true, message: '账户状态不能为空', trigger: ['change', 'blur'] }], - debitTypeName: [{ type: 'string', required: true, message: '储蓄卡类型不能为空', trigger: ['change', 'blur'] }], + debitTypeName: [{ type: 'string', required: true, message: '储蓄账户类型不能为空', trigger: ['change', 'blur'] }], } }) const { form, rules} = toRefs(data) @@ -125,9 +125,9 @@ const { form, rules} = toRefs(data) onLoad((option) => { form.value.id = option.id if(form.value.id!=null){ - title.value="储蓄卡管理-修改" + title.value="储蓄账户管理-修改" }else{ - title.value="储蓄卡管理-新增" + title.value="储蓄账户管理-新增" } getDict() }) diff --git a/src/pages/work/base/debitCard/details.vue b/src/pages/work/base/debitCard/details.vue index b7a9c06..43786fc 100644 --- a/src/pages/work/base/debitCard/details.vue +++ b/src/pages/work/base/debitCard/details.vue @@ -3,14 +3,14 @@ - - - + + + diff --git a/src/pages/work/base/debitCard/list.vue b/src/pages/work/base/debitCard/list.vue index 521d01f..de3e8d8 100644 --- a/src/pages/work/base/debitCard/list.vue +++ b/src/pages/work/base/debitCard/list.vue @@ -2,7 +2,7 @@ - - 储蓄卡类型 + 储蓄账户类型 {{ item.dictLabel }} @@ -34,7 +34,7 @@ :text="item.name+'-'+item.code " size="30rpx" color="#333333" :bold="true"> - 储蓄卡类型： + 储蓄账户类型： {{ dictStr(item.debitType, debitTypeList) }} @@ -42,7 +42,7 @@ {{ dictStr(item.status, statusList) }} diff --git a/src/pages/work/base/futures/addEdit.vue b/src/pages/work/base/futures/addEdit.vue index 3081296..032aa69 100644 --- a/src/pages/work/base/futures/addEdit.vue +++ b/src/pages/work/base/futures/addEdit.vue @@ -133,7 +133,8 @@ const data = reactive({ queryDebitCardParams: { pageNum: 1, type: '1', - status: '1', + debitType: '1', + status: '1', pageSize: 1000 }, // dateType:'1', diff --git a/src/pages/work/base/posmachine/addEdit.vue b/src/pages/work/base/posmachine/addEdit.vue index b4e53f5..9d9d27b 100644 --- a/src/pages/work/base/posmachine/addEdit.vue +++ b/src/pages/work/base/posmachine/addEdit.vue @@ -163,7 +163,8 @@ const data = reactive({ queryDebitCardParams: { pageNum: 1, type: '1', - status: '1', + debitType: '1', + status: '1', pageSize: 1000 }, // dateType:'1', diff --git a/src/pages/work/base/stocks/addEdit.vue b/src/pages/work/base/stocks/addEdit.vue index 9268fc7..240db05 100644 --- a/src/pages/work/base/stocks/addEdit.vue +++ b/src/pages/work/base/stocks/addEdit.vue @@ -117,7 +117,8 @@ const data = reactive({ queryDebitCardParams: { pageNum: 1, type: '1', - status: '1', + debitType: '1', + status: '1', pageSize: 1000 }, // dateType:'1',