【update】合并代码的时候 将主干版本号8c3d568e56cf33692b0801c6415c387df35dd230 的代码 进行修改
This commit is contained in:
@@ -169,7 +169,7 @@
|
||||
<a-col :span="1"></a-col>
|
||||
</a-row>
|
||||
<!-- 打包会员显示 -->
|
||||
<div v-if="paymentMethodFlag">
|
||||
<template v-if="paymentMethodFlag">
|
||||
<a-row>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="缴费日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
@@ -245,7 +245,7 @@
|
||||
<a-input
|
||||
:disabled="checkFlag||detailFlag"
|
||||
@change="event => event.target.value = event.target.value.trim()"
|
||||
v-decorator="['invoiceAddress',{ rules: validatorRules.invoiceAddress.rules, validateTrigger: 'blur', initialValue:invoiceInfoObj.invoiceAddress}]"
|
||||
v-decorator="['invoiceAddress',{ rules: validatorRules.invoiceAddress.rules, validateTrigger: 'blur'}]"
|
||||
placeholder="请输入单位地址"
|
||||
:maxLength="50"></a-input>
|
||||
</a-form-item>
|
||||
@@ -254,7 +254,7 @@
|
||||
<a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-input
|
||||
:disabled="checkFlag||detailFlag"
|
||||
v-decorator="['invoicePhone',{ rules: validatorRules.invoicePhone.rules, initialValue: invoiceInfoObj.invoicePhone,validateTrigger: 'blur'}]"
|
||||
v-decorator="['invoicePhone',{ rules: validatorRules.invoicePhone.rules,validateTrigger: 'blur'}]"
|
||||
:trigger-change="true"
|
||||
@change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
|
||||
placeholder="请输入电话号码"
|
||||
@@ -268,7 +268,7 @@
|
||||
<a-input
|
||||
:disabled="checkFlag||detailFlag"
|
||||
@change="event => event.target.value = event.target.value.trim()"
|
||||
v-decorator="['depositBank',{ rules: validatorRules.depositBank.rules, validateTrigger: 'blur',initialValue:invoiceInfoObj.depositBank}]"
|
||||
v-decorator="['depositBank',{ rules: validatorRules.depositBank.rules, validateTrigger: 'blur'}]"
|
||||
placeholder="请输入开户银行"
|
||||
:maxLength="50"></a-input>
|
||||
</a-form-item>
|
||||
@@ -278,7 +278,7 @@
|
||||
<a-input
|
||||
:disabled="checkFlag||detailFlag"
|
||||
@change="(e) => {e.target.value = e.target.value.trim()}"
|
||||
v-decorator="['bankAccount',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur',initialValue:invoiceInfoObj.bankAccount}]"
|
||||
v-decorator="['bankAccount',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur'}]"
|
||||
placeholder="请输入银行账户"
|
||||
:maxLength="50"></a-input>
|
||||
</a-form-item>
|
||||
@@ -299,7 +299,7 @@
|
||||
<span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</div>
|
||||
</template>
|
||||
<!-- 电汇显示-->
|
||||
<div v-if="!paymentMethodFlag">
|
||||
<a-row v-show="!addFlag">
|
||||
@@ -1000,6 +1000,8 @@ export default {
|
||||
this.paymentType = this.model.paymentType
|
||||
this.paymentTime = this.model.paymentTime
|
||||
this.paymentRecord = this.model.paymentRecord
|
||||
} else {
|
||||
this.paymentMethodFlag = false
|
||||
}
|
||||
// 缴费单号
|
||||
// this.billNumber = this.model.billNumber
|
||||
@@ -1317,6 +1319,7 @@ export default {
|
||||
|
||||
if ((+value) === 2) {
|
||||
this.paymentMethodFlag = true
|
||||
this.form.resetFields()
|
||||
} else {
|
||||
this.paymentMethodFlag = false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user