From 53a7f65c45efe608d676dfa576f31ef53287a778 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 28 Jul 2023 00:06:10 +0800 Subject: [PATCH] =?UTF-8?q?[fix:bug74231]-1=E3=80=81=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF=E4=BC=9A=E8=AE=AE=E8=B5=84=E6=96=99=E5=92=8C=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E7=BA=AA=E8=A6=81=E4=BB=BB=E4=BD=95=E6=83=85=E5=86=B5?= =?UTF-8?q?=E9=83=BD=E5=8F=AF=E6=9F=A5=E7=9C=8B=202=E3=80=81=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E7=BC=B4=E8=B4=B9-=E7=BC=B4=E8=B4=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=B7=B2=E9=A9=B3=E5=9B=9E=E4=B8=94=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E6=96=B9=E5=BC=8F=E4=B8=BA=E6=89=93=E5=8C=85=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E4=B8=8D=E8=83=BD=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81?= =?UTF-8?q?=203=E3=80=81=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF-=E8=8E=B7=E5=8F=96=E5=85=AC=E9=92=A5?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E6=9C=BA=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/MessagePage/MeetingDetailModal.vue | 4 ++-- src/views/standardsAssociation/BasicInfo.vue | 10 +++++----- .../standardsAssociation/CertificateManagement.vue | 2 +- .../standardsAssociation/feehandle/FeeHandle.vue | 3 ++- .../standardsAssociation/modules/BasicModel.vue | 14 ++++++++++---- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 01dbf30..a93ad03 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -592,7 +592,7 @@ 资料上传 + show-detail-bool> @@ -600,7 +600,7 @@

会议纪要

+ show-detail-bool>
diff --git a/src/views/standardsAssociation/BasicInfo.vue b/src/views/standardsAssociation/BasicInfo.vue index a64b768..99120dd 100644 --- a/src/views/standardsAssociation/BasicInfo.vue +++ b/src/views/standardsAssociation/BasicInfo.vue @@ -78,10 +78,10 @@ export default { isLoading: false, // 秘书处信息 secretariatInfo: { - address: '东丽区', // 地址 - contactPerson: '郭某某', // 联系人 - contactPhone: '022-5907252', // 联系人电话 - contactMail: '113222222222222@qq.c113222222222222113222222222222113222222222222113222222222222113222222222222113222222222222113222222222222om' // 联系人邮箱 + address: '', // 地址 + contactPerson: '', // 联系人 + contactPhone: '', // 联系人电话 + contactMail: '' // 联系人邮箱 }, // 本企业信息 memberInfo: { @@ -89,7 +89,7 @@ export default { contactPerson: '', // 企业管理员 contactPhone: '', // 管理员电话 contactMail: '', // 管理员邮箱 - validDate: 'xxxx年xx月xx日到xxxx年xx月xx日' // 会员有效期 + validDate: '' // 会员有效期 }, // 当前登录用户的信息 loginUserInfo: {}, diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue index 5a0e40f..d4bf9ef 100644 --- a/src/views/standardsAssociation/CertificateManagement.vue +++ b/src/views/standardsAssociation/CertificateManagement.vue @@ -551,7 +551,7 @@ export default { this.$refs.FreeCertificateReplaceEditModel.edit(record) } } else if (record.chargeType === 2 && record.certificateModality === 4) { - // 收费证书编辑 + // 收费证书编辑-申请 this.$refs.ChargeCertificateEditModel.edit(record) } else if (record.chargeType === 2 && record.certificateModality === 2) { diff --git a/src/views/standardsAssociation/feehandle/FeeHandle.vue b/src/views/standardsAssociation/feehandle/FeeHandle.vue index 54e663f..c17a366 100644 --- a/src/views/standardsAssociation/feehandle/FeeHandle.vue +++ b/src/views/standardsAssociation/feehandle/FeeHandle.vue @@ -141,7 +141,8 @@ diff --git a/src/views/standardsAssociation/modules/BasicModel.vue b/src/views/standardsAssociation/modules/BasicModel.vue index a3fff0b..db1c956 100644 --- a/src/views/standardsAssociation/modules/BasicModel.vue +++ b/src/views/standardsAssociation/modules/BasicModel.vue @@ -150,9 +150,11 @@ export default { }, handleOk() { // 触发表单验证 - this.form.validateFields((err, values) => { + this.form.validateFields(async (err, values) => { if (!err) { this.confirmLoading = true + // 获得公钥的相关信息 + await this.getEncryptedStringFunc() const formData = Object.assign(this.model, values) let encrypt = new JSEncrypt() encrypt.setPublicKey(this.encryptedString) @@ -200,9 +202,13 @@ export default { }, // 获得加密公钥的方法 getEncryptedStringFunc() { - getEncryptedString().then((res) => { - this.encryptedString = res.result + return new Promise(resolve => { + getEncryptedString().then((res) => { + this.encryptedString = res.result + resolve() + }) }) + }, /* * 获取会员的详细信息 @@ -223,7 +229,7 @@ export default { }, created() { // 获得公钥的相关信息 - this.getEncryptedStringFunc() + // this.getEncryptedStringFunc() } }