diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index cfb209f..580fcfd 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -446,6 +446,7 @@ export default {
console.log(record)
record.certificateModality = Number(record.certificateModality)
record.certificateStatus = Number(record.certificateStatus)
+ // 证书是否免费 1-免费 2-付费
record.chargeType = Number(record.chargeType)
// 分为续证驳回和 非免费证书申请驳回 chargeType 1是免费证书 2是收费证书
this.$refs.modalForm.title = ''
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 9ff1ec2..a4a9ae9 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -194,6 +194,91 @@
+
+
+
+
+
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ placeholder="请输入关联付款发票名称"
+ :maxLength="50">
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['taxNumber',{ rules: validatorRules.taxNumber.rules, validateTrigger: 'blur',initialValue:taxNumber},]"
+ placeholder="请输入社会统一代码/税号"
+ :maxLength="50">
+
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['invoiceAddress',{ rules: validatorRules.invoiceAddress.rules, validateTrigger: 'blur', initialValue:invoiceInfoObj.invoiceAddress}]"
+ placeholder="请输入单位地址"
+ :maxLength="50">
+
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
+ placeholder="请输入电话号码"
+ :maxLength="50">
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['depositBank',{ rules: validatorRules.depositBank.rules, validateTrigger: 'blur',initialValue:invoiceInfoObj.depositBank}]"
+ placeholder="请输入开户银行"
+ :maxLength="50">
+
+
+
+
+ {e.target.value = e.target.value.trim()}"
+ v-decorator="['bankAccount',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur',initialValue:invoiceInfoObj.bankAccount}]"
+ placeholder="请输入银行账户"
+ :maxLength="50">
+
+
+
+
-
+
+
@@ -925,6 +926,20 @@
style="width: 100%" />
+
+
+
+
+
+
+
+
+
@@ -992,71 +1009,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- event.target.value = event.target.value.trim()"
- v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
- placeholder="请输入单位地址"
- :maxLength="50">
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
- placeholder="请输入电话号码"
- :maxLength="50">
-
-
-
-
-
-
- event.target.value = event.target.value.trim()"
- v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
- placeholder="请输入开户银行"
- :maxLength="50">
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
- v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
- placeholder="请输入银行账户"
- :maxLength="50">
-
-
-
-
+
@@ -1095,69 +1050,71 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- event.target.value = event.target.value.trim()"
- v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
- placeholder="请输入单位地址"
- :maxLength="50">
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
- placeholder="请输入电话号码"
- :maxLength="50">
-
-
-
-
-
-
- event.target.value = event.target.value.trim()"
- v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
- placeholder="请输入开户银行"
- :maxLength="50">
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
- v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
- placeholder="请输入银行账户"
- :maxLength="50">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
+ placeholder="请输入单位地址"
+ :maxLength="50">
+
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
+ placeholder="请输入电话号码"
+ :maxLength="50">
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
+ placeholder="请输入开户银行"
+ :maxLength="50">
+
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+ v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
+ placeholder="请输入银行账户"
+ :maxLength="50">
+
+
+
+
@@ -1253,7 +1210,7 @@
- 缴费信息
+ 缴费信息--------4
@@ -1707,7 +1664,7 @@
- 缴费信息
+ 缴费信息---------5
@@ -2074,7 +2031,7 @@
- 缴费信息
+ 缴费信息----------6
@@ -2117,7 +2074,7 @@
-
+
@@ -2130,6 +2087,19 @@
style="width: 100%" />
+
+
+
+
+
+
+
-
+
@@ -2197,70 +2167,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- event.target.value = event.target.value.trim()"
- v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
- placeholder="请输入单位地址"
- :maxLength="50">
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
- placeholder="请输入电话号码"
- :maxLength="50">
-
-
-
-
-
-
- event.target.value = event.target.value.trim()"
- v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
- placeholder="请输入开户银行"
- :maxLength="50">
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
- v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
- placeholder="请输入银行账户"
- :maxLength="50">
-
-
-
-
+
-
+
@@ -2300,69 +2209,70 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- event.target.value = event.target.value.trim()"
- v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
- placeholder="请输入单位地址"
- :maxLength="50">
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
- placeholder="请输入电话号码"
- :maxLength="50">
-
-
-
-
-
-
- event.target.value = event.target.value.trim()"
- v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
- placeholder="请输入开户银行"
- :maxLength="50">
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
- v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
- placeholder="请输入银行账户"
- :maxLength="50">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:memberInfoPayment.invoiceAddress}]"
+ placeholder="请输入单位地址"
+ :maxLength="50">
+
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
+ placeholder="请输入电话号码"
+ :maxLength="50">
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:memberInfoPayment.depositBank}]"
+ placeholder="请输入开户银行"
+ :maxLength="50">
+
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+ v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:memberInfoPayment.bankAccount}]"
+ placeholder="请输入银行账户"
+ :maxLength="50">
+
+
+
+
@@ -2455,7 +2365,7 @@
- 缴费信息
+ 缴费信息 --------7
@@ -2530,7 +2440,82 @@
请上传pdf文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
+ placeholder="请输入单位地址"
+ :maxLength="50">
+
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
+ placeholder="请输入电话号码"
+ :maxLength="50">
+
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
+ placeholder="请输入开户银行"
+ :maxLength="50">
+
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+ v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
+ placeholder="请输入银行账户"
+ :maxLength="50">
+
+
+
+
@@ -3641,11 +3626,13 @@ export default {
if (res.success) {
this.memberInfoPayment = res.result
this.isWireTransfer = this.memberInfoPayment.paymentMethod + ''
+ this.changePaymentMethod(this.isWireTransfer)
// 对发票的显示 进行操作
this.invoiceRequirementsChange(res.result.invoiceRequirements)
- this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.memberInfoPayment, 'submissionTime', 'paymentAmount', 'certificateType', 'headerName', 'invoiceRequirements', 'paymentMethod', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'paymentRecord', 'id', 'auditOpinion', 'address', 'postcode', 'mobile', 'liaisonMan', 'certificateValidDate', 'companyName', 'certificationDate', 'applyDate', 'effectDate', 'invalidDate', 'reasonsRenewal', 'certificateStatus', 'memberId', 'code', 'chargeType'))
- })
+ setTimeout(() => {
+ this.form.setFieldsValue(pick(this.memberInfoPayment, 'submissionTime', 'paymentAmount', 'certificateType', 'headerName', 'invoiceRequirements', 'paymentMethod', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'paymentRecord', 'id', 'auditOpinion', 'address', 'postcode', 'mobile', 'liaisonMan', 'certificateValidDate', 'companyName', 'certificationDate', 'applyDate', 'effectDate', 'invalidDate', 'reasonsRenewal', 'certificateStatus', 'memberId', 'code', 'chargeType'))}, 1)
+
+ console.log('this.vinCertificate-------', this.vinCertificate)
} else {
console.log(res.message)
}
@@ -4567,6 +4554,14 @@ export default {
// 1 是电汇 2 打包 3 是现金
this.isWireTransfer = value
this.form.resetFields(['paymentType', 'paymentAmount', 'paymentTime', 'submissionTime', 'paymentRecord'])
+ // 默认显示增值税发票
+ let defaultInvoiceRequirements = 2
+ this.$nextTick(() => {
+ this.form.setFieldsValue({
+ 'invoiceRequirements': defaultInvoiceRequirements
+ })
+ this.invoiceRequirementsChange(defaultInvoiceRequirements)
+ })
if (value !== '1') {
this.paymentMethodFlag = true
} else {