From 7e5f52e96b776af91204fe9fc7a0271104d015a5 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Jul 2022 11:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E7=BC=B4=E8=B4=B9=E7=9A=84=E5=8F=91=E7=A5=A8=E9=AA=8C?=
=?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/CombinationPaymentModal.vue | 18 +++++++++++++++---
.../PaymentInfo/modules/PaymentInfoModal.vue | 19 +++++++++++++++++++
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index e3c87a8..da80e3c 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -121,6 +121,7 @@
v-decorator="['paymentRecord', validatorRules.paymentRecord]">
+ 需上传"垫付款说明（盖章"文件）
@@ -609,7 +610,7 @@ export default {
rules: [{ required: false, message: '请选择失效日期' }],
validateTrigger: ['blur', 'change']
},
- paymentRecord: { rules: [{ required: true, validator: this.validatePaymentMethod }] },
+ paymentRecord: { rules: [{ required: true, message: '请山川缴费凭证/付款说明' }] },
paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] },
headerName: {
rules: [
@@ -681,6 +682,7 @@ export default {
detailFlag: false,
// 发票选择
invoiceRequirementsFlag: false,
+ validateCompanyNameFlag: false, // 校验填写的发票名称与单位名称是否一致
// 当前选择是否需要发票的值，用于dom的判断 0-无 1-普通发票 2-增值税发票
currentSelectInvoiceType: 0,
// 缴费方式 false 电汇 /现金 true 会员打包
@@ -809,7 +811,7 @@ export default {
* 校验发票抬头是否与公司名称一致
* */
validateCompanyName() {
- this.form.validateFields(['paymentRecord'])
+ this.validateCompanyNameFlag = this.form.getFieldValue('headerName') === this.companyName
},
validatePaymentMethod(rule, value, callback) {
if (!value) {
@@ -877,7 +879,7 @@ export default {
this.visible = true
// 缴费单号
this.$nextTick(() => {
- // this.form.setFieldsValue(pick(this.model,))
+ this.validateCompanyName()
})
},
close() {
@@ -1329,6 +1331,14 @@ export default {
// position: relative!important;
// z-index: 9999!important;
//}
+
+// 上传额外附件的缴费凭证
+.paymentRecord-notice {
+ color: #f5222d;
+ position: absolute;
+ bottom: 4px;
+ left: 15%
+}
// 发票选择无 增加样式
.other-notice {
color: #f5222d;
@@ -1336,4 +1346,6 @@ export default {
bottom: 4px;
left: 25%
}
+
+
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 08f3ddc..01a2138 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -222,6 +222,7 @@
v-decorator="['headerName',{ rules: validatorRules.headerName.rules, initialValue:headerName,validateTrigger: 'blur',},]"
:trigger-change="true"
@change="event => event.target.value = event.target.value.trim()"
+ @blur="validateCompanyName"
placeholder="请输入付款单位发票抬头"
:maxLength="50">
@@ -358,6 +359,7 @@
v-decorator="['headerName',{ rules: validatorRules.headerName.rules, initialValue:headerName,validateTrigger: 'blur',},]"
:trigger-change="true"
@change="event => event.target.value = event.target.value.trim()"
+ @blur="validateCompanyName"
placeholder="请输入付款单位发票抬头"
:maxLength="50">
@@ -432,6 +434,7 @@
v-decorator="['paymentRecord', validatorRules.paymentRecord]">
+ 需上传"垫付款说明（盖章"文件）
@@ -660,6 +663,7 @@ export default {
},
// 缴费时长 5年vip会员 为true 1年普通会员为 false
typeFlag: false,
+ validateCompanyNameFlag: false, // 校验填写的发票名称与单位名称是否一致
// 缴费表头
payColumns: [
{
@@ -879,6 +883,12 @@ export default {
this.detailFlag = true
this.show(record)
},
+ /**
+ * 校验发票抬头是否与公司名称一致
+ * */
+ validateCompanyName() {
+ this.validateCompanyNameFlag = this.form.getFieldValue('headerName') === this.companyName
+ },
async show(record) {
this.form.resetFields()
this.model = Object.assign({}, record)
@@ -977,6 +987,7 @@ export default {
// this.billNumber = this.model.billNumber
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'certificateArr', 'billNumber', 'companyName', 'paymentType', 'validPeriod', 'paymentTime', 'paymentAmount', 'certificatesNum', 'submissionTime', 'checkTime', 'paymentStatus', 'paymentMethod', 'paymentRecord', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'checkResult', 'checkMark', 'checkMember', 'checkMemberId', 'memberId', 'address', 'postcode', 'serviceCharge', 'remark'))
+ this.validateCompanyName()
})
},
close() {
@@ -1406,6 +1417,14 @@ export default {
position: absolute;
top: 8px;
}
+
+// 上传额外附件的缴费凭证
+.paymentRecord-notice {
+ color: #f5222d;
+ position: absolute;
+ bottom: 4px;
+ left: 15%
+}
// 发票选择无 增加样式
.other-notice{
color: #f5222d;