Skip to content

S
saas-manage
Commit 1c1aca1d by wusiyi
Options

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

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