Browse Source

交易信息相关修改

main
GhubCy 2 months ago
parent
commit
d24516b499
  1. 22
      src/views/business/creditRule/index.vue
  2. 133
      src/views/business/feeRecord/index.vue
  3. 133
      src/views/business/feeStandard/index.vue
  4. 139
      src/views/business/tradingChannel/index.vue
  5. 15
      src/views/business/tradingChannelRecord/index.vue

22
src/views/business/creditRule/index.vue

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="规则名称" prop="ruleName"> <el-form-item :label="$t('credit.creditRule.ruleName')" prop="ruleName">
<el-input <el-input
v-model="queryParams.ruleName" v-model="queryParams.ruleName"
placeholder="请输入规则名称" placeholder="请输入规则名称"
@ -9,7 +9,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="生效日期" prop="effectiveDate"> <el-form-item :label="$t('credit.creditRule.effectiveDate')" prop="effectiveDate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.effectiveDate" v-model="queryParams.effectiveDate"
type="date" type="date"
@ -17,7 +17,7 @@
placeholder="请选择规则生效日期"> placeholder="请选择规则生效日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="失效日期" prop="expirationDate"> <el-form-item :label="$t('credit.creditRule.expirationDate')" prop="expirationDate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.expirationDate" v-model="queryParams.expirationDate"
type="date" type="date"
@ -25,7 +25,7 @@
placeholder="请选择规则失效日期"> placeholder="请选择规则失效日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="优先级" prop="priority"> <el-form-item :label="$t('credit.creditRule.priority')" prop="priority">
<el-input <el-input
v-model="queryParams.priority" v-model="queryParams.priority"
placeholder="请输入规则优先级" placeholder="请输入规则优先级"
@ -33,7 +33,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="适用类型" prop="applicableUserType"> <el-form-item :label="$t('credit.creditRule.applicableUserType')" prop="applicableUserType">
<el-input <el-input
v-model="queryParams.applicableUserType" v-model="queryParams.applicableUserType"
placeholder="请输入规则优先级" placeholder="请输入规则优先级"
@ -41,7 +41,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="规则场景" prop="scene"> <el-form-item :label="$t('credit.creditRule.scene')" prop="scene">
<el-input <el-input
v-model="queryParams.scene" v-model="queryParams.scene"
placeholder="请输入规则场景" placeholder="请输入规则场景"
@ -182,7 +182,7 @@
<!-- 添加或修改信用规则对话框 --> <!-- 添加或修改信用规则对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="auto"> <el-form ref="form" :model="form" :rules="rules" label-width="auto">
<el-form-item label="规则名称" prop="ruleName"> <el-form-item :label="$t('credit.creditRule.ruleName')" prop="ruleName">
<el-input v-model="form.ruleName" placeholder="请输入规则名称"/> <el-input v-model="form.ruleName" placeholder="请输入规则名称"/>
</el-form-item> </el-form-item>
<el-form-item label="规则描述" prop="ruleDescription"> <el-form-item label="规则描述" prop="ruleDescription">
@ -208,7 +208,7 @@
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否启用" prop="isEnabled"> <el-form-item :label="$t('credit.creditRule.isEnabled')" prop="isEnabled">
<el-radio-group v-model="form.isEnabled" style="margin-right: 20px;"> <el-radio-group v-model="form.isEnabled" style="margin-right: 20px;">
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio> <el-radio :label="0"></el-radio>
@ -216,7 +216,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="反馈方向" prop="feedbackDirection"> <el-form-item :label="$t('credit.creditRule.feedbackDirection')" prop="feedbackDirection">
<el-radio-group v-model="form.feedbackDirection"> <el-radio-group v-model="form.feedbackDirection">
<el-radio label="1"></el-radio> <el-radio label="1"></el-radio>
<el-radio label="0"></el-radio> <el-radio label="0"></el-radio>
@ -226,13 +226,13 @@
</el-row> </el-row>
<el-form-item label="规则场景" prop="scene"> <el-form-item :label="$t('credit.creditRule.scene')" prop="scene">
<el-input v-model="form.scene" placeholder="请输入规则场景"/> <el-input v-model="form.scene" placeholder="请输入规则场景"/>
</el-form-item> </el-form-item>
<el-form-item label="适用用户" prop="applicableUserType"> <el-form-item label="适用用户" prop="applicableUserType">
<el-input v-model="form.applicableUserType" placeholder="请输入适用用户"/> <el-input v-model="form.applicableUserType" placeholder="请输入适用用户"/>
</el-form-item> </el-form-item>
<el-form-item label="规则值" prop="value"> <el-form-item :label="$t('credit.creditRule.value')" prop="value">
<el-input v-model="form.value" placeholder="请输入规则值"/> <el-input v-model="form.value" placeholder="请输入规则值"/>
</el-form-item> </el-form-item>
</el-form> </el-form>

