fix: 功能优化。

This commit is contained in:
tianyongbao
2024-06-15 15:54:31 +08:00
parent 64d7e1f780
commit 8617b88f63
15 changed files with 33 additions and 41 deletions

View File

@@ -10,7 +10,7 @@
</el-form-item>
<el-form-item label="记账账户" style="width: 435px" prop="accountId">
<el-select v-model="queryParams.accountId" placeholder="请选择记账账户" clearable>
<el-option v-for="account in accountList" :key="account.id" :label="account.nameCode" :value="account.id" />
<el-option v-for="account in accountList" :key="account.id" :label="account.typeNameCodeAvailableLimit" :value="account.id" />
</el-select>
</el-form-item>
<el-form-item label="交易类型" style="width: 240px" prop="dealType">
@@ -86,7 +86,7 @@
</el-form-item>
<el-form-item label="记账账户" prop="accountId">
<el-select v-model="form.accountId" placeholder="请选择记账账户" clearable>
<el-option v-for="account in addAccountList" :key="account.id" :label="account.nameCode" :value="account.id" />
<el-option v-for="account in addAccountList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
</el-select>
</el-form-item>
<el-form-item label="交易类型" prop="dealType">

View File

@@ -200,7 +200,7 @@ const data = reactive({
queryCreditCardParams: {
pageNum: 1,
type: '2',
pageSize: 10
pageSize: 100
},
rules: {
billDate: [{ required: true, message: '账单日不能为空', trigger: 'blur' }],

View File

@@ -5,7 +5,7 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
<el-form-item label="信用卡" style="width: 480px" prop="id">
<el-select v-model="queryParams.id" placeholder="请选择信用卡" clearable>
<el-option v-for="account in accountsList" :key="account.id" :label="account.nameCode" :value="account.id" />
<el-option v-for="account in accountsList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
</el-select>
</el-form-item>
<el-form-item label="交易类型" style="width: 300px" prop="dealType">

View File

@@ -8,7 +8,7 @@
<el-option v-for="creditCard in creditCardList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
</el-select>
</el-form-item>
<el-form-item label="账户状态" prop="state">
<el-form-item label="结清状态" prop="state">
<el-select v-model="queryParams.state" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
@@ -60,7 +60,7 @@
<span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
<el-table-column label="账户状态" align="center" width="80" prop="state">
<el-table-column label="结清状态" align="center" width="80" prop="state">
<template #default="scope">
<dict-tag :options="settle_state" :value="scope.row.state" />
</template>
@@ -98,7 +98,7 @@
<el-form-item label="余额" prop="balance">
<el-input v-model="form.balance" placeholder="请输入余额" />
</el-form-item>
<el-form-item label="账户状态" prop="state">
<el-form-item label="结清状态" prop="state">
<el-select v-model="form.state" placeholder="请选择账户状态">
<el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>

View File

@@ -122,7 +122,7 @@
</el-table-column>
<el-table-column label="分期日期" align="center" prop="time" />
<el-table-column label="分期金额(本息)" align="center" prop="value" />
<el-table-column prop="detail" label="分期金额明细" width="700" v-if="queryParams.type === 2">
<el-table-column prop="detail" label="分期金额明细" width="900" v-if="queryParams.type === 2">
<template #default="scope">
<span v-html="formatMultiLineData(scope.row.detail)"></span>
</template>

View File

@@ -41,7 +41,7 @@
</div>
</div>
<div class="content-con" v-loading="loading">
<el-table v-loading="loading" :data="CreditQueryRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
<el-table v-loading="loading" :data="creditQueryRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="查询日期" align="center" prop="queryDate" width="150">
<template #default="scope">
@@ -153,7 +153,7 @@ import { require } from '@/utils/require'
const { proxy } = getCurrentInstance()
const { credit_report_type, credit_query_type } = proxy.useDict('credit_report_type', 'credit_query_type')
const CreditQueryRecordList = ref([])
const creditQueryRecordList = ref([])
const open = ref(false)
const openAnalysis = ref(false)
const loading = ref(true)
@@ -221,7 +221,7 @@ function getInstitutionList() {
function getList() {
loading.value = true
listCreditQueryRecord(queryParams.value).then((response) => {
CreditQueryRecordList.value = response.rows
creditQueryRecordList.value = response.rows
total.value = response.total
loading.value = false
})

View File

@@ -5,7 +5,7 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="信用卡" style="width: 500px" prop="inAccountId">
<el-select v-model="queryParams.inAccountId" placeholder="请选择信用卡" clearable>
<el-option v-for="bankCardLend in creditCardList" :key="bankCardLend.id" :label="bankCardLend.nameCode" :value="bankCardLend.id" />
<el-option v-for="bankCardLend in creditCardList" :key="bankCardLend.id" :label="bankCardLend.nameCodeAvailableLimit" :value="bankCardLend.id" />
</el-select>
</el-form-item>
<el-form-item label="还款时间" prop="time">
@@ -67,12 +67,12 @@
<el-form ref="accountsTransferRecordRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="储蓄卡" prop="outAccountId">
<el-select v-model="form.outAccountId" placeholder="请选择储蓄卡" clearable>
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
</el-select>
</el-form-item>
<el-form-item label="信用卡" prop="inAccountId">
<el-select v-model="form.inAccountId" placeholder="请选择信用卡" clearable>
<el-option v-for="creditCard in creditCardList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
<el-option v-for="creditCard in creditCardList" :key="creditCard.id" :label="creditCard.nameCodeAvailableLimit" :value="creditCard.id" />
</el-select>
</el-form-item>
<el-form-item label="还款时间" prop="createTime">

View File

@@ -5,7 +5,7 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
<el-form-item label="储蓄账户" style="width: 480px" prop="id">
<el-select v-model="queryParams.id" placeholder="请选择储蓄账户" clearable>
<el-option v-for="account in accountsList" :key="account.id" :label="account.nameCode" :value="account.id" />
<el-option v-for="account in accountsList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
</el-select>
</el-form-item>
<el-form-item label="交易类型" style="width: 300px" prop="dealType">

View File

@@ -5,12 +5,12 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="转出账户" style="width: 500px" prop="outAccountId">
<el-select v-model="queryParams.outAccountId" placeholder="请选择转出账户" clearable>
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
</el-select>
</el-form-item>
<el-form-item label="转入账户" style="width: 500px" prop="inAccountId">
<el-select v-model="queryParams.inAccountId" placeholder="请选择转入账户" clearable>
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
</el-select>
</el-form-item>
<el-form-item label="转账时间" prop="time">
@@ -62,12 +62,12 @@
<el-form ref="accountsTransferRecordRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="转出账户" prop="outAccountId">
<el-select v-model="form.outAccountId" placeholder="请选择转出账户" clearable>
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
</el-select>
</el-form-item>
<el-form-item label="转入账户" prop="inAccountId">
<el-select v-model="form.inAccountId" placeholder="请选择转入账户" clearable>
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
<el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
</el-select>
</el-form-item>
<el-form-item label="转账时间" prop="createTime">

View File

@@ -5,7 +5,7 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="投资账户" style="width: 500px" prop="accountId">
<el-select v-model="queryParams.accountId" placeholder="请选择投资账户" clearable>
<el-option v-for="account in accountList" :key="account.id" :label="account.nameCode" :value="account.id" />
<el-option v-for="account in accountList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
</el-select>
</el-form-item>
<el-form-item label="交易类型" style="width: 300px" prop="dealType">
@@ -61,7 +61,7 @@
<el-form ref="accountDealRecordRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="投资账户" prop="accountId">
<el-select v-model="form.accountId" placeholder="请选择投资账户" clearable>
<el-option v-for="account in accountList" :key="account.id" :label="account.nameCode" :value="account.id" />
<el-option v-for="account in accountList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
</el-select>
</el-form-item>
<el-form-item label="交易类型" prop="dealType">

View File

@@ -5,7 +5,7 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
<el-form-item label="投资账户" style="width: 480px" prop="id">
<el-select v-model="queryParams.id" placeholder="请选择投资账户" clearable>
<el-option v-for="account in accountsList" :key="account.id" :label="account.nameCode" :value="account.id" />
<el-option v-for="account in accountsList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
</el-select>
</el-form-item>
<el-form-item label="" style="width: 100px" prop="type">

View File

@@ -5,12 +5,12 @@
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="转入账户" style="width: 500px" prop="inAccountId">
<el-select v-model="queryParams.inAccountId" placeholder="请选择转入账户" clearable>
<el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCode" :value="lend.id" />
<el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCodeAvailableLimit" :value="lend.id" />
</el-select>
</el-form-item>
<el-form-item label="转出账户" style="width: 500px" prop="outAccountId">
<el-select v-model="queryParams.outAccountId" placeholder="请选择转出账户" clearable>
<el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCode" :value="lend.id" />
<el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCodeAvailableLimit" :value="lend.id" />
</el-select>
</el-form-item>
<el-form-item label="借贷时间" prop="time">
@@ -68,12 +68,12 @@
<el-form ref="accountsTransferRecordRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="借贷账户" prop="outAccountId">
<el-select v-model="form.outAccountId" placeholder="请选择借贷账户" clearable>
<el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCode" :value="lend.id" />
<el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCodeAvailableLimit" :value="lend.id" />
</el-select>
</el-form-item>
<el-form-item label="储蓄卡" prop="inAccountId">
<el-select v-model="form.inAccountId" placeholder="请选择储蓄卡" clearable>
<el-option v-for="debit in debitCardList" :key="debit.id" :label="debit.nameCode" :value="debit.id" />
<el-option v-for="debit in debitCardList" :key="debit.id" :label="debit.nameCodeAvailableLimit" :value="debit.id" />
</el-select>
</el-form-item>
<el-form-item label="交易类型" prop="dealType">

View File

@@ -8,7 +8,7 @@
<el-option v-for="creditCard in creditCardList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
</el-select>
</el-form-item>
<el-form-item label="账户状态" prop="state">
<el-form-item label="结清状态" prop="state">
<el-select v-model="queryParams.state" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
@@ -60,7 +60,7 @@
<span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
<el-table-column label="账户状态" align="center" width="80" prop="state">
<el-table-column label="结清状态" align="center" width="80" prop="state">
<template #default="scope">
<dict-tag :options="settle_state" :value="scope.row.state" />
</template>
@@ -99,7 +99,7 @@
<el-form-item label="余额" prop="balance">
<el-input v-model="form.balance" placeholder="请输入余额" />
</el-form-item>
<el-form-item label="账户状态" prop="state">
<el-form-item label="结清状态" prop="state">
<el-select v-model="form.state" placeholder="请选择账户状态">
<el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>

View File

@@ -122,7 +122,7 @@
</el-table-column>
<el-table-column label="借款日期" align="center" prop="time" />
<el-table-column label="借款金额(本息)" align="center" prop="value" />
<el-table-column prop="detail" label="借款金额明细" width="700" v-if="queryParams.type === 2">
<el-table-column prop="detail" label="借款金额明细" width="900" v-if="queryParams.type === 2">
<template #default="scope">
<span v-html="formatMultiLineData(scope.row.detail)"></span>
</template>

View File

@@ -10,7 +10,7 @@
</el-form-item>
<el-form-item label="信用卡" style="width: 500px" prop="outAccountId">
<el-select v-model="queryParams.outAccountId" placeholder="请选择信用卡" clearable>
<el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
<el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCodeAvailableLimit" :value="creditCard.id" />
</el-select>
</el-form-item>
<el-form-item label="刷卡时间" prop="time">
@@ -43,7 +43,7 @@
<el-table-column label="刷卡商户" align="center" prop="merchantName" />
<el-table-column label="信用卡" align="center" prop="outAccountName" />
<el-table-column label="刷卡时间" align="center" prop="createTime" />
<el-table-column label="交易金额" align="center" prop="amount" />
<el-table-column label="刷卡金额" align="center" prop="amount" />
<el-table-column label="手续费" width="100" align="center" prop="commission" />
<el-table-column label="储蓄卡" align="center" prop="inAccountName" />
<el-table-column label="入账金额" width="120" align="center" prop="actualAmount" />
@@ -76,7 +76,7 @@
</el-form-item>
<el-form-item label="信用卡" prop="outAccountId">
<el-select v-model="form.outAccountId" placeholder="请选择信用卡" clearable>
<el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
<el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCodeAvailableLimit" :value="creditCard.id" />
</el-select>
</el-form-item>
<el-form-item label="刷卡时间" prop="createTime">
@@ -202,13 +202,6 @@ function getPosMachineList() {
})
}
/** 查询投资账户管理列表 */
function getFutruesStocksList() {
listAccounts(queryFutruesStocksParams.value).then((response) => {
futruesStocksList.value = response.rows
})
}
/** 查询POS机刷卡列表 */
function getList() {
loading.value = true
@@ -361,7 +354,6 @@ function handleExport() {
`accountsTransferRecord_${new Date().getTime()}.xlsx`
)
}
getFutruesStocksList()
getPosMachineList()
getBankCardLendList()
getList()