fix: pos机管理,功能优化问题修复。
This commit is contained in:
@@ -39,20 +39,20 @@
|
|||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column label="pos机名称" 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="100" 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">
|
<el-table-column label="账户状态" width="100" align="center" prop="status">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :options="account_status" :value="scope.row.status" />
|
<dict-tag :options="account_status" :value="scope.row.status" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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="150" prop="rateName" />
|
||||||
<el-table-column label="费率+" align="center" width="80" prop="ratePlus" />
|
<el-table-column label="费率+" align="center" width="100" prop="ratePlus" />
|
||||||
<el-table-column label="结算卡" align="center" width="150" prop="bankNameCode" />
|
<el-table-column label="结算卡" align="center" 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" />
|
||||||
@@ -100,11 +100,18 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="刷卡费率" prop="rate">
|
<el-form-item label="刷卡费率" prop="rate">
|
||||||
<el-input v-model="form.rate" placeholder="请输入刷卡费率" />
|
<el-input v-model="form.rate" placeholder="请输入刷卡费率">
|
||||||
|
<template #suffix>%</template>
|
||||||
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="费率+" prop="ratePlus">
|
<el-form-item label="费率+" prop="ratePlus">
|
||||||
<el-input v-model="form.ratePlus" placeholder="请输入费率+" />
|
<el-input v-model="form.ratePlus" placeholder="请输入费率+" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="舍入模式" prop="roundingMode">
|
||||||
|
<el-select v-model="form.roundingMode" placeholder="请选择舍入模式">
|
||||||
|
<el-option v-for="dict in rounding_mode" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="厂商" prop="manufacture">
|
<el-form-item label="厂商" prop="manufacture">
|
||||||
<el-input v-model="form.manufacture" placeholder="请输入厂商" />
|
<el-input v-model="form.manufacture" placeholder="请输入厂商" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -142,7 +149,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, account_status } = proxy.useDict('merchant_type', 'pos_type', 'account_status')
|
const { merchant_type, pos_type, account_status, rounding_mode } = proxy.useDict('merchant_type', 'pos_type', 'account_status', 'rounding_mode')
|
||||||
|
|
||||||
const posmachineList = ref([])
|
const posmachineList = ref([])
|
||||||
const open = ref(false)
|
const open = ref(false)
|
||||||
@@ -184,6 +191,7 @@ const data = reactive({
|
|||||||
merchantName: [{ required: true, message: '商户名称不能为空', trigger: 'blur' }],
|
merchantName: [{ required: true, message: '商户名称不能为空', trigger: 'blur' }],
|
||||||
rate: [{ required: true, message: '刷卡费率不能为空', trigger: 'blur' }],
|
rate: [{ required: true, message: '刷卡费率不能为空', trigger: 'blur' }],
|
||||||
ratePlus: [{ required: true, message: '费率+不能为空', trigger: 'blur' }],
|
ratePlus: [{ required: true, message: '费率+不能为空', trigger: 'blur' }],
|
||||||
|
roudingMode: [{ required: true, message: '舍入模式不能为空', trigger: 'blur' }],
|
||||||
debitCard: [{ required: true, message: '结算卡不能为空', trigger: 'blur' }]
|
debitCard: [{ required: true, message: '结算卡不能为空', trigger: 'blur' }]
|
||||||
// merchantType: [{ required: true, message: '商户类型不能为空', trigger: 'change' }]
|
// merchantType: [{ required: true, message: '商户类型不能为空', trigger: 'change' }]
|
||||||
}
|
}
|
||||||
@@ -252,7 +260,8 @@ function reset() {
|
|||||||
merchantCode: null,
|
merchantCode: null,
|
||||||
ratePlus: 0,
|
ratePlus: 0,
|
||||||
activationDate: null,
|
activationDate: null,
|
||||||
status: null
|
status: null,
|
||||||
|
roudingMode: '1'
|
||||||
}
|
}
|
||||||
proxy.resetForm('posmachineRef')
|
proxy.resetForm('posmachineRef')
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user