fix: 模块增加时间查询功能。
This commit is contained in:
@@ -23,6 +23,9 @@
|
||||
<el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="交易时间" prop="time">
|
||||
<el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="search-btn-con">
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -125,8 +128,10 @@ import {
|
||||
} from '@/api/invest/accountDealRecord'
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
import { listAccounts } from '@/api/invest/accounts'
|
||||
import dayjs from 'dayjs'
|
||||
import { require } from '@/utils/require'
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
const { deal_type, account_type, deal_category } = proxy.useDict('deal_type', 'account_type', 'deal_category')
|
||||
|
||||
const accountDealRecordList = ref([])
|
||||
@@ -152,6 +157,7 @@ const data = reactive({
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
type: null,
|
||||
time: '',
|
||||
accountId: null,
|
||||
dealType: null,
|
||||
dealCategory: null
|
||||
@@ -212,6 +218,15 @@ function getAddAccountList() {
|
||||
/** 查询账户交易记录列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
const timeRange = queryParams.value.time
|
||||
let st = ''
|
||||
let et = ''
|
||||
if (timeRange && timeRange.length === 2) {
|
||||
st = dayjs(timeRange[0]).format('YYYY-MM-DD')
|
||||
et = dayjs(timeRange[1]).format('YYYY-MM-DD')
|
||||
}
|
||||
queryParams.value.startTime = st
|
||||
queryParams.value.endTime = et
|
||||
listAccountDealRecord(queryParams.value).then((response) => {
|
||||
accountDealRecordList.value = response.rows
|
||||
total.value = response.total
|
||||
|
||||
@@ -97,11 +97,21 @@
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<el-dialog :title="titleDealRecord" v-model="openDealRecord" width="1100px" append-to-body destroy-on-close>
|
||||
<el-dialog :title="titleDealRecord" v-model="openDealRecord" width="1200px" append-to-body destroy-on-close>
|
||||
<el-form :model="queryDealRecordParams" ref="queryDealRecordRef" inline>
|
||||
<el-form-item label="选择时间" prop="startTime">
|
||||
<el-form-item label="交易时间" prop="time">
|
||||
<el-date-picker v-model="queryDealRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
|
||||
</el-form-item>
|
||||
<el-form-item label="交易类型" style="width: 220px" prop="dealType">
|
||||
<el-select v-model="queryDealRecordParams.dealType" placeholder="请选择交易类型" clearable>
|
||||
<el-option v-for="dict in deal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="交易类别" style="width: 220px" prop="dealCategory">
|
||||
<el-select v-model="queryDealRecordParams.dealCategory" placeholder="请选择交易类别" clearable>
|
||||
<el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="">
|
||||
<el-button type="primary" icon="Search" @click="handleDealRecordQuery">搜索</el-button>
|
||||
<el-button type="info" icon="Refresh" @click="resetDealRecordQuery">重置</el-button>
|
||||
@@ -121,14 +131,14 @@
|
||||
<dict-tag :options="deal_category" :value="scope.row.dealCategory" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="备注" align="center" width="380" prop="remark" />
|
||||
</el-table>
|
||||
<el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :title="titleTransferRecord" v-model="openTransferRecord" width="1100px" append-to-body destroy-on-close>
|
||||
<el-form :model="queryTransferRecordParams" ref="queryTransferRecordRef" inline>
|
||||
<el-form-item label="选择时间" prop="startTime">
|
||||
<el-form-item label="转账时间" prop="time">
|
||||
<el-date-picker
|
||||
v-model="queryTransferRecordParams.time"
|
||||
type="daterange"
|
||||
@@ -144,7 +154,7 @@
|
||||
</el-form>
|
||||
<el-table v-loading="loadingTransferRecord" :data="tableTransferRecordData">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<el-table-column label="名称" align="center" prop="name" />
|
||||
<el-table-column label="名称" align="center" width="380" prop="name" />
|
||||
<el-table-column label="转出账户" align="center" prop="outAccountName" />
|
||||
<el-table-column label="转入账户" align="center" prop="inAccountName" />
|
||||
<el-table-column label="转账时间" align="center" prop="createTime" />
|
||||
@@ -184,6 +194,8 @@ const dealRecordTotal = ref(0)
|
||||
|
||||
const queryDealRecordParams = ref({
|
||||
time: '',
|
||||
dealType: null,
|
||||
dealCategory: null,
|
||||
pageNum: 1
|
||||
})
|
||||
|
||||
@@ -194,7 +206,8 @@ const tableTransferRecordData = ref([])
|
||||
const transferRecordTotal = ref(0)
|
||||
const queryTransferRecordParams = ref({
|
||||
time: '',
|
||||
pageNum: 1
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
})
|
||||
|
||||
const operateList = ref([
|
||||
@@ -399,6 +412,7 @@ const handleDealRecordQuery = () => {
|
||||
}
|
||||
|
||||
const resetDealRecordQuery = () => {
|
||||
proxy.resetForm('queryDealRecordRef')
|
||||
queryDealRecordParams.value.time = ''
|
||||
dealRecordTotal.value = 0
|
||||
getDealRecordList(1)
|
||||
@@ -414,8 +428,10 @@ const getDealRecordList = (num, id) => {
|
||||
st = dayjs(timeRange[0]).format('YYYY-MM-DD')
|
||||
et = dayjs(timeRange[1]).format('YYYY-MM-DD')
|
||||
}
|
||||
|
||||
listAccountDealRecord({ accountId: currentAccountId.value, startTime: st, endTime: et, pageNum: num, pageSize: 10 }).then((res) => {
|
||||
queryDealRecordParams.value.startTime = st
|
||||
queryDealRecordParams.value.endTime = et
|
||||
queryDealRecordParams.value.accountId = currentAccountId.value
|
||||
listAccountDealRecord(queryDealRecordParams.value).then((res) => {
|
||||
loadingDealRecord.value = false
|
||||
tableDealRecordData.value = res.rows
|
||||
dealRecordTotal.value = res.total
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
<el-option v-for="bankCardLend in creditCardList" :key="bankCardLend.id" :label="bankCardLend.nameCode" :value="bankCardLend.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="还款时间" prop="time">
|
||||
<el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
|
||||
</el-form-item>
|
||||
<el-form-item label="还款方式" prop="dealType">
|
||||
<el-select v-model="queryParams.dealType" placeholder="请选择还款方式" clearable>
|
||||
<el-option v-for="dict in credit_repayment_type" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
@@ -106,6 +109,7 @@ import {
|
||||
updateAccountsTransferRecord
|
||||
} from '@/api/invest/accountsTransferRecord'
|
||||
import { listAccounts } from '@/api/invest/accounts'
|
||||
import dayjs from 'dayjs'
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
import { require } from '@/utils/require'
|
||||
const { proxy } = getCurrentInstance()
|
||||
@@ -135,6 +139,7 @@ const data = reactive({
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
type: '2',
|
||||
time: '',
|
||||
posId: null,
|
||||
inAccountId: null,
|
||||
outAccountId: null,
|
||||
@@ -213,6 +218,15 @@ function getFutruesStocksList() {
|
||||
/** 查询信用卡还款列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
const timeRange = queryParams.value.time
|
||||
let st = ''
|
||||
let et = ''
|
||||
if (timeRange && timeRange.length === 2) {
|
||||
st = dayjs(timeRange[0]).format('YYYY-MM-DD')
|
||||
et = dayjs(timeRange[1]).format('YYYY-MM-DD')
|
||||
}
|
||||
queryParams.value.startTime = st
|
||||
queryParams.value.endTime = et
|
||||
listAccountsTransferRecord(queryParams.value).then((response) => {
|
||||
accountsTransferRecordList.value = response.rows
|
||||
total.value = response.total
|
||||
|
||||
@@ -3,15 +3,18 @@
|
||||
<div class="search-con">
|
||||
<div class="title">查询条件</div>
|
||||
<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-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-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="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
|
||||
</el-select>
|
||||
<el-form-item label="转账时间" prop="time">
|
||||
<el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="search-btn-con">
|
||||
@@ -96,6 +99,7 @@ import {
|
||||
updateAccountsTransferRecord
|
||||
} from '@/api/invest/accountsTransferRecord'
|
||||
import { listAccounts } from '@/api/invest/accounts'
|
||||
import dayjs from 'dayjs'
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
import { require } from '@/utils/require'
|
||||
const { proxy } = getCurrentInstance()
|
||||
@@ -125,6 +129,7 @@ const data = reactive({
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
type: '4',
|
||||
time: '',
|
||||
posId: null,
|
||||
inAccountId: null,
|
||||
outAccountId: null,
|
||||
@@ -202,6 +207,15 @@ function getFutruesStocksList() {
|
||||
/** 查询储蓄卡转账列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
const timeRange = queryParams.value.time
|
||||
let st = ''
|
||||
let et = ''
|
||||
if (timeRange && timeRange.length === 2) {
|
||||
st = dayjs(timeRange[0]).format('YYYY-MM-DD')
|
||||
et = dayjs(timeRange[1]).format('YYYY-MM-DD')
|
||||
}
|
||||
queryParams.value.startTime = st
|
||||
queryParams.value.endTime = et
|
||||
listAccountsTransferRecord(queryParams.value).then((response) => {
|
||||
accountsTransferRecordList.value = response.rows
|
||||
total.value = response.total
|
||||
|
||||
@@ -13,6 +13,9 @@
|
||||
<el-option v-for="dict in profit_loss" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="交易时间" prop="time">
|
||||
<el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="search-btn-con">
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -31,14 +34,14 @@
|
||||
<div class="content-con" v-loading="loading">
|
||||
<el-table v-loading="loading" :data="accountDealRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
|
||||
<el-table-column label="账户名称" align="center" prop="accountName" />
|
||||
<el-table-column label="交易时间" align="center" prop="createTime" />
|
||||
<el-table-column label="交易金额" align="center" prop="amount" />
|
||||
<el-table-column label="当前余额" align="center" prop="currentBalance" />
|
||||
<el-table-column label="交易类型" align="center" prop="dealType">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="profit_loss" :value="scope.row.dealType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交易时间" align="center" prop="createTime" />
|
||||
<el-table-column label="交易金额" align="center" prop="amount" />
|
||||
<el-table-column label="当前余额" align="center" prop="currentBalance" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template v-slot="scope">
|
||||
@@ -96,6 +99,7 @@ import {
|
||||
} from '@/api/invest/accountDealRecord'
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
import { listAccounts } from '@/api/invest/accounts'
|
||||
import dayjs from 'dayjs'
|
||||
import { require } from '@/utils/require'
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { profit_loss, account_type, deal_category } = proxy.useDict('profit_loss', 'account_type', 'deal_category')
|
||||
@@ -122,6 +126,7 @@ const data = reactive({
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
type: '5',
|
||||
time: '',
|
||||
accountId: null,
|
||||
dealType: null,
|
||||
dealCategory: '2'
|
||||
@@ -167,6 +172,15 @@ function getAccountList() {
|
||||
/** 查询投资交易记录列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
const timeRange = queryParams.value.time
|
||||
let st = ''
|
||||
let et = ''
|
||||
if (timeRange && timeRange.length === 2) {
|
||||
st = dayjs(timeRange[0]).format('YYYY-MM-DD')
|
||||
et = dayjs(timeRange[1]).format('YYYY-MM-DD')
|
||||
}
|
||||
queryParams.value.startTime = st
|
||||
queryParams.value.endTime = et
|
||||
listAccountDealRecord(queryParams.value).then((response) => {
|
||||
accountDealRecordList.value = response.rows
|
||||
total.value = response.total
|
||||
|
||||
@@ -13,6 +13,9 @@
|
||||
<el-option v-for="futruesStocks in futruesStocksList" :key="futruesStocks.id" :label="futruesStocks.nameDebitNameCode" :value="futruesStocks.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="转账时间" prop="time">
|
||||
<el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="search-btn-con">
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -97,7 +100,7 @@ import {
|
||||
} from '@/api/invest/accountsTransferRecord'
|
||||
import { listAccounts } from '@/api/invest/accounts'
|
||||
import { listFutureStocks } from '@/api/invest/futureStocks'
|
||||
|
||||
import dayjs from 'dayjs'
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
import { require } from '@/utils/require'
|
||||
const { proxy } = getCurrentInstance()
|
||||
@@ -127,6 +130,7 @@ const data = reactive({
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
type: '3',
|
||||
time: '',
|
||||
posId: null,
|
||||
inAccountId: null,
|
||||
outAccountId: null,
|
||||
@@ -202,6 +206,15 @@ function getFutruesStocksList() {
|
||||
/** 查询投资账户记账列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
const timeRange = queryParams.value.time
|
||||
let st = ''
|
||||
let et = ''
|
||||
if (timeRange && timeRange.length === 2) {
|
||||
st = dayjs(timeRange[0]).format('YYYY-MM-DD')
|
||||
et = dayjs(timeRange[1]).format('YYYY-MM-DD')
|
||||
}
|
||||
queryParams.value.startTime = st
|
||||
queryParams.value.endTime = et
|
||||
listAccountsTransferRecord(queryParams.value).then((response) => {
|
||||
accountsTransferRecordList.value = response.rows
|
||||
total.value = response.total
|
||||
|
||||
@@ -13,6 +13,9 @@
|
||||
<el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCode" :value="lend.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="借贷时间" prop="time">
|
||||
<el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="search-btn-con">
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -104,6 +107,7 @@ import {
|
||||
updateAccountsTransferRecord
|
||||
} from '@/api/invest/accountsTransferRecord'
|
||||
import { listAccounts } from '@/api/invest/accounts'
|
||||
import dayjs from 'dayjs'
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
import { require } from '@/utils/require'
|
||||
const { proxy } = getCurrentInstance()
|
||||
@@ -135,6 +139,7 @@ const data = reactive({
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
type: '5',
|
||||
time: '',
|
||||
posId: null,
|
||||
inAccountId: null,
|
||||
outAccountId: null,
|
||||
@@ -210,6 +215,15 @@ function getDebitList() {
|
||||
/** 查询借贷记账列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
const timeRange = queryParams.value.time
|
||||
let st = ''
|
||||
let et = ''
|
||||
if (timeRange && timeRange.length === 2) {
|
||||
st = dayjs(timeRange[0]).format('YYYY-MM-DD')
|
||||
et = dayjs(timeRange[1]).format('YYYY-MM-DD')
|
||||
}
|
||||
queryParams.value.startTime = st
|
||||
queryParams.value.endTime = et
|
||||
listAccountsTransferRecord(queryParams.value).then((response) => {
|
||||
accountsTransferRecordList.value = response.rows
|
||||
total.value = response.total
|
||||
|
||||
@@ -13,6 +13,9 @@
|
||||
<el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="刷卡时间" prop="time">
|
||||
<el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="search-btn-con">
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
@@ -38,8 +41,8 @@
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<el-table-column label="POS机名称" align="center" prop="posName" />
|
||||
<el-table-column label="刷卡商户" align="center" prop="merchantName" />
|
||||
<el-table-column label="刷卡时间" align="center" prop="createTime" />
|
||||
<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="手续费" width="100" align="center" prop="commission" />
|
||||
<el-table-column label="储蓄卡" align="center" prop="inAccountName" />
|
||||
@@ -100,6 +103,7 @@ import {
|
||||
} from '@/api/invest/accountsTransferRecord'
|
||||
import { listPosmachine } from '@/api/invest/posmachine'
|
||||
import { listAccounts } from '@/api/invest/accounts'
|
||||
import dayjs from 'dayjs'
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
import { require } from '@/utils/require'
|
||||
const { proxy } = getCurrentInstance()
|
||||
@@ -129,6 +133,7 @@ const data = reactive({
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
type: '1',
|
||||
time: '',
|
||||
posId: null,
|
||||
inAccountId: null,
|
||||
outAccountId: null,
|
||||
@@ -199,6 +204,15 @@ function getFutruesStocksList() {
|
||||
/** 查询POS机刷卡列表 */
|
||||
function getList() {
|
||||
loading.value = true
|
||||
const timeRange = queryParams.value.time
|
||||
let st = ''
|
||||
let et = ''
|
||||
if (timeRange && timeRange.length === 2) {
|
||||
st = dayjs(timeRange[0]).format('YYYY-MM-DD')
|
||||
et = dayjs(timeRange[1]).format('YYYY-MM-DD')
|
||||
}
|
||||
queryParams.value.startTime = st
|
||||
queryParams.value.endTime = et
|
||||
listAccountsTransferRecord(queryParams.value).then((response) => {
|
||||
accountsTransferRecordList.value = response.rows
|
||||
total.value = response.total
|
||||
|
||||
Reference in New Issue
Block a user