Commit 1c1aca1d by wusiyi

faat: 收款账户支持线下收款 #1005780

parent 13f38cf0
......@@ -99,7 +99,7 @@
:value="item.code"></el-option>
</el-select>
</el-form-item>
<el-form-item
<!-- <el-form-item
label="银行卡开户行"
prop="openBank"
v-if="
......@@ -110,7 +110,7 @@
v-model="addFormData.openBank"
placeholder="请输入开户行"
clearable />
</el-form-item>
</el-form-item> -->
<el-form-item label="账户名称" prop="name">
<el-input
v-model="addFormData.name"
......@@ -149,7 +149,14 @@
:min="1"
type="number" />
</el-form-item>
<el-form-item label="账户信息" prop="">
<el-form-item
v-if="
addFormData.receiverType === 'belowLine' &&
addFormData.accountType === 'bank_transfer'
"
class="add-dialog-full-row-item"
label="账户信息"
prop="accountInfo">
<el-input
v-model="addFormData.accountInfo"
placeholder="请输入账户信息"
......@@ -157,10 +164,13 @@
:rows="3"
clearable />
</el-form-item>
<el-form-item label="备注" prop="">
<el-form-item
class="add-dialog-full-row-item"
label="备注"
prop="remark">
<el-input
v-model="addFormData.remark"
placeholder="请输入备注"
placeholder="请输入备注,如给客户的账户充值说明"
type="textarea"
:rows="3"
clearable />
......@@ -194,9 +204,9 @@
.remark
}}
</el-descriptions-item>
<el-descriptions-item label="银行卡开户行">
<!-- <el-descriptions-item label="银行卡开户行">
{{ detailFormData.openBank || '-' }}
</el-descriptions-item>
</el-descriptions-item> -->
<el-descriptions-item label="账户名称">
{{ detailFormData.name }}
</el-descriptions-item>
......@@ -261,9 +271,9 @@
verticalAlign: 'top',
wordBreak: 'break-word'
}">
<span class="proceeds-multiline">{{
detailFormData.accountInfo || '-'
}}</span>
<span class="proceeds-multiline">
{{ detailFormData.accountInfo || '-' }}
</span>
</el-descriptions-item>
<el-descriptions-item
label="备注"
......@@ -274,9 +284,9 @@
verticalAlign: 'top',
wordBreak: 'break-word'
}">
<span class="proceeds-multiline">{{
detailFormData.remark || '-'
}}</span>
<span class="proceeds-multiline">
{{ detailFormData.remark || '-' }}
</span>
</el-descriptions-item>
<el-descriptions-item label="支付宝授权状态">
<span v-if="detailFormData.accountType === 'alipay'">
......@@ -480,7 +490,7 @@ export default {
name: '',
accountNumber: '',
accountType: '',
openBank: '',
// openBank: '',
receiverType: '',
currencyType: '',
daySumLimited: '',
......@@ -516,9 +526,9 @@ export default {
accountType: [
{ required: true, message: '请选择账户类型', trigger: 'change' }
],
openBank: [
{ required: true, message: '请输入开户行', trigger: 'blur' }
],
// openBank: [
// { required: true, message: '请输入开户行', trigger: 'blur' }
// ],
receiverType: [
{ required: true, message: '请选择收款方式', trigger: 'change' }
],
......@@ -575,7 +585,11 @@ export default {
message: '请输入大于0的整数',
trigger: 'blur'
}
]
],
accountInfo: [
{ required: true, message: '请输入账户信息', trigger: 'change' }
],
remark: [{ required: true, message: '请输入备注', trigger: 'change' }]
},
detailVisible: false,
detailFormData: {},
......@@ -698,25 +712,25 @@ export default {
}
}
},
{
label: '银行卡开户行',
key: 'openBank',
width: '200'
},
// {
// label: '银行卡开户行',
// key: 'openBank',
// width: '200'
// },
{
label: '账户名称',
key: 'name',
width: '150'
width: '180'
},
{
label: '账号',
key: 'accountNumber',
width: ''
width: '150'
},
{
label: '收款方式',
key: 'receiverType',
width: '150',
width: '80',
render: (item) => {
const receiverType = this.receiverTypeList.find(
(i) => i.code === item.receiverType
......@@ -738,7 +752,7 @@ export default {
{
label: '币种',
key: 'currencyType',
width: '200',
width: '150',
render: (item) => {
const i = this.currencyTypeList.find(
(i) => i.currencyCode === item.currencyType
......@@ -767,8 +781,7 @@ export default {
const text = item.accountInfo
if (!text) return '-'
return (
<span
style="white-space: pre-line; word-break: break-word; display: inline-block; width: 100%; text-align: left;">
<span style="white-space: pre-line; word-break: break-word; display: inline-block; width: 100%; text-align: left;">
{text}
</span>
)
......@@ -785,8 +798,7 @@ export default {
const text = item.remark
if (!text) return '-'
return (
<span
style="white-space: pre-line; word-break: break-word; display: inline-block; width: 100%; text-align: left;">
<span style="white-space: pre-line; word-break: break-word; display: inline-block; width: 100%; text-align: left;">
{text}
</span>
)
......@@ -1155,7 +1167,7 @@ export default {
name: '',
accountNumber: '',
accountType: '',
openBank: '',
// openBank: '',
receiverType: '',
currencyType: '',
daySumLimited: '',
......@@ -1362,6 +1374,14 @@ export default {
.el-input-number--mini {
width: 100%;
}
.el-form--inline .add-dialog-full-row-item {
display: block !important;
width: 100%;
margin-right: 0;
}
.el-form--inline .add-dialog-full-row-item .el-form-item__content {
width: calc(100% - 100px);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment