diff --git a/src/pages.json b/src/pages.json index 3d5c22a..20cadff 100644 --- a/src/pages.json +++ b/src/pages.json @@ -75,7 +75,7 @@ { "path": "pages/statistic/accounts/debitDealAnalysis/index", "style": { - "navigationBarTitleText": "储蓄卡收支统计" + "navigationBarTitleText": "储蓄账户统计" } }, { @@ -92,12 +92,12 @@ { "path": "pages/statistic/bill/onlineLendAnalysis/index", "style": { - "navigationBarTitleText": "网贷待还统计" + "navigationBarTitleText": "贷款待还统计" } },{ "path": "pages/statistic/bill/onlineLendSettledAnalysis/index", "style": { - "navigationBarTitleText": "网贷已还统计" + "navigationBarTitleText": "贷款已还统计" } }, { @@ -302,20 +302,20 @@ { "path": "pages/work/base/debitCard/list", "style": { - "navigationBarTitleText": "储蓄卡管理" + "navigationBarTitleText": "储蓄账户管理" } } , { "path": "pages/work/base/debitCard/details", "style": { - "navigationBarTitleText": "储蓄卡管理详情" + "navigationBarTitleText": "储蓄账户管理详情" } } , { "path": "pages/work/base/debitCard/addEdit", "style": { - "navigationBarTitleText": "储蓄卡管理" + "navigationBarTitleText": "储蓄账户管理" } } , @@ -502,20 +502,20 @@ { "path": "pages/work/bill/onlineLendHistory/list", "style": { - "navigationBarTitleText": "网贷账单" + "navigationBarTitleText": "贷款账单" } } , { "path": "pages/work/bill/onlineLendHistory/details", "style": { - "navigationBarTitleText": "网贷账单还款明细" + "navigationBarTitleText": "贷款账单还款明细" } } , { "path": "pages/work/bill/onlineLendHistory/addEdit", "style": { - "navigationBarTitleText": "网贷账单" + "navigationBarTitleText": "贷款账单" } } , @@ -535,7 +535,7 @@ { "path": "pages/work/bill/onlineLendHistory/detailsAddEdit", "style": { - "navigationBarTitleText": "网贷账单还款明细" + "navigationBarTitleText": "贷款账单还款明细" } }, { diff --git a/src/pages/index.vue b/src/pages/index.vue index 635ca0a..5b8cbef 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -42,7 +42,7 @@
-
未结清网贷本息
+
未结清贷款本息
{{ unClearedOnlineDebt }}
@@ -327,14 +327,14 @@
-
网贷账户
+
贷款账户
{{ onlineLendCount }}
-
未结清网贷本息
+
未结清贷款本息
{{ unClearedOnlineDebt }}
@@ -382,7 +382,7 @@
-
未结清网贷
+
未结清贷款
{{ unclearedOnlineDebtCount }}
@@ -392,14 +392,14 @@
-
未结清网贷本金
+
未结清贷款本金
{{ unClearedOnlineDebtPrinciple }}
-
未结清网贷利息
+
未结清贷款利息
{{ unClearedOnlineDebtInterest }}
@@ -408,14 +408,14 @@
-
已结清网贷
+
已结清贷款
{{ clearedOnlineDebtCount }}
-
已结清网贷本金
+
已结清贷款本金
{{ clearedOnlineDebtPrinciple }}
@@ -424,7 +424,7 @@
-
已结清网贷利息
+
已结清贷款利息
{{ clearedOnlineDebtInterest }}
@@ -734,18 +734,18 @@ const debitTotalBalance = ref(0) //储蓄账户余额 //借贷账户信息 const peopleLendHistory = ref(0) //人情借贷余额 const peopleLendCount = ref(0) //人情账户 -const onlineLendCount = ref(0) //网贷账户 -const unclearedOnlineDebtCount = ref(0) //未结清网贷账户数 -const unClearedOnlineDebt = ref(0) //未结清网贷本息 -const unClearedOnlineDebtPrinciple = ref(0) //未结清网贷本金 -const unClearedOnlineDebtInterest = ref(0) //未结清网贷利息 -const clearedOnlineDebtCount = ref(0) //已结清网贷账户数 -const clearedOnlineDebt = ref(0) //已结清网贷本息 -const clearedOnlineDebtPrinciple = ref(0) //已结清网贷本金 -const clearedOnlineDebtInterest = ref(0) //已结清网贷利息 -const dueOnlineDebt = ref(0) //本月应还网贷 -const repaidOnlineDebt = ref(0) //本月已还网贷 -const leftOnlineDebt = ref(0) //本月剩余应还网贷 +const onlineLendCount = ref(0) //贷款账户 +const unclearedOnlineDebtCount = ref(0) //未结清贷款账户数 +const unClearedOnlineDebt = ref(0) //未结清贷款本息 +const unClearedOnlineDebtPrinciple = ref(0) //未结清贷款本金 +const unClearedOnlineDebtInterest = ref(0) //未结清贷款利息 +const clearedOnlineDebtCount = ref(0) //已结清贷款账户数 +const clearedOnlineDebt = ref(0) //已结清贷款本息 +const clearedOnlineDebtPrinciple = ref(0) //已结清贷款本金 +const clearedOnlineDebtInterest = ref(0) //已结清贷款利息 +const dueOnlineDebt = ref(0) //本月应还贷款 +const repaidOnlineDebt = ref(0) //本月已还贷款 +const leftOnlineDebt = ref(0) //本月剩余应还贷款 //信用卡信息 const creditInstallmentHistory = ref(0) diff --git a/src/pages/statistic/accounts/accountDealAnalysis/index.vue b/src/pages/statistic/accounts/accountDealAnalysis/index.vue index 76b12c9..48699c7 100644 --- a/src/pages/statistic/accounts/accountDealAnalysis/index.vue +++ b/src/pages/statistic/accounts/accountDealAnalysis/index.vue @@ -132,7 +132,7 @@
-
网贷利息
+
贷款利息
{{ account.onLineInterest }}
diff --git a/src/pages/statistic/bill/onlineLendAnalysis/index.vue b/src/pages/statistic/bill/onlineLendAnalysis/index.vue index f30a866..191f635 100644 --- a/src/pages/statistic/bill/onlineLendAnalysis/index.vue +++ b/src/pages/statistic/bill/onlineLendAnalysis/index.vue @@ -4,7 +4,7 @@ - @@ -70,7 +70,7 @@
-
未结清网贷
+
未结清贷款
{{ historyObj.unclearedDetailCount }}
@@ -270,7 +270,7 @@ const end = `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padS function handleAccount() { if (accountList.value[0].length === 0) { proxy.$refs['uToast'].show({ - message: '网贷机构为空 ', type: 'warning' + message: '贷款机构为空 ', type: 'warning' }) } else { showAccount.value = true diff --git a/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue b/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue index 405377c..e845da0 100644 --- a/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue +++ b/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue @@ -4,7 +4,7 @@ - @@ -70,7 +70,7 @@
-
已结清网贷
+
已结清贷款
{{ historyObj.clearedCount }}
@@ -254,7 +254,7 @@ const start = dayjs(end).add(-239, 'months') function handleAccount() { if (accountList.value[0].length === 0) { proxy.$refs['uToast'].show({ - message: '网贷机构为空 ', type: 'warning' + message: '贷款机构为空 ', type: 'warning' }) } else { showAccount.value = true diff --git a/src/pages/statistic/index.vue b/src/pages/statistic/index.vue index efc62d1..b5bcc41 100644 --- a/src/pages/statistic/index.vue +++ b/src/pages/statistic/index.vue @@ -48,30 +48,30 @@ { path: '/pages/statistic/accounts/accountsBalance/index', text: '记账账户统计', icon: 'staff-filled' , permission: 'invest:accountsBalance:list' }, { path: '/pages/statistic/accounts/dailyExpensesAnalysis/index', text: '日常支出统计', icon: 'wallet' , permission: 'invest:dailyExpensesAnalysis:list' }, { path: '/pages/statistic/accounts/posAnalysis/index', text: 'POS机刷卡统计', icon: 'shop-filled' , permission: 'invest:posAnalysis:list' }, - { path: '/pages/statistic/accounts/creditCardDealAnalysis/index', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:creditCard' }, { path: '/pages/statistic/bill/creditBillAnalysis/index', text: '信用卡账单统计', icon: 'map', permission: 'invest:creditAnalysis:list' }, + { path: '/pages/statistic/accounts/creditCardDealAnalysis/index', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:creditCard' }, { path: '/pages/statistic/accounts/accountDealAnalysis/index', text: '账户收支统计', icon: 'person', permission: 'invest:accountDealAnalysis:list' }, { path: '/pages/statistic/accounts/investDealAnalysis/index', text: '投资收益统计', icon: 'arrow-down', permission: 'invest:investDealAnalysis:list' }, - { path: '/pages/statistic/bill/onlineLendAnalysis/index', text: '网贷待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list' }, + { path: '/pages/statistic/bill/onlineLendAnalysis/index', text: '贷款待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list' }, { path: '/pages/statistic/bill/creditInstallmentAnalysis/index', text: '信用卡分期待还', icon: 'map-filled', permission: 'invest:creditInstallment:list' }, { path: '/pages/statistic/bill/creditRecordAnalysis/index', text: '征信查询统计', icon: 'search', permission: 'invest:creditRecordAnalysis:list' } ]) const billGridList=ref([ // { path: '/pages/page1/page1', text: '账户总览', icon: 'person-filled', permission: 'invest:accountAnalysis:list' }, - { path: '/pages/statistic/bill/investAnalysis/index', text: '收益统计分析', icon: 'arrow-down', permission: 'invest:investAnalysis:list' }, - { path: '/pages/statistic/bill/futuresAnalysis/index', text: '期货统计分析', icon: 'settings', permission: 'invest:futuresAnalysis:list' }, - { path: '/pages/statistic/bill/stocksAnalysis/index', text: '股票统计分析', icon: 'left', permission: 'invest:stocksAnalysis:list' }, - { path: '/pages/statistic/bill/onlineLendAnalysis/index', text: '网贷待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list' }, - { path: '/pages/statistic/bill/onlineLendSettledAnalysis/index', text: '网贷已还统计', icon: 'download', permission: 'invest:onlineLendSettledAnalysis:list' }, { path: '/pages/statistic/bill/creditBillAnalysis/index', text: '信用卡账单统计', icon: 'map', permission: 'invest:creditAnalysis:list' }, { path: '/pages/statistic/bill/creditInstallmentAnalysis/index', text: '信用卡分期待还', icon: 'map-filled', permission: 'invest:creditInstallment:list' }, { path: '/pages/statistic/bill/creditInstallmentSettledAnalysis/index', text: '信用卡分期已还', icon: 'map-pin-ellipse', permission: 'invest:creditInstallmentSettledAnalysis:list' }, + { path: '/pages/statistic/bill/onlineLendAnalysis/index', text: '贷款待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list' }, + { path: '/pages/statistic/bill/onlineLendSettledAnalysis/index', text: '贷款已还统计', icon: 'download', permission: 'invest:onlineLendSettledAnalysis:list' }, + { path: '/pages/statistic/bill/investAnalysis/index', text: '收益统计分析', icon: 'arrow-down', permission: 'invest:investAnalysis:list' }, + { path: '/pages/statistic/bill/futuresAnalysis/index', text: '期货统计分析', icon: 'settings', permission: 'invest:futuresAnalysis:list' }, + { path: '/pages/statistic/bill/stocksAnalysis/index', text: '股票统计分析', icon: 'left', permission: 'invest:stocksAnalysis:list' }, { path: '/pages/statistic/bill/creditRecordAnalysis/index', text: '征信查询统计', icon: 'search', permission: 'invest:creditRecordAnalysis:list' } ]) const accountGridList=ref([ { path: '/pages/statistic/accounts/accountsBalance/index', text: '记账账户统计', icon: 'staff-filled' , permission: 'invest:accountsBalance:list' }, { path: '/pages/statistic/accounts/posAnalysis/index', text: 'POS机刷卡统计', icon: 'shop-filled' , permission: 'invest:posAnalysis:list' }, - { path: '/pages/statistic/accounts/debitDealAnalysis/index', text: '储蓄卡收支统计', icon: 'wallet-filled', permission: 'invest:accountDealRecord:list' }, + { path: '/pages/statistic/accounts/debitDealAnalysis/index', text: '储蓄账户统计', icon: 'wallet-filled', permission: 'invest:accountDealRecord:list' }, { path: '/pages/statistic/accounts/creditCardDealAnalysis/index', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:creditCard' }, { path: '/pages/statistic/accounts/investDealAnalysis/index', text: '投资收益统计', icon: 'arrow-down', permission: 'invest:investDealAnalysis:list' }, { path: '/pages/statistic/accounts/accountDealAnalysis/index', text: '账户收支统计', icon: 'person', permission: 'invest:accountDealAnalysis:list' }, diff --git a/src/pages/work/accounts/accounts/commonList.vue b/src/pages/work/accounts/accounts/commonList.vue index d18b99a..e2d255d 100644 --- a/src/pages/work/accounts/accounts/commonList.vue +++ b/src/pages/work/accounts/accounts/commonList.vue @@ -19,7 +19,7 @@ 账户状态 - {{ item.dictLabel }} @@ -46,6 +46,10 @@ 储蓄账户类型: {{ dictStr(item.debitType, debitType) }} + + 账户状态: + {{ dictStr(item.status, accountStatus) }} + @@ -71,7 +75,7 @@ const isShow = ref(false) const status = ref('loadmore') const accountType = ref([]) const debitType = ref([]) -const accountState= ref([]) +const accountStatus= ref([]) const showAccount = ref(false) const accountList = ref([]) const settingPickShow = ref(false) @@ -135,8 +139,8 @@ function getDict() { }) // 类型 - getDicts('account_state').then(res => { - accountState.value = res.data + getDicts('account_status').then(res => { + accountStatus.value = res.data }) // 类型 getDicts('debit_type').then(res => { @@ -173,7 +177,7 @@ function selectType(item) { } function selectStatus(item) { queryParams.value.state = item.dictValue - accountState.value.map(ele => { + accountStatus.value.map(ele => { if (ele.dictValue == item.dictValue) { ele.selected = true Reflect.set(ele, 'selected', true) @@ -221,7 +225,7 @@ function selectType(item) { accountType.value.map(ele => { Reflect.set(ele, 'selected', false) }) - accountState.value.map(ele => { + accountStatus.value.map(ele => { Reflect.set(ele, 'selected', false) }) } diff --git a/src/pages/work/accounts/accounts/details.vue b/src/pages/work/accounts/accounts/details.vue index d1b7ea9..6fdc4b6 100644 --- a/src/pages/work/accounts/accounts/details.vue +++ b/src/pages/work/accounts/accounts/details.vue @@ -17,7 +17,7 @@ - + @@ -48,8 +48,8 @@ onLoad((option) => { detailInfo.value.type=dictStr(detailInfo.value.type, result.data) }) // 类型 - getDicts('account_state').then(result => { - detailInfo.value.state=dictStr(detailInfo.value.state, result.data) + getDicts('account_status').then(result => { + detailInfo.value.status=dictStr(detailInfo.value.status, result.data) }) // 类型 getDicts('debit_type').then(result => { diff --git a/src/pages/work/accounts/accounts/list.vue b/src/pages/work/accounts/accounts/list.vue index 199fab1..e75b494 100644 --- a/src/pages/work/accounts/accounts/list.vue +++ b/src/pages/work/accounts/accounts/list.vue @@ -19,7 +19,7 @@ 账户状态 - {{ item.dictLabel }} @@ -73,7 +73,7 @@ 账户状态: - {{ dictStr(item.state, accountState) }} + {{ dictStr(item.status, accountStatus) }} 备注: @@ -110,7 +110,7 @@ const isShow = ref(false) const status = ref('loadmore') const accountType = ref([]) const debitType = ref([]) -const accountState= ref([]) +const accountStatus= ref([]) const showAccount = ref(false) const accountList = ref([]) const settingPickShow = ref(false) @@ -174,8 +174,8 @@ function getDict() { }) // 类型 - getDicts('account_state').then(res => { - accountState.value = res.data + getDicts('account_status').then(res => { + accountStatus.value = res.data }) // 类型 getDicts('debit_type').then(res => { @@ -211,8 +211,8 @@ function selectType(item) { }) } function selectStatus(item) { - queryParams.value.state = item.dictValue - accountState.value.map(ele => { + queryParams.value.status = item.dictValue + accountStatus.value.map(ele => { if (ele.dictValue == item.dictValue) { ele.selected = true Reflect.set(ele, 'selected', true) diff --git a/src/pages/work/bill/onlineLendHistory/addEdit.vue b/src/pages/work/bill/onlineLendHistory/addEdit.vue index 759d761..d73154a 100644 --- a/src/pages/work/bill/onlineLendHistory/addEdit.vue +++ b/src/pages/work/bill/onlineLendHistory/addEdit.vue @@ -3,7 +3,7 @@ @@ -11,8 +11,8 @@ - - + @@ -104,7 +104,7 @@ const datePickShow = ref(false) const closeDatePickShow = ref(false) const showTeam = ref(false) const showOnlineLend = ref(false) -const title = ref("网贷账单") +const title = ref("贷款账单") const bankCardLendList = ref([]) const settleStateList = ref([]) const data = reactive({ @@ -139,7 +139,7 @@ const data = reactive({ pageSize: 1000 }, rules: { - onlineLendName: [{ type: 'string', required: true, message: '网贷机构不能为空', trigger: ['change', 'blur'] }], + onlineLendName: [{ type: 'string', required: true, message: '贷款机构不能为空', trigger: ['change', 'blur'] }], billDate: [{ type: 'string', required: true, message: '借款日期不能为空', trigger: ['change', 'blur'] }], settleStateName: [{ type: 'string', required: true, message: '结清状态不能为空', trigger: ['change', 'blur'] }], installmentAmount: [{ type: 'number', required: true, message: '借款金额不能为空', trigger: ['change', 'blur'] }], @@ -154,9 +154,9 @@ const { form, queryBankCardLendParams, 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() }) @@ -213,7 +213,7 @@ onLoad((option) => { function handleOnlineLend() { if (bankCardLendList.value[0].length === 0) { proxy.$refs['uToast'].show({ - message: '网贷机构为空 ', type: 'warning' + message: '贷款机构为空 ', type: 'warning' }) } else { showOnlineLend.value = true diff --git a/src/pages/work/bill/onlineLendHistory/detailsAddEdit.vue b/src/pages/work/bill/onlineLendHistory/detailsAddEdit.vue index 9832b68..3949abe 100644 --- a/src/pages/work/bill/onlineLendHistory/detailsAddEdit.vue +++ b/src/pages/work/bill/onlineLendHistory/detailsAddEdit.vue @@ -3,7 +3,7 @@ @@ -75,7 +75,7 @@ import { import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue"; const datePickShow = ref(false) const showTeam = ref(false) -const title = ref("网贷账单还款明细") +const title = ref("贷款账单还款明细") const postingStateList = ref([]) const data = reactive({ form: {}, @@ -94,9 +94,9 @@ onLoad((option) => { form.value.installmentHistoryId = option.installmentHistoryId form.value.name = option.name if(form.value.id!=null){ - title.value="网贷账单还款明细-修改" + title.value="贷款账单还款明细-修改" }else{ - title.value="网贷账单还款明细-新增" + title.value="贷款账单还款明细-新增" } getDict() }) diff --git a/src/pages/work/bill/onlineLendHistory/list.vue b/src/pages/work/bill/onlineLendHistory/list.vue index 2400520..458e622 100644 --- a/src/pages/work/bill/onlineLendHistory/list.vue +++ b/src/pages/work/bill/onlineLendHistory/list.vue @@ -2,7 +2,7 @@ -