diff --git a/src/enums/memberEnums.js b/src/enums/memberEnums.js new file mode 100644 index 0000000..fef97a1 --- /dev/null +++ b/src/enums/memberEnums.js @@ -0,0 +1,25 @@ +// 关于会员模块的数据字段 - 用于查询 +// 证书形式 +export const CertificateModalityEnums = { + changeCert: { name: '换证', index: 1 }, + renewCert: { name: '续证', index: 2 }, + validCert: { name: '有效', index: 3 }, + applyCert: { name: '申请', index: 4 }, +} +// 证书的处理状态 +export const CertificateStatusEnums = { + toPay: { name: '待支付', index: 0 }, + bound: { name: '已绑定', index: 1 }, + paid: { name: '已支付', index: 2 }, + paidAndApproved: { name: '支付已审核', index: 3 }, + normalUse: { name: '正常使用', index: 4 }, + invalid: { name: '已失效', index: 5 }, + rejected: { name: '已驳回', index: 6 }, + boundAndInvalid: { name: '绑定已失效', index: 7 } +} + +// 证书是否免费 +export const ChargeTypeEnums = { + freeCert: { name: '免费证书', index: 1 }, + chargeCert: { name: '收费证书', index: 2 }, +} diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue index 580fcfd..964a9d1 100644 --- a/src/views/standardsAssociation/CertificateManagement.vue +++ b/src/views/standardsAssociation/CertificateManagement.vue @@ -110,9 +110,6 @@ 查看 - - - 绑定会员 @@ -181,6 +178,7 @@ import { RangeDateMixin } from '@/mixins/RangeDateMixin' import JDictSelectTag from '../../components/standardsAssociation/JDictSelectTag' // eslint-disable-next-line no-unused-vars import { downloadFile, getAction, getFileAccessHttpUrl } from '@/api/memberManage' +import { CertificateModalityEnums, CertificateStatusEnums, ChargeTypeEnums } from '../../enums/memberEnums' export default { name: 'CertificateManagement', @@ -397,19 +395,7 @@ export default { this.$refs.modalForm.remainingTime = this.remainingTimeCount(record.certificateValidDate) this.$refs.modalForm.edit(record) }, - // 核实证书 - handleVerify: function(val) { - this.$refs.modalForm.title = '核对证书' - this.$refs.modalForm.disableSubmit = true - if (val.certificateModality === 1) { - this.$refs.modalForm.pageType = 3 - } else { - // 新增和续证使用2号核对窗口 - this.$refs.modalForm.pageType = 2 - } - // 换证时使用3号核对窗口 - this.$refs.modalForm.edit(val) - }, + // 绑定会员 bindMember: function(record) { this.$refs.modalForm.title = '绑定会员' @@ -444,17 +430,19 @@ export default { // 编辑: 包括免费证书，收费证书，续费，换证 handleEditRenew: function(record) { console.log(record) - record.certificateModality = Number(record.certificateModality) - record.certificateStatus = Number(record.certificateStatus) + record.certificateModality = Number(record.certificateModality) // 证书形式 + record.certificateStatus = Number(record.certificateStatus) // 证书的处理状态 // 证书是否免费 1-免费 2-付费 record.chargeType = Number(record.chargeType) // 分为续证驳回和 非免费证书申请驳回 chargeType 1是免费证书 2是收费证书 this.$refs.modalForm.title = '' this.$refs.modalForm.disableSubmit = true - // certificateStatus 0 是待支付 - if (record.certificateStatus === 0) { - if (record.chargeType === 1) { - if (record.certificateModality === 4) { + // certificateStatus --证书状态-待支付 + if (record.certificateStatus === CertificateStatusEnums.toPay.index) { + // 免费证书 + if (record.chargeType === ChargeTypeEnums.freeCert.index) { + // 证书形式 - 申请 + if (record.certificateModality === CertificateModalityEnums.applyCert.index) { // 免费证书申请编辑 let freeCount getAction('/vinCertificate/vinCertificate/getFreeCount').then((res) => { @@ -464,7 +452,6 @@ export default { this.$refs.modalForm.disableSubmit = false this.$refs.modalForm.pageType = 10 this.$refs.modalForm.edit5(record) - return }) return } else if (record.certificateModality === 1) { diff --git a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue index e9f816e..f5e62a2 100644 --- a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue +++ b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue @@ -10,20 +10,12 @@ @cancel="handleCancel" cancelText="关闭"> - + - - - - - - - - + + + + + -