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 @@
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()
}
}