diff --git a/src/pages/statistic/accounts/accountDealAnalysis/index.vue b/src/pages/statistic/accounts/accountDealAnalysis/index.vue index 7ab07f2..20f0cd7 100644 --- a/src/pages/statistic/accounts/accountDealAnalysis/index.vue +++ b/src/pages/statistic/accounts/accountDealAnalysis/index.vue @@ -75,14 +75,14 @@
- +
投资盈利
{{ account.investIncome}}元
- +
投资亏损
{{ account.investOutcome }}元
@@ -107,14 +107,14 @@
- +
手续费利息合计
{{ account.notDailyExpenses}}元
- +
POS机手续费
{{ account.posExpenses }}元
diff --git a/src/pages/statistic/accounts/accountsBalance/index.vue b/src/pages/statistic/accounts/accountsBalance/index.vue index 8907405..b9b6738 100644 --- a/src/pages/statistic/accounts/accountsBalance/index.vue +++ b/src/pages/statistic/accounts/accountsBalance/index.vue @@ -26,14 +26,14 @@
- +
信用卡余额
{{ accountsBalance.creditBalance }}元
- +
投资账户余额
{{ accountsBalance.investBalance }}元
diff --git a/src/pages/statistic/accounts/creditCardDealAnalysis/index.vue b/src/pages/statistic/accounts/creditCardDealAnalysis/index.vue index 70926f2..589229d 100644 --- a/src/pages/statistic/accounts/creditCardDealAnalysis/index.vue +++ b/src/pages/statistic/accounts/creditCardDealAnalysis/index.vue @@ -83,14 +83,14 @@
- +
支出金额
{{ account.expenses}}元
- +
收入笔数
{{ account.incomeCount }}笔
@@ -115,14 +115,14 @@
- +
真实消费支出
{{ account.realExpenses}}元
- +
POS刷卡笔数
{{ account.posExpensesCount }}笔
diff --git a/src/pages/statistic/accounts/dailyExpensesAnalysis/index.vue b/src/pages/statistic/accounts/dailyExpensesAnalysis/index.vue index 920ec8d..5600575 100644 --- a/src/pages/statistic/accounts/dailyExpensesAnalysis/index.vue +++ b/src/pages/statistic/accounts/dailyExpensesAnalysis/index.vue @@ -83,14 +83,14 @@
- +
{{ account.top2Name }}
{{ account.top2 }}元
- +
{{ account.top3Name }}
{{ account.top3 }}元
@@ -99,14 +99,14 @@
- +
{{ account.top4Name }}
{{ account.top4 }}元
- +
{{ account.top5Name }}
{{ account.top5 }}元
@@ -115,14 +115,14 @@
- +
{{ account.top6Name }}
{{ account.top6 }}元
- +
{{ account.top7Name }}
{{ account.top7 }}元
@@ -131,14 +131,14 @@
- +
{{ account.top8Name }}
{{ account.top8 }}元
- +
{{ account.top9Name }}
{{ account.top9 }}元
@@ -147,14 +147,14 @@
- +
{{ account.top10Name }}
{{ account.top10 }}元
- +
{{ account.top11Name }}
{{ account.top11 }}元
@@ -163,14 +163,14 @@
- +
{{ account.top12Name }}
{{ account.top12 }}元
- +
{{ account.top13Name }}
{{ account.top13 }}元
@@ -179,14 +179,14 @@
- +
{{ account.top14Name }}
{{ account.top14 }}元
- +
{{ account.top15Name }}
{{ account.top15 }}元
diff --git a/src/pages/statistic/accounts/debitDealAnalysis/index.vue b/src/pages/statistic/accounts/debitDealAnalysis/index.vue index 9799ecf..820b460 100644 --- a/src/pages/statistic/accounts/debitDealAnalysis/index.vue +++ b/src/pages/statistic/accounts/debitDealAnalysis/index.vue @@ -83,14 +83,14 @@
- +
支出金额
{{ account.expenses}}元
- +
收入笔数
{{ account.incomeCount }}笔
@@ -115,14 +115,14 @@
- +
真实消费支出
{{ account.realExpenses}}元
- +
POS收入笔数
{{ account.posIncomeCount }}笔
diff --git a/src/pages/statistic/accounts/investDealAnalysis/index.vue b/src/pages/statistic/accounts/investDealAnalysis/index.vue index a327fa1..a982c3b 100644 --- a/src/pages/statistic/accounts/investDealAnalysis/index.vue +++ b/src/pages/statistic/accounts/investDealAnalysis/index.vue @@ -76,21 +76,38 @@
-
盈利金额
-
{{ account.income }}元
+
交易笔数
+
{{ account.expensesCount+account.incomeCount}}笔
- +
-
亏损金额
-
{{ account.expenses}}元
+
交易次数
+
{{ account.count }}次
- + +
+
平均收益
+
{{ account.average }}元
+
+
+
+
+ +
+ +
+
盈利金额
+
{{ account.income }}元
+
+
+
+
盈利笔数
{{ account.incomeCount }}笔
@@ -100,9 +117,16 @@
+
+
亏损金额
+
{{ account.expenses}}元
+
+
+
+
亏损笔数
-
{{ account.expensesCount}}笔
+
{{ account.expensesCount}}元
@@ -237,6 +261,12 @@ function searchSubmit() { function getList() { getAcccountsDealAnalysis({...queryParams.value }).then(res => { account.value = { ...res.data } + account.value.count = res.data.tableAccountsList.length + if (res.data.tableAccountsList.length > 0) { + account.value.average = parseFloat(account.value.amount / res.data.tableAccountsList.length).toFixed(2) + } else { + account.value.average = 0 + } listData.value = listData.value.concat(res.data.tableAccountsList) }).catch(() => { }) diff --git a/src/pages/statistic/accounts/posAnalysis/index.vue b/src/pages/statistic/accounts/posAnalysis/index.vue index 8330611..e5ebbf8 100644 --- a/src/pages/statistic/accounts/posAnalysis/index.vue +++ b/src/pages/statistic/accounts/posAnalysis/index.vue @@ -83,14 +83,14 @@
- +
入账金额
{{ pos.actualAmount }}元
- +
刷卡次数
{{ pos.count }}次
diff --git a/src/pages/statistic/bill/creditBillAnalysis/index.vue b/src/pages/statistic/bill/creditBillAnalysis/index.vue index 9c097a5..ba9db3f 100644 --- a/src/pages/statistic/bill/creditBillAnalysis/index.vue +++ b/src/pages/statistic/bill/creditBillAnalysis/index.vue @@ -84,14 +84,14 @@
- +
已用额度
{{ creditObj.creditBalance}}元
- +
可用额度
{{ creditObj.creditAvailableLimit }}元
@@ -100,14 +100,14 @@
- +
信用卡总数
{{ creditObj.creditCardCount}}张
- +
月平均账单金额
{{ creditObj.averageCreditBill }}元
@@ -116,7 +116,7 @@
- +
累计账单金额
{{ creditObj.actualCreditBill}}元
diff --git a/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue b/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue index 696c227..49bfdf0 100644 --- a/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue +++ b/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue @@ -84,14 +84,14 @@
- +
当期应还金额
{{ historyObj.dueDetail}}元
- +
当期已还金额
{{ historyObj.repaidDetail }}元
diff --git a/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue b/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue index 6d1c381..088096d 100644 --- a/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue +++ b/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue @@ -84,14 +84,14 @@
- +
已结清（本金）
{{ historyObj.clearedPrincipal}}元
- +
已结清利息
{{ historyObj.totalInterest }}元
diff --git a/src/pages/statistic/bill/creditRecordAnalysis/index.vue b/src/pages/statistic/bill/creditRecordAnalysis/index.vue index 8651e34..d37d3a6 100644 --- a/src/pages/statistic/bill/creditRecordAnalysis/index.vue +++ b/src/pages/statistic/bill/creditRecordAnalysis/index.vue @@ -75,14 +75,14 @@
- +
近3月硬查询
{{ creditRecord.lastThreeMonths}}次
- +
近6月硬查询
{{ creditRecord.lastSixMonths }}次
@@ -107,14 +107,14 @@
- +
近6月个人查询
{{ creditRecord.lastSixMonthPersonalCount}}次
- +
个人查询总数
{{ creditRecord.totalPersonalCount }}次
diff --git a/src/pages/statistic/bill/futuresAnalysis/index.vue b/src/pages/statistic/bill/futuresAnalysis/index.vue index f9fdeba..c65b582 100644 --- a/src/pages/statistic/bill/futuresAnalysis/index.vue +++ b/src/pages/statistic/bill/futuresAnalysis/index.vue @@ -84,14 +84,14 @@
- +
最大收益
{{ futuresStock.maxRevenue}}元
- +
最大亏损
{{ futuresStock.maxLoss }}元
diff --git a/src/pages/statistic/bill/investAnalysis/index.vue b/src/pages/statistic/bill/investAnalysis/index.vue index 4655158..ea44721 100644 --- a/src/pages/statistic/bill/investAnalysis/index.vue +++ b/src/pages/statistic/bill/investAnalysis/index.vue @@ -76,14 +76,14 @@
- +
股票累计收益
{{ futuresStock.accumulateStocks}}元
- +
最大收益
{{ futuresStock.maxRevenue }}元
@@ -92,7 +92,7 @@
- +
最大亏损
{{ futuresStock.maxLoss}}元
diff --git a/src/pages/statistic/bill/onlineLendAnalysis/index.vue b/src/pages/statistic/bill/onlineLendAnalysis/index.vue index 191f635..473bc0c 100644 --- a/src/pages/statistic/bill/onlineLendAnalysis/index.vue +++ b/src/pages/statistic/bill/onlineLendAnalysis/index.vue @@ -84,14 +84,14 @@
- +
当期应还金额
{{ historyObj.dueDetail}}元
- +
当期已还金额
{{ historyObj.repaidDetail }}元
diff --git a/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue b/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue index e845da0..0936f00 100644 --- a/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue +++ b/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue @@ -84,14 +84,14 @@
- +
已结清（本金）
{{ historyObj.clearedPrincipal}}元
- +
已结清利息
{{ historyObj.totalInterest }}元
diff --git a/src/pages/statistic/bill/stocksAnalysis/index.vue b/src/pages/statistic/bill/stocksAnalysis/index.vue index cca5ae4..9d738e4 100644 --- a/src/pages/statistic/bill/stocksAnalysis/index.vue +++ b/src/pages/statistic/bill/stocksAnalysis/index.vue @@ -84,14 +84,14 @@
- +
最大收益
{{ futuresStock.maxRevenue}}元
- +
最大亏损
{{ futuresStock.maxLoss }}元
diff --git a/src/pages/work/accounts/posTransferRecord/list.vue b/src/pages/work/accounts/posTransferRecord/list.vue index 321737b..0ca18af 100644 --- a/src/pages/work/accounts/posTransferRecord/list.vue +++ b/src/pages/work/accounts/posTransferRecord/list.vue @@ -1,6 +1,13 @@ @@ -141,6 +150,8 @@ const settingColumns = ref([]) const timeShow= ref(false) const showAccount = ref(false) const accountList = ref([]) +const showCreditCard = ref(false) +const bankCardLendList = ref([]) const flag= ref(true) const time =ref( Number(new Date())) const data = reactive({ @@ -151,6 +162,12 @@ const data = reactive({ type: '6', pageSize: 100 }, + queryBankCardLendParams: { + pageNum: 1, + type: '2', + status: '1', + pageSize: 100 + }, queryParams: { name: null, type: '1', @@ -161,7 +178,7 @@ const data = reactive({ dealType: null } }) -const { filterPanel, queryAccountParams, queryParams} = toRefs(data) +const { filterPanel, queryAccountParams,queryBankCardLendParams, queryParams} = toRefs(data) const windowHeight = computed(() => { uni.getSystemInfoSync().windowHeight - 50 }) @@ -187,6 +204,9 @@ function loadmore() { } } function getList() { + listAccounts(queryBankCardLendParams.value).then((response) => { + bankCardLendList.value = [response.rows] + }) listAccounts(queryAccountParams.value).then((response) => { accountList.value = [response.rows] }) @@ -249,6 +269,26 @@ function settingCancel() { } function handleAccountCancel() { showAccount.value = false + } + function handleCreditCard() { + if (bankCardLendList.value[0].length === 0) { + proxy.$refs['uToast'].show({ + message: '信用卡为空 ', type: 'warning' + }) + } else { + showCreditCard.value = true + } + } + function handleCreditCardConfirm(e) { + queryParams.value.creditCardName = e.value[0].nameCode + queryParams.value.outAccountId= e.value[0].id + showCreditCard.value = false + pageNum.value = 1 + listData.value = [] + getList() + } + function handleCreditCardCancel() { + showCreditCard.value = false } function searchBlur() { pageNum.value = 1