fix: 系统功能升级,账户增加status字段,修改相关功能。

This commit is contained in:
tianyongbao
2024-07-17 19:42:47 +08:00
parent a84fbf04b8
commit abfa7e6feb
23 changed files with 222 additions and 66 deletions

View File

@@ -113,7 +113,7 @@
<div class="item"> <div class="item">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">未结清网贷笔数</div> <div class="title">未结清网贷</div>
<div class="num">{{ unclearedOnlineDebtCount }}<span></span></div> <div class="num">{{ unclearedOnlineDebtCount }}<span></span></div>
</div> </div>
</div> </div>
@@ -136,7 +136,7 @@
<div class="item"> <div class="item">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">已结清网贷笔数</div> <div class="title">已结清网贷</div>
<div class="num">{{ clearedOnlineDebtCount }}<span></span></div> <div class="num">{{ clearedOnlineDebtCount }}<span></span></div>
</div> </div>
</div> </div>
@@ -214,7 +214,7 @@
<div class="item"> <div class="item">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">未结清分期笔数</div> <div class="title">未结清分期</div>
<div class="num">{{ unclearedCreditInstallmentCount }}<span></span></div> <div class="num">{{ unclearedCreditInstallmentCount }}<span></span></div>
</div> </div>
</div> </div>
@@ -244,7 +244,7 @@
<div class="item"> <div class="item">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">已结清分期笔数</div> <div class="title">已结清分期</div>
<div class="num">{{ clearedCreditInstallmentCount }}<span></span></div> <div class="num">{{ clearedCreditInstallmentCount }}<span></span></div>
</div> </div>
</div> </div>
@@ -306,28 +306,28 @@
<div class="item"> <div class="item">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近1月硬查询次数</div> <div class="title">近1月硬查询</div>
<div class="num">{{ lastOneMonths }}<span></span></div> <div class="num">{{ lastOneMonths }}<span></span></div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="./assets/ticketSum.png" alt="" /> <img src="./assets/ticketSum.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近2月硬查询次数</div> <div class="title">近2月硬查询</div>
<div class="num">{{ lastTwoMonths }}<span></span></div> <div class="num">{{ lastTwoMonths }}<span></span></div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="./assets/completionTickets.png" alt="" /> <img src="./assets/completionTickets.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近3月硬查询次数</div> <div class="title">近3月硬查询</div>
<div class="num">{{ lastThreeMonths }}<span></span></div> <div class="num">{{ lastThreeMonths }}<span></span></div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="./assets/completionTime.png" alt="" /> <img src="./assets/completionTime.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近6月硬查询次数</div> <div class="title">近6月硬查询</div>
<div class="num">{{ lastSixMonths }}<span></span></div> <div class="num">{{ lastSixMonths }}<span></span></div>
</div> </div>
</div> </div>
@@ -336,21 +336,21 @@
<div class="item"> <div class="item">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近1年硬查询次数</div> <div class="title">近1年硬查询</div>
<div class="num">{{ lastOneYears }}<span></span></div> <div class="num">{{ lastOneYears }}<span></span></div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="./assets/ticketSum.png" alt="" /> <img src="./assets/ticketSum.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近2年硬查询次数</div> <div class="title">近2年硬查询</div>
<div class="num">{{ lastTwoYears }}<span></span></div> <div class="num">{{ lastTwoYears }}<span></span></div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="./assets/completionTickets.png" alt="" /> <img src="./assets/completionTickets.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">总硬查询次数</div> <div class="title">总硬查询</div>
<div class="num">{{ lastAllYears }}<span></span></div> <div class="num">{{ lastAllYears }}<span></span></div>
</div> </div>
</div> </div>
@@ -359,28 +359,28 @@
<div class="item"> <div class="item">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近6月个人查询次数</div> <div class="title">近6月个人查询</div>
<div class="num">{{ lastSixMonthQueryCount }}<span></span></div> <div class="num">{{ lastSixMonthQueryCount }}<span></span></div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="./assets/ticketSum.png" alt="" /> <img src="./assets/ticketSum.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近6月贷后管理次数</div> <div class="title">近6月贷后管理</div>
<div class="num">{{ lastSixMonthsAfterLoan }}<span></span></div> <div class="num">{{ lastSixMonthsAfterLoan }}<span></span></div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="./assets/completionTickets.png" alt="" /> <img src="./assets/completionTickets.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">近2年贷后管理次数</div> <div class="title">近2年贷后管理</div>
<div class="num">{{ lastTwoYearsAfterLoan }}<span></span></div> <div class="num">{{ lastTwoYearsAfterLoan }}<span></span></div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="./assets/completionTime.png" alt="" /> <img src="./assets/completionTime.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">贷后管理总</div> <div class="title">贷后管理总数</div>
<div class="num">{{ totalAfterLoan }}<span></span></div> <div class="num">{{ totalAfterLoan }}<span></span></div>
</div> </div>
</div> </div>
@@ -396,23 +396,37 @@
<div class="item" v-hasPermi="['invest:posmachine:list']"> <div class="item" v-hasPermi="['invest:posmachine:list']">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">POS机总数</div> <div class="title">POS机</div>
<div class="num">{{ posCount }}<span></span></div> <div class="num">{{ posCount }}<span></span></div>
</div> </div>
</div> </div>
<div class="item" v-hasPermi="['invest:creditCard']"> <div class="item" v-hasPermi="['invest:creditCard']">
<img src="./assets/ticketSum.png" alt="" /> <img src="./assets/ticketSum.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">信用卡总数</div> <div class="title">信用卡账户</div>
<div class="num">{{ creditCount }}<span></span></div> <div class="num">{{ creditCount }}<span></span></div>
</div> </div>
</div> </div>
<div class="item" v-hasPermi="['invest:debitCard']"> <!-- <div class="item" v-hasPermi="['invest:debitCard']">
<img src="./assets/completionTickets.png" alt="" /> <img src="./assets/completionTickets.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">储蓄卡总数</div> <div class="title">储蓄卡总数</div>
<div class="num">{{ debitCount }}<span></span></div> <div class="num">{{ debitCount }}<span></span></div>
</div> </div>
</div> -->
<div class="item" v-hasPermi="['invest:debitCard']">
<img src="./assets/completionTickets.png" alt="" />
<div class="info-sum">
<div class="title">I类储蓄卡</div>
<div class="num">{{ debitICount }}<span></span></div>
</div>
</div>
<div class="item" v-hasPermi="['invest:debitCard']">
<img src="./assets/completionTime.png" alt="" />
<div class="info-sum">
<div class="title">II类储蓄卡</div>
<div class="num">{{ debitIICount }}<span></span></div>
</div>
</div> </div>
</div> </div>
@@ -420,28 +434,28 @@
<div class="item" v-hasPermi="['invest:futureStocks:list']"> <div class="item" v-hasPermi="['invest:futureStocks:list']">
<img src="./assets/one.png" alt="" /> <img src="./assets/one.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">股票账户总数</div> <div class="title">股票账户</div>
<div class="num">{{ stocksCount }}<span></span></div> <div class="num">{{ stocksCount }}<span></span></div>
</div> </div>
</div> </div>
<div class="item" v-hasPermi="['invest:futureStocks:list']"> <div class="item" v-hasPermi="['invest:futureStocks:list']">
<img src="./assets/ticketSum.png" alt="" /> <img src="./assets/ticketSum.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">期货账户总数</div> <div class="title">期货账户</div>
<div class="num">{{ futuresCount }}<span></span></div> <div class="num">{{ futuresCount }}<span></span></div>
</div> </div>
</div> </div>
<div class="item" v-hasPermi="['invest:onlineLend']"> <div class="item" v-hasPermi="['invest:onlineLend']">
<img src="./assets/completionTickets.png" alt="" /> <img src="./assets/completionTickets.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">人情总数</div> <div class="title">人情账户</div>
<div class="num">{{ peopleLendCount }}<span></span></div> <div class="num">{{ peopleLendCount }}<span></span></div>
</div> </div>
</div> </div>
<div class="item" v-hasPermi="['invest:onlineLend']"> <div class="item" v-hasPermi="['invest:onlineLend']">
<img src="./assets/completionTime.png" alt="" /> <img src="./assets/completionTime.png" alt="" />
<div class="info-sum"> <div class="info-sum">
<div class="title">网贷总数</div> <div class="title">网贷账户</div>
<div class="num">{{ onlineLendCount }}<span></span></div> <div class="num">{{ onlineLendCount }}<span></span></div>
</div> </div>
</div> </div>
@@ -463,6 +477,8 @@ const investBalance = ref(0)
//基础信息 //基础信息
const posCount = ref(0) const posCount = ref(0)
const debitCount = ref(0) const debitCount = ref(0)
const debitICount = ref(0)
const debitIICount = ref(0)
const stocksCount = ref(0) const stocksCount = ref(0)
const futuresCount = ref(0) const futuresCount = ref(0)
const peopleLendCount = ref(0) const peopleLendCount = ref(0)
@@ -537,6 +553,8 @@ const getBaseAccountInfoData = () => {
posCount.value = res.data.posCount posCount.value = res.data.posCount
creditCount.value = res.data.creditCount creditCount.value = res.data.creditCount
debitCount.value = res.data.debitCount debitCount.value = res.data.debitCount
debitICount.value = res.data.debitICount
debitIICount.value = res.data.debitIICount
stocksCount.value = res.data.stocksCount stocksCount.value = res.data.stocksCount
futuresCount.value = res.data.futuresCount futuresCount.value = res.data.futuresCount
peopleLendCount.value = res.data.peopleLendCount peopleLendCount.value = res.data.peopleLendCount

View File

@@ -181,7 +181,7 @@ const data = reactive({
queryAddAccountParams: { queryAddAccountParams: {
pageNum: 1, pageNum: 1,
type: '', type: '',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -41,6 +41,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="账号" width="180" align="center" prop="code" /> <el-table-column label="账号" width="180" align="center" prop="code" />
<el-table-column label="账户状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="account_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="信用卡额度" align="center" v-if="queryParams.type === '2'" prop="creditLimit" /> <el-table-column label="信用卡额度" align="center" v-if="queryParams.type === '2'" prop="creditLimit" />
<el-table-column label="可用额度" align="center" prop="availableLimit" /> <el-table-column label="可用额度" align="center" prop="availableLimit" />
<el-table-column label="余额" align="center" prop="balance" /> <el-table-column label="余额" align="center" prop="balance" />
@@ -52,7 +57,7 @@
<el-table-column label="账单日" align="center" v-if="queryParams.type === '2'" prop="billDateName" /> <el-table-column label="账单日" align="center" v-if="queryParams.type === '2'" prop="billDateName" />
<el-table-column label="还款日" align="center" v-if="queryParams.type === '2'" prop="payDateName" /> <el-table-column label="还款日" align="center" v-if="queryParams.type === '2'" prop="payDateName" />
<el-table-column label="账户状态" align="center" prop="state"> <el-table-column label="账户显示状态" align="center" prop="state">
<template #default="scope"> <template #default="scope">
<dict-tag :options="account_state" :value="scope.row.state" /> <dict-tag :options="account_state" :value="scope.row.state" />
</template> </template>
@@ -90,8 +95,8 @@
<el-form-item label="可用额度" prop="availableLimit"> <el-form-item label="可用额度" prop="availableLimit">
<el-input v-model="form.availableLimit" placeholder="请输入可用额度" /> <el-input v-model="form.availableLimit" placeholder="请输入可用额度" />
</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 v-for="dict in account_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> <el-option v-for="dict in account_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -193,13 +198,14 @@ import { listAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
import { require } from '@/utils/require' import { require } from '@/utils/require'
import dayjs from 'dayjs' import dayjs from 'dayjs'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const { account_state, account_type, deal_type, deal_category, debit_type, transfer_type } = proxy.useDict( const { account_state, account_type, deal_type, deal_category, debit_type, transfer_type, account_status } = proxy.useDict(
'account_state', 'account_state',
'account_type', 'account_type',
'deal_type', 'deal_type',
'deal_category', 'deal_category',
'debit_type', 'debit_type',
'transfer_type' 'transfer_type',
'account_status'
) )
const accountsList = ref([]) const accountsList = ref([])
const open = ref(false) const open = ref(false)
@@ -257,6 +263,7 @@ const data = reactive({
rules: { rules: {
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
type: [{ required: true, message: '账户类型不能为空', trigger: 'change' }], type: [{ required: true, message: '账户类型不能为空', trigger: 'change' }],
status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
code: [{ required: true, message: '账号不能为空', trigger: 'blur' }], code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }] balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }]
} }
@@ -324,7 +331,8 @@ function reset() {
delFlag: null, delFlag: null,
remark: null, remark: null,
accountId: null, accountId: null,
state: null state: null,
status: null
} }
proxy.resetForm('accountsRef') proxy.resetForm('accountsRef')
} }

View File

@@ -200,6 +200,7 @@ const data = reactive({
queryCreditCardParams: { queryCreditCardParams: {
pageNum: 1, pageNum: 1,
type: '2', type: '2',
status: '1',
pageSize: 100 pageSize: 100
}, },
rules: { rules: {

View File

@@ -204,6 +204,7 @@ const data = reactive({
queryCreditCardParams: { queryCreditCardParams: {
pageNum: 1, pageNum: 1,
type: '2', type: '2',
status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -79,8 +79,8 @@
</div> </div>
</div> </div>
<!-- 添加或修改信用卡分期对话框 --> <!-- 添加或修改信用卡分期对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="880px" append-to-body>
<el-form ref="installmentHistoryRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="installmentHistoryRef" :model="form" :inline="true" :rules="rules" label-width="120px">
<el-form-item label="信用卡" prop="bankCardLendId"> <el-form-item label="信用卡" prop="bankCardLendId">
<el-select v-model="form.bankCardLendId" placeholder="请选择信用卡" clearable> <el-select v-model="form.bankCardLendId" 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.nameCode" :value="creditCard.id" />
@@ -282,6 +282,7 @@ const data = reactive({
queryCreditCardParams: { queryCreditCardParams: {
pageNum: 1, pageNum: 1,
type: '2', type: '2',
status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -158,13 +158,13 @@ const data = reactive({
queryCreditParams: { queryCreditParams: {
pageNum: 1, pageNum: 1,
type: '2', type: '2',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
queryDebitParams: { queryDebitParams: {
pageNum: 1, pageNum: 1,
type: '1', type: '1',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -6,6 +6,11 @@
<el-form-item label="信用卡名称" prop="name"> <el-form-item label="信用卡名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入信用卡名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.name" placeholder="请输入信用卡名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-form> </el-form>
<div class="search-btn-con"> <div class="search-btn-con">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -45,10 +50,15 @@
<dict-tag :options="is_next_bill_date" :value="scope.row.isNextBillDate" /> <dict-tag :options="is_next_bill_date" :value="scope.row.isNextBillDate" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="0账单操作" align="center" prop="isZeroBill"> <!-- <el-table-column label="0账单操作" align="center" prop="isZeroBill">
<template #default="scope"> <template #default="scope">
<dict-tag :options="is_zero_bill" :value="scope.row.isZeroBill" /> <dict-tag :options="is_zero_bill" :value="scope.row.isZeroBill" />
</template> </template>
</el-table-column> -->
<el-table-column label="账户状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="account_status" :value="scope.row.status" />
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
@@ -75,6 +85,11 @@
<el-form-item label="信用卡额度" prop="creditLimit"> <el-form-item label="信用卡额度" prop="creditLimit">
<el-input v-model="form.creditLimit" placeholder="请输入信用卡额度" /> <el-input v-model="form.creditLimit" placeholder="请输入信用卡额度" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="form.status" placeholder="请选择账户状态">
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="账单日" prop="billDate"> <el-form-item label="账单日" prop="billDate">
<el-input v-model="form.billDate" placeholder="请输入账单日" /> <el-input v-model="form.billDate" placeholder="请输入账单日" />
</el-form-item> </el-form-item>
@@ -134,7 +149,7 @@ import { listBankcardLend, getBankcardLend, delBankcardLend, addBankcardLend, up
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require' import { require } from '@/utils/require'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const { is_zero_bill, is_next_bill_date } = proxy.useDict('is_zero_bill', 'is_next_bill_date') const { is_zero_bill, is_next_bill_date, account_status } = proxy.useDict('is_zero_bill', 'is_next_bill_date', 'account_status')
const bankcardList = ref([]) const bankcardList = ref([])
const open = ref(false) const open = ref(false)
@@ -155,6 +170,7 @@ const data = reactive({
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
status: null,
name: null, name: null,
type: '2' type: '2'
}, },
@@ -165,6 +181,7 @@ const data = reactive({
payDate: [{ required: true, message: '还款日不能为空', trigger: 'blur' }], payDate: [{ required: true, message: '还款日不能为空', trigger: 'blur' }],
creditLimit: [{ required: true, message: '信用卡额度不能为空', trigger: 'blur' }], creditLimit: [{ required: true, message: '信用卡额度不能为空', trigger: 'blur' }],
balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }], balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }],
status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
availableLimit: [{ required: true, message: '可用额度不能为空', trigger: 'blur' }] availableLimit: [{ required: true, message: '可用额度不能为空', trigger: 'blur' }]
} }
}) })
@@ -229,7 +246,8 @@ function reset() {
debitType: null, debitType: null,
isNextBillDate: null, isNextBillDate: null,
nextBillDateTime: null, nextBillDateTime: null,
isZeroBill: null isZeroBill: null,
status: null
} }
proxy.resetForm('bankcardRef') proxy.resetForm('bankcardRef')
} }

View File

@@ -142,19 +142,19 @@ const data = reactive({
queryFutruesStocksParams: { queryFutruesStocksParams: {
pageNum: 1, pageNum: 1,
type: '5', type: '5',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
queryCreditParams: { queryCreditParams: {
pageNum: 1, pageNum: 1,
type: '2', type: '2',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
queryDebitParams: { queryDebitParams: {
pageNum: 1, pageNum: 1,
type: '1', type: '1',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -6,6 +6,16 @@
<el-form-item label="储蓄卡名称" prop="name"> <el-form-item label="储蓄卡名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入储蓄卡名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.name" placeholder="请输入储蓄卡名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="储蓄卡类型" prop="debitType">
<el-select v-model="queryParams.debitType" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in debit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-form> </el-form>
<div class="search-btn-con"> <div class="search-btn-con">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -26,6 +36,11 @@
<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="180" prop="name" /> <el-table-column label="储蓄卡名称" align="center" width="180" prop="name" />
<el-table-column label="储蓄卡卡号" align="center" prop="code" /> <el-table-column label="储蓄卡卡号" align="center" prop="code" />
<el-table-column label="账户状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="account_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="开户行" align="center" prop="openingBank" /> <el-table-column label="开户行" align="center" prop="openingBank" />
<el-table-column label="开户日期" align="center" prop="activationDate" width="150"> <el-table-column label="开户日期" align="center" prop="activationDate" width="150">
<template #default="scope"> <template #default="scope">
@@ -52,14 +67,19 @@
</div> </div>
</div> </div>
<!-- 添加或修改储蓄卡信息对话框 --> <!-- 添加或修改储蓄卡信息对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="880px" append-to-body>
<el-form ref="bankcardRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="bankcardRef" :model="form" :inline="true" :rules="rules" label-width="120px">
<el-form-item label="储蓄卡名称" prop="name"> <el-form-item label="储蓄卡名称" prop="name">
<el-input v-model="form.name" placeholder="请输入储蓄卡名称" /> <el-input v-model="form.name" placeholder="请输入储蓄卡名称" />
</el-form-item> </el-form-item>
<el-form-item label="储蓄卡卡号" prop="code"> <el-form-item label="储蓄卡卡号" prop="code">
<el-input v-model="form.code" placeholder="请输入储蓄卡卡号" /> <el-input v-model="form.code" placeholder="请输入储蓄卡卡号" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="form.status" placeholder="请选择账户状态">
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="余额" prop="balance"> <el-form-item label="余额" prop="balance">
<el-input v-model="form.balance" placeholder="请输入余额" /> <el-input v-model="form.balance" placeholder="请输入余额" />
</el-form-item> </el-form-item>
@@ -80,7 +100,7 @@
<el-option v-for="dict in debit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> <el-option v-for="dict in debit_type" :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="备注" style="width: 792px" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -99,7 +119,7 @@ import { listBankcardLend, getBankcardLend, delBankcardLend, addBankcardLend, up
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require' import { require } from '@/utils/require'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const { bank_card_type, debit_type } = proxy.useDict('bank_card_type', 'debit_type') const { bank_card_type, debit_type, account_status } = proxy.useDict('bank_card_type', 'debit_type', 'account_status')
const bankcardList = ref([]) const bankcardList = ref([])
const open = ref(false) const open = ref(false)
@@ -121,11 +141,14 @@ const data = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
name: null, name: null,
status: null,
debitType: null,
type: '1' type: '1'
}, },
rules: { rules: {
name: [{ required: true, message: '储蓄卡名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '储蓄卡名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '储蓄卡卡号不能为空', trigger: 'blur' }], code: [{ required: true, message: '储蓄卡卡号不能为空', trigger: 'blur' }],
status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }] balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }]
} }
}) })
@@ -187,7 +210,8 @@ function reset() {
updateTime: null, updateTime: null,
delFlag: null, delFlag: null,
remark: null, remark: null,
debitType: null debitType: null,
status: null
} }
proxy.resetForm('bankcardRef') proxy.resetForm('bankcardRef')
} }

View File

@@ -6,6 +6,11 @@
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-form> </el-form>
<div class="search-btn-con"> <div class="search-btn-con">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -26,6 +31,11 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="账号" align="center" prop="code" /> <el-table-column label="账号" align="center" prop="code" />
<el-table-column label="账户状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="account_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="期货交易中心账号" align="center" prop="tradingCenterCode" /> <el-table-column label="期货交易中心账号" align="center" prop="tradingCenterCode" />
<el-table-column label="手续费" align="center" prop="commission" /> <el-table-column label="手续费" align="center" prop="commission" />
<el-table-column label="保证金比例" align="center" prop="bond" /> <el-table-column label="保证金比例" align="center" prop="bond" />
@@ -61,6 +71,11 @@
<el-form-item label="余额" prop="balance"> <el-form-item label="余额" prop="balance">
<el-input v-model="form.balance" placeholder="请输入余额" /> <el-input v-model="form.balance" placeholder="请输入余额" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="form.status" placeholder="请选择账户状态">
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联储蓄卡" prop="debitCard"> <el-form-item label="关联储蓄卡" prop="debitCard">
<el-select v-model="form.debitCard" placeholder="请选择关联储蓄卡" clearable> <el-select v-model="form.debitCard" 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.nameCode" :value="debitCard.id" />
@@ -110,7 +125,7 @@ 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'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const { future_stock_type } = proxy.useDict('future_stock_type') const { future_stock_type, account_status } = proxy.useDict('future_stock_type', 'account_status')
const futureStocksList = ref([]) const futureStocksList = ref([])
const open = ref(false) const open = ref(false)
@@ -133,6 +148,7 @@ const data = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
name: null, name: null,
status: null,
type: '1' type: '1'
}, },
queryDebitCardParams: { queryDebitCardParams: {
@@ -144,6 +160,7 @@ const data = reactive({
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '账号不能为空', trigger: 'blur' }], code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }], balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }],
status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
// password: [{ required: true, message: '密码不能为空', trigger: 'blur' }], // password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
// tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }], // tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }],
// tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }], // tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }],
@@ -216,7 +233,8 @@ function reset() {
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
delFlag: null, delFlag: null,
remark: null remark: null,
status: null
} }
proxy.resetForm('futureStocksRef') proxy.resetForm('futureStocksRef')
} }