133
src/views/business/feeRecord/index.vue

@ -1,18 +1,18 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单编号" prop="relatedOrderId"> <el-form-item label="用户编号" prop="userId">
<el-input <el-input
v-model="queryParams.relatedOrderId" v-model="queryParams.userId"
placeholder="请输入关联订单编号" placeholder="请输入用户编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="用户编号" prop="userId"> <el-form-item label="订单编号" prop="relatedOrderId">
<el-input <el-input
v-model="queryParams.userId" v-model="queryParams.relatedOrderId"
placeholder="请输入用户编号" placeholder="请输入关联订单编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -25,6 +25,27 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="业务类型" prop="businessType">
<el-select
v-model="queryParams.businessType"
placeholder="请选择业务类型"
clearable
>
<el-option
v-for="dict in dict.businessTypeOptions"
: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 label="启用" value="1" />
<el-option label="停用" value="0" />
</el-select>
</el-form-item>
<el-form-item label="收取时间" prop="feeCollectionTime"> <el-form-item label="收取时间" prop="feeCollectionTime">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.feeCollectionTime" v-model="queryParams.feeCollectionTime"
@ -34,7 +55,10 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{
$t('common.button.search')
}}
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -93,7 +117,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="id" v-if="true"/> <el-table-column label="记录编号" align="center" prop="id" v-if="true"/>
<el-table-column label="订单编号" align="center" prop="relatedOrderId"/> <el-table-column label="订单编号" align="center" prop="relatedOrderId"/>
<el-table-column label="业务类型" align="center" prop="businessType"/> <el-table-column label="业务类型" align="center" prop="businessType">
<template slot-scope="scope">
<span>{{ getBusinessTypeLabel(scope.row.businessType) }}</span>
</template>
</el-table-column>
<el-table-column label="用户编号" align="center" prop="userId"/> <el-table-column label="用户编号" align="center" prop="userId"/>
<el-table-column label="手续费标准号" align="center" prop="feeStandardId"/> <el-table-column label="手续费标准号" align="center" prop="feeStandardId"/>
<el-table-column label="优惠规则号" align="center" prop="discountRuleId"/> <el-table-column label="优惠规则号" align="center" prop="discountRuleId"/>
@ -105,7 +133,11 @@
<span>{{ parseTime(scope.row.feeCollectionTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.feeCollectionTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status"/> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span>{{ scope.row.status == '1' ? '启用' : '停用' }}</span>
</template>
</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 slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -167,6 +199,34 @@
<el-form-item label="实收手续费金额" prop="actualFeeAmount"> <el-form-item label="实收手续费金额" prop="actualFeeAmount">
<el-input v-model="form.actualFeeAmount" placeholder="请输入实际收取手续费金额"/> <el-input v-model="form.actualFeeAmount" placeholder="请输入实际收取手续费金额"/>
</el-form-item> </el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="业务类型" prop="businessType">
<el-select
v-model="form.businessType"
placeholder="请选择业务类型"
clearable
>
<el-option
v-for="dict in dict.businessTypeOptions"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio label="1">启用</el-radio>
<el-radio label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="收取时间" prop="feeCollectionTime"> <el-form-item label="收取时间" prop="feeCollectionTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.feeCollectionTime" v-model="form.feeCollectionTime"
@ -177,7 +237,10 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">{{ $t('common.button.confirm') }}</el-button> <el-button :loading="buttonLoading" type="primary" @click="submitForm">{{
$t('common.button.confirm')
}}
</el-button>
<el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button> <el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -185,6 +248,9 @@
<!-- 手续费记录详情 --> <!-- 手续费记录详情 -->
<el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body> <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="auto"> <el-form ref="form" :model="form" label-width="auto">
<el-form-item label="业务类型:">
{{ getBusinessTypeLabel(form.businessType) }}
</el-form-item>
<el-form-item label="订单编号:"> <el-form-item label="订单编号:">
{{ form.relatedOrderId }} {{ form.relatedOrderId }}
</el-form-item> </el-form-item>
@ -214,6 +280,9 @@
placeholder="请选择手续费收取时间"> placeholder="请选择手续费收取时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="状态:">
{{ form.status === '1' ? '启用' : '停用' }}
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
@ -231,6 +300,17 @@ export default {
return { return {
// loading // loading
buttonLoading: false, buttonLoading: false,
//
dict: {
businessTypeOptions: [
{value: '1', label: '转账'},
{value: '2', label: '代缴'},
{value: '3', label: '充值'},
{value: '4', label: '提现'},
{value: '5', label: '收款'},
{value: '6', label: '付款'}
]
},
// //
loading: true, loading: true,
// //
@ -274,13 +354,28 @@ export default {
{required: true, message: "关联订单编号不能为空", trigger: "blur"} {required: true, message: "关联订单编号不能为空", trigger: "blur"}
], ],
userId: [ userId: [
{required: true, message: "用户编号不能为空", trigger: "blur"} {required: true, message: "用户编号不能为空", trigger: "blur"},
{pattern: /^\d+$/, message: "请输入数字", trigger: "blur"}
], ],
feeStandardId: [ feeStandardId: [
{required: true, message: "手续费标准编号不能为空", trigger: "blur"} {required: true, message: "手续费标准编号不能为空", trigger: "blur"},
{pattern: /^\d+$/, message: "请输入数字", trigger: "blur"}
], ],
discountRuleId: [ discountRuleId: [
{required: true, message: "优惠规则编号不能为空", trigger: "blur"} {required: true, message: "优惠规则编号不能为空", trigger: "blur"},
{pattern: /^\d+$/, message: "请输入数字", trigger: "blur"}
],
calculatedFeeAmount: [
{required: true, message: "手续费金额不能为空", trigger: "blur"},
{pattern: /^\d+(\.\d+)?$/, message: "请输入数字", trigger: "blur"}
],
discountedFeeAmount: [
{required: true, message: "减免手续费金额不能为空", trigger: "blur"},
{pattern: /^\d+(\.\d+)?$/, message: "请输入数字", trigger: "blur"}
],
actualFeeAmount: [
{required: true, message: "实收手续费金额不能为空", trigger: "blur"},
{pattern: /^\d+(\.\d+)?$/, message: "请输入数字", trigger: "blur"}
] ]
} }
}; };
@ -289,6 +384,18 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 转换业务类型 */
getBusinessTypeLabel(type) {
const map = {
'1': '转账',
'2': '代缴',
'3': '充值',
'4': '提现',
'5': '收款',
'6': '付款'
};
return map[type] || type;
},
/** 查询手续费记录列表 */ /** 查询手续费记录列表 */
getList() { getList() {
this.loading = true; this.loading = true;

133
src/views/business/feeStandard/index.vue

@ -1,13 +1,35 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="业务类型" prop="businessType">
<el-select v-model="queryParams.businessType" placeholder="请选择业务类型" clearable>
<el-option
v-for="item in dict.businessTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="用户级别" prop="userLevel"> <el-form-item label="用户级别" prop="userLevel">
<el-input <el-select v-model="queryParams.userLevel" placeholder="请选择用户级别" clearable>
v-model="queryParams.userLevel" <el-option
placeholder="请输入用户级别" v-for="item in dict.userLevelOptions"
clearable :key="item.value"
@keyup.enter.native="handleQuery" :label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="手续费类型" prop="feeType">
<el-select v-model="queryParams.feeType" placeholder="请选择手续费类型" clearable>
<el-option
v-for="item in dict.feeTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button>
@ -68,9 +90,21 @@
<el-table v-loading="loading" :data="feeStandardList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="feeStandardList" @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" prop="id" v-if="true"/> <el-table-column label="手续费标准编号" align="center" prop="id" v-if="true"/>
<el-table-column label="业务类型" align="center" prop="businessType"/> <el-table-column label="业务类型" align="center" prop="businessType">
<el-table-column label="用户级别" align="center" prop="userLevel"/> <template slot-scope="scope">
<el-table-column label="手续费类型" align="center" prop="feeType"/> {{ getDictLabel('businessType', scope.row.businessType) }}
</template>
</el-table-column>
<el-table-column label="用户级别" align="center" prop="userLevel">
<template slot-scope="scope">
{{ getDictLabel('userLevel', scope.row.userLevel) }}
</template>
</el-table-column>
<el-table-column label="手续费类型" align="center" prop="feeType">
<template slot-scope="scope">
{{ getDictLabel('feeType', scope.row.feeType) }}
</template>
</el-table-column>
<el-table-column label="手续费值" align="center" prop="feeValue"/> <el-table-column label="手续费值" align="center" prop="feeValue"/>
<el-table-column label="最低手续费" align="center" prop="minFee"/> <el-table-column label="最低手续费" align="center" prop="minFee"/>
<el-table-column label="最高手续费" align="center" prop="maxFee"/> <el-table-column label="最高手续费" align="center" prop="maxFee"/>
@ -115,8 +149,35 @@
<!-- 添加或修改手续费规则对话框 --> <!-- 添加或修改手续费规则对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="auto"> <el-form ref="form" :model="form" :rules="rules" label-width="auto">
<el-form-item label="业务类型" prop="businessType">
<el-select v-model="form.businessType" placeholder="请选择业务类型">
<el-option
v-for="item in dict.businessTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="用户级别" prop="userLevel"> <el-form-item label="用户级别" prop="userLevel">
<el-input v-model="form.userLevel" placeholder="请输入用户级别"/> <el-select v-model="form.userLevel" placeholder="请选择用户级别">
<el-option
v-for="item in dict.userLevelOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="手续费类型" prop="feeType">
<el-select v-model="form.feeType" placeholder="请选择手续费类型">
<el-option
v-for="item in dict.feeTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="手续费值" prop="feeValue"> <el-form-item label="手续费值" prop="feeValue">
<el-input v-model="form.feeValue" placeholder="请输入手续费值"/> <el-input v-model="form.feeValue" placeholder="请输入手续费值"/>
@ -140,8 +201,14 @@
<!-- 手续费规则详情 --> <!-- 手续费规则详情 -->
<el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body> <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="auto"> <el-form ref="form" :model="form" label-width="auto">
<el-form-item label="业务类型:">
{{ getDictLabel('businessType', form.businessType) }}
</el-form-item>
<el-form-item label="用户级别:"> <el-form-item label="用户级别:">
{{ form.userLevel }} {{ getDictLabel('userLevel', form.userLevel) }}
</el-form-item>
<el-form-item label="手续费类型:">
{{ getDictLabel('feeType', form.feeType) }}
</el-form-item> </el-form-item>
<el-form-item label="手续费值:"> <el-form-item label="手续费值:">
{{ form.feeValue }} {{ form.feeValue }}
@ -181,6 +248,27 @@ export default {
buttonLoading: false, buttonLoading: false,
// //
loading: true, loading: true,
//
dict: {
businessTypeOptions: [
{ label: '转账', value: '1' },
{ label: '代缴', value: '2' },
{ label: '充值', value: '3' },
{ label: '提现', value: '4' },
{ label: '收款', value: '5' },
{ label: '付款', value: '6' }
],
userLevelOptions: [
{ label: '普通用户', value: '1' },
{ label: 'VIP用户', value: '2' },
{ label: '企业用户', value: '3' }
],
feeTypeOptions: [
{ label: '定额', value: '1' },
{ label: '比例', value: '2' },
{ label: '阶梯', value: '3' }
]
},
// //
ids: [], ids: [],
// //
@ -214,7 +302,20 @@ export default {
// //
form: {}, form: {},
// //
rules: {} rules: {
feeValue: [
{ required: true, message: "请输入手续费值", trigger: "blur" },
{ pattern: /^\d+(\.\d+)?$/, message: "请输入数字", trigger: "blur" }
],
minFee: [
{ required: true, message: "请输入最低手续费", trigger: "blur" },
{ pattern: /^\d+(\.\d+)?$/, message: "请输入数字", trigger: "blur" }
],
maxFee: [
{ required: true, message: "请输入最高手续费", trigger: "blur" },
{ pattern: /^\d+(\.\d+)?$/, message: "请输入数字", trigger: "blur" }
]
}
}; };
}, },
created() { created() {
@ -340,6 +441,16 @@ export default {
this.download('business/feeStandard/export', { this.download('business/feeStandard/export', {
...this.queryParams ...this.queryParams
}, `feeStandard_${new Date().getTime()}.xlsx`) }, `feeStandard_${new Date().getTime()}.xlsx`)
},
/**
* 页面中字典键值转换
* @param type
* @param value
*/
getDictLabel(type, value) {
const dict = this.dict[`${type}Options`] || [];
const item = dict.find(item => item.value == value);
return item ? item.label : value;
} }
} }
}; };

