fix: bug修复。

This commit is contained in:
tianyongbao
2024-04-19 10:42:12 +08:00
parent 2f89616d14
commit 6074441831

View File

@@ -10,12 +10,7 @@
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="state"> <el-form-item label="账户状态" prop="state">
<el-select v-model="queryParams.state" placeholder="请选择账户状态" clearable> <el-select v-model="queryParams.state" placeholder="请选择账户状态" clearable>
<el-option <el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value" />
v-for="dict in settle_state"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -28,28 +23,15 @@
<div class="title-con"> <div class="title-con">
<div class="title">基本信息</div> <div class="title">基本信息</div>
<div class="operate-btn-con"> <div class="operate-btn-con">
<el-button <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:installmentHistory:add']">新增</el-button>
@click="handleAdd" <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:installmentHistory:remove']">删除</el-button>
icon="Plus" <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:installmentHistory:export']">导出</el-button>
v-hasPermi="['invest:installmentHistory:add']"
>新增</el-button>
<el-button
:disabled="multiple"
icon="Delete"
@click="handleDelete"
v-hasPermi="['invest:installmentHistory:remove']"
>删除</el-button>
<el-button
@click="handleExport"
icon="Download"
v-hasPermi="['invest:installmentHistory:export']"
>导出</el-button>
</div> </div>
</div> </div>
<div class="content-con" v-loading="loading"> <div class="content-con" v-loading="loading">
<el-table v-loading="loading" :data="installmentHistoryList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="installmentHistoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="信用卡" align="center" width='200' prop="bankNameCode" /> <el-table-column label="信用卡" align="center" width="200" prop="bankNameCode" />
<el-table-column label="分期金额" align="center" prop="installmentAmount" /> <el-table-column label="分期金额" align="center" prop="installmentAmount" />
<el-table-column label="分期日期" align="center" prop="installmentDate" width="180"> <el-table-column label="分期日期" align="center" prop="installmentDate" width="180">
<template #default="scope"> <template #default="scope">
@@ -71,12 +53,12 @@
<span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="账户状态" align="center" width='100' prop="state"> <el-table-column label="账户状态" align="center" width="100" prop="state">
<template #default="scope"> <template #default="scope">
<dict-tag :options="settle_state" :value="scope.row.state" /> <dict-tag :options="settle_state" :value="scope.row.state" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width='200' class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<div class="ctrl-btn d-flex"> <div class="ctrl-btn d-flex">
<el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top"> <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
@@ -101,12 +83,7 @@
<el-input v-model="form.installmentAmount" placeholder="请输入分期金额" /> <el-input v-model="form.installmentAmount" placeholder="请输入分期金额" />
</el-form-item> </el-form-item>
<el-form-item label="分期日期" prop="installmentDate"> <el-form-item label="分期日期" prop="installmentDate">
<el-date-picker clearable <el-date-picker clearable v-model="form.installmentDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择分期日期"> </el-date-picker>
v-model="form.installmentDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择分期日期">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="分期期数" prop="period"> <el-form-item label="分期期数" prop="period">
<el-input v-model="form.period" placeholder="请输入分期期数" /> <el-input v-model="form.period" placeholder="请输入分期期数" />
@@ -116,12 +93,7 @@
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="state"> <el-form-item label="账户状态" prop="state">
<el-select v-model="form.state" placeholder="请选择账户状态"> <el-select v-model="form.state" placeholder="请选择账户状态">
<el-option <el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
v-for="dict in settle_state"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="总利息" prop="totalInterest"> <el-form-item label="总利息" prop="totalInterest">
@@ -165,12 +137,7 @@
<el-dialog title="添加分期历史明细" v-model="openDetail" width="500px" append-to-body> <el-dialog title="添加分期历史明细" v-model="openDetail" width="500px" append-to-body>
<el-form ref="installmentDetailRef" :model="formDetail" :rules="rulesDetail" label-width="120px"> <el-form ref="installmentDetailRef" :model="formDetail" :rules="rulesDetail" label-width="120px">
<el-form-item label="入账日期" prop="repaymentDate"> <el-form-item label="入账日期" prop="repaymentDate">
<el-date-picker clearable <el-date-picker clearable v-model="formDetail.repaymentDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择入账日期"> </el-date-picker>
v-model="formDetail.repaymentDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择入账日期">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="还款期数" prop="periods"> <el-form-item label="还款期数" prop="periods">
<el-input v-model="formDetail.periods" placeholder="请输入还款期数" /> <el-input v-model="formDetail.periods" placeholder="请输入还款期数" />
@@ -186,12 +153,7 @@
</el-form-item> </el-form-item>
<el-form-item label="入账状态" prop="postingState"> <el-form-item label="入账状态" prop="postingState">
<el-select v-model="formDetail.postingState" placeholder="请选择入账状态"> <el-select v-model="formDetail.postingState" placeholder="请选择入账状态">
<el-option <el-option v-for="dict in posting_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
v-for="dict in posting_state"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
@@ -209,21 +171,12 @@
<!-- 添加或修改分期历史明细对话框 --> <!-- 添加或修改分期历史明细对话框 -->
<el-dialog title="查看添加明细" v-model="detailOpen" width="1150px" append-to-body> <el-dialog title="查看添加明细" v-model="detailOpen" width="1150px" append-to-body>
<div class="basic-information"> <div class="basic-information">
<div class="main-con"> <div class="main-con">
<div class="title-con"> <div class="title-con">
<div class="title">基本信息</div> <div class="title">基本信息</div>
<div class="operate-btn-con"> <div class="operate-btn-con">
<el-button <el-button @click="handleAddDetail" icon="Plus" v-hasPermi="['invest:installmentHistory:add']">新增</el-button>
@click="handleAddDetail" <el-button @click="handleUpdateInterest" icon="Expand" v-hasPermi="['invest:installmentHistory:add']">总利息汇总</el-button>
icon="Plus"
v-hasPermi="['invest:installmentHistory:add']"
>新增</el-button>
<el-button
@click="handleUpdateInterest"
icon="Expand"
v-hasPermi="['invest:installmentHistory:add']"
>总利息汇总</el-button>
</div> </div>
</div> </div>
<div class="content-con"> <div class="content-con">
@@ -263,8 +216,20 @@
</template> </template>
<script setup name="InstallmentHistory"> <script setup name="InstallmentHistory">
import { listInstallmentHistory, getInstallmentHistory, delInstallmentHistory, addInstallmentHistory, updateInstallmentHistory } from '@/api/invest/installmentHistory' import {
import { listInstallmentDetail, getInstallmentDetail, delInstallmentDetail, addInstallmentDetail, updateInstallmentDetail } from '@/api/invest/installmentDetail' listInstallmentHistory,
getInstallmentHistory,
delInstallmentHistory,
addInstallmentHistory,
updateInstallmentHistory
} from '@/api/invest/installmentHistory'
import {
listInstallmentDetail,
getInstallmentDetail,
delInstallmentDetail,
addInstallmentDetail,
updateInstallmentDetail
} from '@/api/invest/installmentDetail'
import { listBankcardLend } from '@/api/invest/bankcardlend' import { listBankcardLend } from '@/api/invest/bankcardlend'
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require' import { require } from '@/utils/require'
@@ -313,50 +278,22 @@ const data = reactive({
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {
bankCardLendId: [ bankCardLendId: [{ required: true, message: '信用卡不能为空', trigger: 'blur' }],
{ required: true, message: '信用卡不能为空', trigger: 'blur' } installmentAmount: [{ required: true, message: '分期金额不能为空', trigger: 'blur' }],
], installmentDate: [{ required: true, message: '分期日期不能为空', trigger: 'blur' }],
installmentAmount: [ period: [{ required: true, message: '分期期数不能为空', trigger: 'blur' }],
{ required: true, message: '分期金额不能为空', trigger: 'blur' } totalInterest: [{ required: true, message: '总利息不能为空', trigger: 'blur' }],
], state: [{ required: true, message: '账户状态不能为空', trigger: 'change' }],
installmentDate: [ balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }]
{ required: true, message: '分期日期不能为空', trigger: 'blur' }
],
period: [
{ required: true, message: '分期期数不能为空', trigger: 'blur' }
],
totalInterest: [
{ required: true, message: '总利息不能为空', trigger: 'blur' }
],
state: [
{ required: true, message: '账户状态不能为空', trigger: 'change' }
],
balance: [
{ required: true, message: '余额不能为空', trigger: 'blur' }
]
}, },
rulesDetail: { rulesDetail: {
installmentHistoryId: [ installmentHistoryId: [{ required: true, message: '分期历史id不能为空', trigger: 'blur' }],
{ required: true, message: '分期历史id不能为空', trigger: 'blur' } bankCardLendId: [{ required: true, message: '信用卡网贷不能为空', trigger: 'blur' }],
], repaymentDate: [{ required: true, message: '入账日期不能为空', trigger: 'blur' }],
bankCardLendId: [ principal: [{ required: true, message: '应还本金不能为空', trigger: 'blur' }],
{ required: true, message: '信用卡网贷不能为空', trigger: 'blur' } periods: [{ required: true, message: '还款期数不能为空', trigger: 'blur' }],
], interest: [{ required: true, message: '利息不能为空', trigger: 'blur' }],
repaymentDate: [ postingState: [{ required: true, message: '入账状态不能为空', trigger: 'change' }]
{ required: true, message: '入账日期不能为空', trigger: 'blur' }
],
principal: [
{ required: true, message: '应还本金不能为空', trigger: 'blur' }
],
periods: [
{ required: true, message: '还款期数不能为空', trigger: 'blur' }
],
interest: [
{ required: true, message: '利息不能为空', trigger: 'blur' }
],
postingState: [
{ required: true, message: '入账状态不能为空', trigger: 'change' }
]
} }
}) })
@@ -404,7 +341,7 @@ function getCreditCardList() {
/** 查询信用卡分期列表 */ /** 查询信用卡分期列表 */
function getList() { function getList() {
loading.value = true loading.value = true
listInstallmentHistory(queryParams.value).then(response => { listInstallmentHistory(queryParams.value).then((response) => {
installmentHistoryList.value = response.rows installmentHistoryList.value = response.rows
total.value = response.total total.value = response.total
loading.value = false loading.value = false
@@ -492,7 +429,7 @@ const handleCurrentChange = (val) => {
// 多选框选中数据 // 多选框选中数据
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id) ids.value = selection.map((item) => item.id)
single.value = selection.length !== 1 single.value = selection.length !== 1
multiple.value = !selection.length multiple.value = !selection.length
} }
@@ -506,7 +443,7 @@ const handleView = (row) => {
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
//reset() reset()
open.value = true open.value = true
title.value = '添加信用卡分期' title.value = '添加信用卡分期'
} }
@@ -526,11 +463,11 @@ function handleUpdateInterest() {
totalInterest = totalInterest + installmentDetailList.value[i].interest totalInterest = totalInterest + installmentDetailList.value[i].interest
} }
} }
getInstallmentHistory(currentInstallmentHistoryId.value).then(response => { getInstallmentHistory(currentInstallmentHistoryId.value).then((response) => {
form.value = response.data form.value = response.data
form.value.totalInterest = totalInterest form.value.totalInterest = totalInterest
if (form.value.id != null) { if (form.value.id != null) {
updateInstallmentHistory(form.value).then(response => { updateInstallmentHistory(form.value).then((response) => {
proxy.$modal.msgSuccess('总利息汇总成功!') proxy.$modal.msgSuccess('总利息汇总成功!')
openDetail.value = false openDetail.value = false
getList() getList()
@@ -546,7 +483,7 @@ function handleDetail(row) {
currentInstallmentHistoryId.value = row.id currentInstallmentHistoryId.value = row.id
formDetail.value.bankCardLendId = row.bankCardLendId formDetail.value.bankCardLendId = row.bankCardLendId
formDetail.value.type = row.type formDetail.value.type = row.type
listInstallmentDetail({ installmentHistoryId: row.id, pageNum: 1, pageSize: 1000 }).then(response => { listInstallmentDetail({ installmentHistoryId: row.id, pageNum: 1, pageSize: 1000 }).then((response) => {
installmentDetailList.value = response.rows installmentDetailList.value = response.rows
}) })
} }
@@ -555,7 +492,7 @@ function handleDetail(row) {
function handleUpdate(row) { function handleUpdate(row) {
reset() reset()
const _id = row.id || ids.value const _id = row.id || ids.value
getInstallmentHistory(_id).then(response => { getInstallmentHistory(_id).then((response) => {
form.value = response.data form.value = response.data
open.value = true open.value = true
title.value = '修改信用卡分期' title.value = '修改信用卡分期'
@@ -565,7 +502,7 @@ function handleUpdate (row) {
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdateDetail(row) { function handleUpdateDetail(row) {
resetDetail() resetDetail()
getInstallmentDetail(row.id).then(response => { getInstallmentDetail(row.id).then((response) => {
formDetail.value = response.data formDetail.value = response.data
openDetail.value = true openDetail.value = true
titleDetail.value = '修改分期历史明细' titleDetail.value = '修改分期历史明细'
@@ -574,16 +511,16 @@ function handleUpdateDetail (row) {
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs.installmentHistoryRef.validate(valid => { proxy.$refs.installmentHistoryRef.validate((valid) => {
if (valid) { if (valid) {
if (form.value.id != null) { if (form.value.id != null) {
updateInstallmentHistory(form.value).then(response => { updateInstallmentHistory(form.value).then((response) => {
proxy.$modal.msgSuccess('修改成功') proxy.$modal.msgSuccess('修改成功')
open.value = false open.value = false
getList() getList()
}) })
} else { } else {
addInstallmentHistory(form.value).then(response => { addInstallmentHistory(form.value).then((response) => {
proxy.$modal.msgSuccess('新增成功') proxy.$modal.msgSuccess('新增成功')
open.value = false open.value = false
getList() getList()
@@ -595,21 +532,21 @@ function submitForm () {
/** 提交按钮 */ /** 提交按钮 */
function submitFormDetail() { function submitFormDetail() {
proxy.$refs.installmentDetailRef.validate(valid => { proxy.$refs.installmentDetailRef.validate((valid) => {
if (valid) { if (valid) {
if (formDetail.value.id != null) { if (formDetail.value.id != null) {
updateInstallmentDetail(formDetail.value).then(response => { updateInstallmentDetail(formDetail.value).then((response) => {
proxy.$modal.msgSuccess('修改明细成功') proxy.$modal.msgSuccess('修改明细成功')
openDetail.value = false openDetail.value = false
listInstallmentDetail({ installmentHistoryId: currentInstallmentHistoryId.value, pageNum: 1, pageSize: 1000 }).then(response => { listInstallmentDetail({ installmentHistoryId: currentInstallmentHistoryId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
installmentDetailList.value = response.rows installmentDetailList.value = response.rows
}) })
}) })
} else { } else {
addInstallmentDetail(formDetail.value).then(response => { addInstallmentDetail(formDetail.value).then((response) => {
proxy.$modal.msgSuccess('新增明细成功') proxy.$modal.msgSuccess('新增明细成功')
openDetail.value = false openDetail.value = false
listInstallmentDetail({ installmentHistoryId: currentInstallmentHistoryId.value, pageNum: 1, pageSize: 1000 }).then(response => { listInstallmentDetail({ installmentHistoryId: currentInstallmentHistoryId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
installmentDetailList.value = response.rows installmentDetailList.value = response.rows
}) })
}) })
@@ -621,31 +558,43 @@ function submitFormDetail () {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const _ids = row.id || ids.value const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除选中的数据项?').then(function() { proxy.$modal
.confirm('是否确认删除选中的数据项?')
.then(function () {
return delInstallmentHistory(_ids) return delInstallmentHistory(_ids)
}).then(() => { })
.then(() => {
getList() getList()
proxy.$modal.msgSuccess('删除成功') proxy.$modal.msgSuccess('删除成功')
}).catch(() => {}) })
.catch(() => {})
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDeleteDetail(row) { function handleDeleteDetail(row) {
proxy.$modal.confirm('是否确认删除选中的数据项?').then(function() { proxy.$modal
.confirm('是否确认删除选中的数据项?')
.then(function () {
return delInstallmentDetail(row.id) return delInstallmentDetail(row.id)
}).then(() => { })
listInstallmentDetail({ installmentHistoryId: currentInstallmentHistoryId.value, pageNum: 1, pageSize: 1000 }).then(response => { .then(() => {
listInstallmentDetail({ installmentHistoryId: currentInstallmentHistoryId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
installmentDetailList.value = response.rows installmentDetailList.value = response.rows
}) })
proxy.$modal.msgSuccess('删除分期历史明细成功') proxy.$modal.msgSuccess('删除分期历史明细成功')
}).catch(() => {}) })
.catch(() => {})
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download('invest/installmentHistory/export', { proxy.download(
'invest/installmentHistory/export',
{
...queryParams.value ...queryParams.value
}, `installmentHistory_${new Date().getTime()}.xlsx`) },
`installmentHistory_${new Date().getTime()}.xlsx`
)
} }
getCreditCardList() getCreditCardList()
getList() getList()