View File

@@ -112,6 +112,7 @@ const data = reactive({
queryFutureStocksListParams: { queryFutureStocksListParams: {
pageNum: 1, pageNum: 1,
type: '1', type: '1',
status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -134,7 +134,7 @@ const data = reactive({
queryAccountParams: { queryAccountParams: {
pageNum: 1, pageNum: 1,
type: '5', type: '5',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -142,18 +142,19 @@ const data = reactive({
}, },
queryFutruesStocksParams: { queryFutruesStocksParams: {
pageNum: 1, pageNum: 1,
status: '1',
pageSize: 1000 pageSize: 1000
}, },
queryCreditParams: { queryCreditParams: {
pageNum: 1, pageNum: 1,
type: '2', type: '2',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
queryDebitParams: { queryDebitParams: {
pageNum: 1, pageNum: 1,
type: '1', type: '1',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -6,6 +6,16 @@
<el-form-item label="借贷名称" prop="name"> <el-form-item label="借贷名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入借贷名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.name" placeholder="请输入借贷名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="lendType">
<el-select v-model="queryParams.lendType" placeholder="请选择类型" clearable>
<el-option v-for="dict in lend_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-form> </el-form>
<div class="search-btn-con"> <div class="search-btn-con">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,6 +41,11 @@
<dict-tag :options="lend_type" :value="scope.row.lendType" /> <dict-tag :options="lend_type" :value="scope.row.lendType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="账户状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="account_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
@@ -54,6 +69,11 @@
<el-form-item label="账号" prop="code"> <el-form-item label="账号" prop="code">
<el-input v-model="form.code" placeholder="请输入账号" /> <el-input v-model="form.code" placeholder="请输入账号" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="form.status" placeholder="请选择账户状态">
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="类型" prop="lendType"> <el-form-item label="类型" prop="lendType">
<el-select v-model="form.lendType" placeholder="请选择类型"> <el-select v-model="form.lendType" placeholder="请选择类型">
<el-option v-for="dict in lend_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> <el-option v-for="dict in lend_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
@@ -84,7 +104,7 @@ import { listBankcardLend, getBankcardLend, delBankcardLend, addBankcardLend, up
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require' import { require } from '@/utils/require'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const { bank_card_type, lend_type } = proxy.useDict('bank_card_type', 'lend_type') const { bank_card_type, lend_type, account_status } = proxy.useDict('bank_card_type', 'lend_type', 'account_status')
const bankcardList = ref([]) const bankcardList = ref([])
const open = ref(false) const open = ref(false)
@@ -106,11 +126,14 @@ const data = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
name: null, name: null,
status: null,
lendType: null,
type: '3' type: '3'
}, },
rules: { rules: {
name: [{ required: true, message: '借贷名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '借贷名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '账号不能为空', trigger: 'blur' }], code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
lendType: [{ required: true, message: '类型不能为空', trigger: 'blur' }], lendType: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }] balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }]
} }
@@ -173,7 +196,8 @@ function reset() {
updateTime: null, updateTime: null,
delFlag: null, delFlag: null,
remark: null, remark: null,
lendType: null lendType: null,
status: null
} }
proxy.resetForm('bankcardRef') proxy.resetForm('bankcardRef')
} }

View File

@@ -154,13 +154,13 @@ const data = reactive({
queryLendParams: { queryLendParams: {
pageNum: 1, pageNum: 1,
type: '3', type: '3',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
queryDebitParams: { queryDebitParams: {
pageNum: 1, pageNum: 1,
type: '1', type: '1',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -204,6 +204,7 @@ const data = reactive({
queryCreditCardParams: { queryCreditCardParams: {
pageNum: 1, pageNum: 1,
type: '3', type: '3',
status: '1',
lendType: '1', lendType: '1',
pageSize: 1000 pageSize: 1000
}, },

View File

@@ -80,8 +80,8 @@
</div> </div>
</div> </div>
<!-- 添加或修改网络贷款对话框 --> <!-- 添加或修改网络贷款对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="880px" append-to-body>
<el-form ref="installmentHistoryRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="installmentHistoryRef" :model="form" :inline="true" :rules="rules" label-width="120px">
<el-form-item label="网贷机构" prop="bankCardLendId"> <el-form-item label="网贷机构" prop="bankCardLendId">
<el-select v-model="form.bankCardLendId" placeholder="请选择网贷机构" clearable> <el-select v-model="form.bankCardLendId" 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.nameCode" :value="creditCard.id" />
@@ -118,7 +118,7 @@
<el-form-item label="关闭日期" prop="closeDate"> <el-form-item label="关闭日期" prop="closeDate">
<el-date-picker clearable v-model="form.closeDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择关闭日期"> </el-date-picker> <el-date-picker clearable v-model="form.closeDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择关闭日期"> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" style="width: 792px" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -272,6 +272,7 @@ const data = reactive({
queryCreditCardParams: { queryCreditCardParams: {
pageNum: 1, pageNum: 1,
type: '3', type: '3',
status: '1',
lendType: '1', lendType: '1',
pageSize: 1000 pageSize: 1000
}, },

View File

@@ -140,6 +140,7 @@ const data = reactive({
queryCreditCardParams: { queryCreditCardParams: {
pageNum: 1, pageNum: 1,
type: '3', type: '3',
status: '1',
lendType: '2', lendType: '2',
pageSize: 1000 pageSize: 1000
}, },

View File

@@ -147,6 +147,7 @@ const data = reactive({
}, },
queryPosMachineParams: { queryPosMachineParams: {
pageNum: 1, pageNum: 1,
status: '1',
pageSize: 1000 pageSize: 1000
}, },
queryFutruesStocksParams: { queryFutruesStocksParams: {
@@ -157,7 +158,7 @@ const data = reactive({
queryBankCardLendParams: { queryBankCardLendParams: {
pageNum: 1, pageNum: 1,
type: '2', type: '2',
state: '1', status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {

View File

@@ -11,6 +11,11 @@
<el-option v-for="dict in pos_type" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in pos_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="商户名称" prop="merchantName"> <el-form-item label="商户名称" prop="merchantName">
<el-input v-model="queryParams.merchantName" placeholder="请输入商户名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.merchantName" placeholder="请输入商户名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
@@ -32,23 +37,28 @@
<div class="content-con" v-loading="loading"> <div class="content-con" v-loading="loading">
<el-table v-loading="loading" :data="posmachineList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)"> <el-table v-loading="loading" :data="posmachineList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="pos机名称" width="100" align="center" prop="name" /> <el-table-column label="pos机名称" align="center" prop="name" />
<el-table-column label="支付公司" align="center" prop="payCompany" /> <el-table-column label="支付公司" align="center" prop="payCompany" />
<el-table-column label="类型" align="center" width="80" prop="type"> <el-table-column label="类型" align="center" width="80" prop="type">
<template #default="scope"> <template #default="scope">
<dict-tag :options="pos_type" :value="scope.row.type" /> <dict-tag :options="pos_type" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="账户状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="account_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="商户名称" align="center" prop="merchantName" /> <el-table-column label="商户名称" align="center" prop="merchantName" />
<el-table-column label="刷卡费率" align="center" width="120" prop="rate" /> <el-table-column label="刷卡费率" align="center" width="120" prop="rate" />
<el-table-column label="费率+" align="center" width="80" prop="ratePlus" /> <el-table-column label="费率+" align="center" width="80" prop="ratePlus" />
<el-table-column label="结算卡" align="center" width="150" prop="bankNameCode" /> <el-table-column label="结算卡" align="center" width="150" prop="bankNameCode" />
<el-table-column label="商户类型" align="center" width="150" prop="merchantType"> <!-- <el-table-column label="商户类型" align="center" width="150" prop="merchantType">
<template #default="scope"> <template #default="scope">
<dict-tag :options="merchant_type" :value="scope.row.merchantType" /> <dict-tag :options="merchant_type" :value="scope.row.merchantType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商户码" align="center" prop="merchantCode" /> <el-table-column label="商户码" align="center" prop="merchantCode" /> -->
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="150" 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">
@@ -73,6 +83,11 @@
<el-option v-for="dict in pos_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> <el-option v-for="dict in pos_type" :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="status">
<el-select v-model="form.status" placeholder="请选择账户状态">
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="商户名称" prop="merchantName"> <el-form-item label="商户名称" prop="merchantName">
<el-input v-model="form.merchantName" placeholder="请输入商户名称" /> <el-input v-model="form.merchantName" placeholder="请输入商户名称" />
</el-form-item> </el-form-item>
@@ -127,7 +142,7 @@ 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'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const { merchant_type, pos_type } = proxy.useDict('merchant_type', 'pos_type') const { merchant_type, pos_type, account_status } = proxy.useDict('merchant_type', 'pos_type', 'account_status')
const posmachineList = ref([]) const posmachineList = ref([])
const open = ref(false) const open = ref(false)
@@ -151,6 +166,7 @@ const data = reactive({
pageSize: 10, pageSize: 10,
name: null, name: null,
type: null, type: null,
status: null,
merchantName: null merchantName: null
}, },
queryDebitCardParams: { queryDebitCardParams: {
@@ -160,6 +176,7 @@ const data = reactive({
}, },
rules: { rules: {
name: [{ required: true, message: 'pos机名称不能为空', trigger: 'blur' }], name: [{ required: true, message: 'pos机名称不能为空', trigger: 'blur' }],
status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
// code: [{ required: true, message: '编码不能为空', trigger: 'blur' }], // code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
// payCompany: [{ required: true, message: '支付公司不能为空', trigger: 'blur' }], // payCompany: [{ required: true, message: '支付公司不能为空', trigger: 'blur' }],
type: [{ required: true, message: '类型不能为空', trigger: 'change' }], type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
@@ -234,7 +251,8 @@ function reset() {
merchantType: null, merchantType: null,
merchantCode: null, merchantCode: null,
ratePlus: 0, ratePlus: 0,
activationDate: null activationDate: null,
status: null
} }
proxy.resetForm('posmachineRef') proxy.resetForm('posmachineRef')
} }

View File

@@ -6,6 +6,11 @@
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择账户状态" clearable>
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-form> </el-form>
<div class="search-btn-con"> <div class="search-btn-con">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -26,6 +31,11 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="账号" align="center" prop="code" /> <el-table-column label="账号" align="center" prop="code" />
<el-table-column label="账户状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="account_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="手续费" align="center" prop="commission" /> <el-table-column label="手续费" align="center" prop="commission" />
<el-table-column label="关联储蓄卡" align="center" prop="bankNameCode" /> <el-table-column label="关联储蓄卡" align="center" prop="bankNameCode" />
<el-table-column label="开户日期" align="center" prop="activationDate" width="180"> <el-table-column label="开户日期" align="center" prop="activationDate" width="180">
@@ -48,8 +58,8 @@
</div> </div>
</div> </div>
<!-- 添加或修改期货对话框 --> <!-- 添加或修改期货对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="900px" append-to-body>
<el-form ref="futureStocksRef" :model="form" :rules="rules" label-width="140px"> <el-form ref="futureStocksRef" :model="form" :inline="true" :rules="rules" label-width="130px">
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入名称" /> <el-input v-model="form.name" placeholder="请输入名称" />
</el-form-item> </el-form-item>
@@ -59,6 +69,11 @@
<el-form-item label="余额" prop="balance"> <el-form-item label="余额" prop="balance">
<el-input v-model="form.balance" placeholder="请输入余额" /> <el-input v-model="form.balance" placeholder="请输入余额" />
</el-form-item> </el-form-item>
<el-form-item label="账户状态" prop="status">
<el-select v-model="form.status" placeholder="请选择账户状态">
<el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="可用额度" prop="availableLimit"> <!-- <el-form-item label="可用额度" prop="availableLimit">
<el-input v-model="form.availableLimit" placeholder="请输入可用额度" /> <el-input v-model="form.availableLimit" placeholder="请输入可用额度" />
</el-form-item> --> </el-form-item> -->
@@ -96,7 +111,7 @@ 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'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const { future_stock_type } = proxy.useDict('future_stock_type') const { future_stock_type, account_status } = proxy.useDict('future_stock_type', 'account_status')
const futureStocksList = ref([]) const futureStocksList = ref([])
const open = ref(false) const open = ref(false)
@@ -119,6 +134,7 @@ const data = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
name: null, name: null,
status: null,
type: '2' type: '2'
}, },
queryDebitCardParams: { queryDebitCardParams: {
@@ -130,6 +146,7 @@ const data = reactive({
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '账号不能为空', trigger: 'blur' }], code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }], balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }],
status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
// password: [{ required: true, message: '密码不能为空', trigger: 'blur' }], // password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
// tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }], // tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }],
// tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }], // tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }],
@@ -202,7 +219,8 @@ function reset() {
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
delFlag: null, delFlag: null,
remark: null remark: null,
status: null
} }
proxy.resetForm('futureStocksRef') proxy.resetForm('futureStocksRef')
} }

View File

@@ -112,6 +112,7 @@ const data = reactive({
queryFutureStocksListParams: { queryFutureStocksListParams: {
pageNum: 1, pageNum: 1,
type: '2', type: '2',
status: '1',
pageSize: 1000 pageSize: 1000
}, },
rules: { rules: {