139
src/views/business/tradingChannel/index.vue

@ -9,6 +9,16 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="通道状态" prop="channelStatus">
<el-select v-model="queryParams.channelStatus" placeholder="请选择通道状态" clearable>
<el-option
v-for="item in channelStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="通道版本" prop="channelVersion"> <el-form-item label="通道版本" prop="channelVersion">
<el-input <el-input
v-model="queryParams.channelVersion" v-model="queryParams.channelVersion"
@ -17,40 +27,19 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="APPID" prop="channelAppid"> <el-form-item label="AppId" prop="channelAppId">
<el-input
v-model="queryParams.channelAppid"
placeholder="请输入APPID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="密钥版本" prop="channelKeyVersion">
<el-input
v-model="queryParams.channelKeyVersion"
placeholder="请输入密钥版本"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="回调地址" prop="channelCallbackUrl">
<el-input
v-model="queryParams.channelCallbackUrl"
placeholder="请输入回调地址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="其它参数" prop="channelOtherParam">
<el-input <el-input
v-model="queryParams.channelOtherParam" v-model="queryParams.channelAppId"
placeholder="请输入其它参数" placeholder="请输入AppId"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{
$t('common.button.search')
}}
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.button.reset') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -64,7 +53,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['business:tradingChannel:add']" v-hasPermi="['business:tradingChannel:add']"
>{{ $t('common.button.add') }}</el-button> >{{ $t('common.button.add') }}
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -75,7 +65,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['business:tradingChannel:edit']" v-hasPermi="['business:tradingChannel:edit']"
>{{ $t('common.button.edit') }}</el-button> >{{ $t('common.button.edit') }}
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -86,7 +77,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['business:tradingChannel:remove']" v-hasPermi="['business:tradingChannel:remove']"
>{{ $t('common.button.delete') }}</el-button> >{{ $t('common.button.delete') }}
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -96,7 +88,8 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['business:tradingChannel:export']" v-hasPermi="['business:tradingChannel:export']"
>{{ $t('common.button.export') }}</el-button> >{{ $t('common.button.export') }}
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -105,9 +98,13 @@
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="ID" align="center" prop="id" v-if="true"/> <el-table-column label="ID" align="center" prop="id" v-if="true"/>
<el-table-column label="通道编码" align="center" prop="channelCode"/> <el-table-column label="通道编码" align="center" prop="channelCode"/>
<el-table-column label="通道状态" align="center" prop="channelStatus" /> <el-table-column label="通道状态" align="center">
<template slot-scope="scope">
{{ scope.row.channelStatus === '1' ? '启用' : '禁用' }}
</template>
</el-table-column>
<el-table-column label="通道版本" align="center" prop="channelVersion"/> <el-table-column label="通道版本" align="center" prop="channelVersion"/>
<el-table-column label="APPID" align="center" prop="channelAppid" /> <el-table-column label="AppId" align="center" prop="channelAppId"/>
<el-table-column label="加密公钥" align="center" prop="channelPublicKey"/> <el-table-column label="加密公钥" align="center" prop="channelPublicKey"/>
<el-table-column label="加密私钥" align="center" prop="channelPrivateKey"/> <el-table-column label="加密私钥" align="center" prop="channelPrivateKey"/>
<el-table-column label="密钥版本" align="center" prop="channelKeyVersion"/> <el-table-column label="密钥版本" align="center" prop="channelKeyVersion"/>
@ -120,21 +117,24 @@
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)"
>{{ $t('common.button.detail') }}</el-button> >{{ $t('common.button.detail') }}
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['business:tradingChannel:edit']" v-hasPermi="['business:tradingChannel:edit']"
>{{ $t('common.button.edit') }}</el-button> >{{ $t('common.button.edit') }}
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['business:tradingChannel:remove']" v-hasPermi="['business:tradingChannel:remove']"
>{{ $t('common.button.delete') }}</el-button> >{{ $t('common.button.delete') }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -156,8 +156,8 @@
<el-form-item label="通道版本" prop="channelVersion"> <el-form-item label="通道版本" prop="channelVersion">
<el-input v-model="form.channelVersion" placeholder="请输入通道版本"/> <el-input v-model="form.channelVersion" placeholder="请输入通道版本"/>
</el-form-item> </el-form-item>
<el-form-item label="APPID" prop="channelAppid"> <el-form-item label="AppId" prop="channelAppId">
<el-input v-model="form.channelAppid" placeholder="请输入APPID" /> <el-input v-model="form.channelAppId" placeholder="请输入AppId"/>
</el-form-item> </el-form-item>
<el-form-item label="加密公钥" prop="channelPublicKey"> <el-form-item label="加密公钥" prop="channelPublicKey">
<el-input v-model="form.channelPublicKey" placeholder="请输入加密公钥"/> <el-input v-model="form.channelPublicKey" placeholder="请输入加密公钥"/>
@ -174,9 +174,22 @@
<el-form-item label="其它参数" prop="channelOtherParam"> <el-form-item label="其它参数" prop="channelOtherParam">
<el-input v-model="form.channelOtherParam" placeholder="请输入其它参数"/> <el-input v-model="form.channelOtherParam" placeholder="请输入其它参数"/>
</el-form-item> </el-form-item>
<el-form-item label="通道状态" prop="channelStatus">
<el-radio-group v-model="form.channelStatus">
<el-radio
v-for="item in channelStatusOptions"
:key="item.value"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">{{ $t('common.button.confirm') }}</el-button> <el-button :loading="buttonLoading" type="primary" @click="submitForm">{{
$t('common.button.confirm')
}}
</el-button>
<el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button> <el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -190,8 +203,8 @@
<el-form-item label="通道版本:"> <el-form-item label="通道版本:">
{{ form.channelVersion }} {{ form.channelVersion }}
</el-form-item> </el-form-item>
<el-form-item label="APPID:"> <el-form-item label="AppId:">
{{form.channelAppid}} {{ form.channelAppId }}
</el-form-item> </el-form-item>
<el-form-item label="加密公钥:"> <el-form-item label="加密公钥:">
{{ form.channelPublicKey }} {{ form.channelPublicKey }}
@ -208,6 +221,9 @@
<el-form-item label="其它参数:"> <el-form-item label="其它参数:">
{{ form.channelOtherParam }} {{ form.channelOtherParam }}
</el-form-item> </el-form-item>
<el-form-item label="通道状态:">
{{ form.channelStatus === '1' ? '启用' : '禁用' }}
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button> <el-button @click="cancel">{{ $t('common.button.cancel') }}</el-button>
@ -217,12 +233,23 @@
</template> </template>
<script> <script>
import { listTradingChannel, getTradingChannel, delTradingChannel, addTradingChannel, updateTradingChannel } from "@/api/business/tradingChannel"; import {
listTradingChannel,
getTradingChannel,
delTradingChannel,
addTradingChannel,
updateTradingChannel
} from "@/api/business/tradingChannel";
export default { export default {
name: "TradingChannel", name: "TradingChannel",
data() { data() {
return { return {
//
channelStatusOptions: [
{value: '1', label: '启用'},
{value: '0', label: '禁用'}
],
// loading // loading
buttonLoading: false, buttonLoading: false,
// //
@ -252,7 +279,7 @@ export default {
channelCode: undefined, channelCode: undefined,
channelStatus: undefined, channelStatus: undefined,
channelVersion: undefined, channelVersion: undefined,
channelAppid: undefined, channelAppId: undefined,
channelPublicKey: undefined, channelPublicKey: undefined,
channelPrivateKey: undefined, channelPrivateKey: undefined,
channelKeyVersion: undefined, channelKeyVersion: undefined,
@ -263,9 +290,6 @@ export default {
form: {}, form: {},
// //
rules: { rules: {
id: [
{ required: true, message: "ID不能为空", trigger: "blur" }
],
channelCode: [ channelCode: [
{required: true, message: "通道编码不能为空", trigger: "blur"} {required: true, message: "通道编码不能为空", trigger: "blur"}
], ],
@ -275,23 +299,8 @@ export default {
channelVersion: [ channelVersion: [
{required: true, message: "通道版本不能为空", trigger: "blur"} {required: true, message: "通道版本不能为空", trigger: "blur"}
], ],
channelAppid: [ channelAppId: [
{ required: true, message: "APPID不能为空", trigger: "blur" } {required: true, message: "AppId不能为空", trigger: "blur"}
],
channelPublicKey: [
{ required: true, message: "加密公钥不能为空", trigger: "blur" }
],
channelPrivateKey: [
{ required: true, message: "加密私钥不能为空", trigger: "blur" }
],
channelKeyVersion: [
{ required: true, message: "密钥版本不能为空", trigger: "blur" }
],
channelCallbackUrl: [
{ required: true, message: "回调地址不能为空", trigger: "blur" }
],
channelOtherParam: [
{ required: true, message: "其它参数不能为空", trigger: "blur" }
], ],
} }
}; };
@ -322,7 +331,7 @@ export default {
channelCode: undefined, channelCode: undefined,
channelStatus: undefined, channelStatus: undefined,
channelVersion: undefined, channelVersion: undefined,
channelAppid: undefined, channelAppId: undefined,
channelPublicKey: undefined, channelPublicKey: undefined,
channelPrivateKey: undefined, channelPrivateKey: undefined,
channelKeyVersion: undefined, channelKeyVersion: undefined,

15
src/views/business/tradingChannelRecord/index.vue

@ -275,7 +275,20 @@ export default {
// //
form: {}, form: {},
// //
rules: {} rules: {
userId: [
{ required: true, message: "请输入用户ID", trigger: "blur" },
{ pattern: /^\d+$/, message: "请输入数字", trigger: "blur" }
],
channelId: [
{ required: true, message: "请输入通道ID", trigger: "blur" },
{ pattern: /^\d+$/, message: "请输入数字", trigger: "blur" }
],
amount: [
{ required: true, message: "请输入交易金额", trigger: "blur" },
{ pattern: /^\d+(\.\d+)?$/, message: "请输入数字", trigger: "blur" }
]
}
}; };
}, },
created() { created() {

Loading…
Cancel
Save