qdintc/intc-vue3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tianyongbao
2024-07-17 19:42:47 +08:00
parent 1fa79336a7
commit a500048a97
23 changed files with 222 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/invest/posmachine/index.vue
View File

@@ -11,6 +11,11 @@
<el-option v-for="dict in pos_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-item label="商户名称" prop="merchantName">
<el-input v-model="queryParams.merchantName" placeholder="请输入商户名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
@@ -32,23 +37,28 @@
<div class="content-con" v-loading="loading">
<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 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" width="80" prop="type">
<template #default="scope">
<dict-tag :options="pos_type" :value="scope.row.type" />
</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 label="商户名称" align="center" prop="merchantName" />
<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="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">
<dict-tag :options="merchant_type" :value="scope.row.merchantType" />
</template>
</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">
<template v-slot="scope">
<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-select>
</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-input v-model="form.merchantName" placeholder="请输入商户名称" />
</el-form-item>
@@ -127,7 +142,7 @@ import { listBankcardLend } from '@/api/invest/bankcardlend'
// eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require'
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 open = ref(false)
@@ -151,6 +166,7 @@ const data = reactive({
pageSize: 10,
name: null,
type: null,
status: null,
merchantName: null
},
queryDebitCardParams: {
@@ -160,6 +176,7 @@ const data = reactive({
},
rules: {
name: [{ required: true, message: 'pos机名称不能为空', trigger: 'blur' }],
status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
// code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
// payCompany: [{ required: true, message: '支付公司不能为空', trigger: 'blur' }],
type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
@@ -234,7 +251,8 @@ function reset() {
merchantType: null,
merchantCode: null,
ratePlus: 0,
activationDate: null
activationDate: null,
status: null
}
proxy.resetForm('posmachineRef')
}