diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue index 1f5bb5a..ef15ab1 100644 --- a/src/views/standardsAssociation/CertificateManagement.vue +++ b/src/views/standardsAssociation/CertificateManagement.vue @@ -119,7 +119,7 @@ - 撤回 + 撤回 查看 绑定会员 @@ -549,7 +549,6 @@ export default { }, // 编辑: 包括免费证书,收费证书,续费,换证 handleEditRenew: function (record) { - console.log(record) record.certificateModality = Number(record.certificateModality) // 证书形式 record.certificateStatus = Number(record.certificateStatus) // 证书的处理状态 // 证书是否免费 1-免费 2-付费 diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue index 05aa28f..631449a 100644 --- a/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue +++ b/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue @@ -199,7 +199,7 @@ rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" disabled :maxLength="500"> - 一个缴费单可在多个缴费处上传 + 一个缴费单可在多个缴费处上传 @@ -865,7 +865,7 @@ export default { border-collapse: collapse; } -.remark span { +.remark .remark-notice { display: inline-block; font-size: 14px; //margin-left: 100px; diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue index c931319..2bb9071 100644 --- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue +++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue @@ -253,7 +253,7 @@ :maxLength="500" :disabled="checkFlag||detailFlag"> - 一个缴费单可在多个缴费处上传 + 一个缴费单可在多个缴费处上传 @@ -553,7 +553,7 @@ export default { memberPaymentAmount: { rules: [ { - required: true, message: '请输入会员缴费金额' + required: false, message: '请输入会员缴费金额' }, { pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/, @@ -1251,7 +1251,7 @@ export default { //margin-left: -100px; } -.remark span { +.remark .remark-notice { display: inline-block; font-size: 14px; margin-left: 145px; diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue index 57ac16c..3691b7a 100644 --- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue +++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue @@ -1034,7 +1034,7 @@ export default { // 提示 that.$confirm({ title: '确认提交', - content: '是否删除选中数据?', + content: '当前已有待审核缴费订单,为避免重复提交,请确认是否再次提交缴费订单?', onOk:function () { that.handleSubmit(values) }, diff --git a/src/views/standardsAssociation/model/BindMemberModel.vue b/src/views/standardsAssociation/model/BindMemberModel.vue index d448338..58e3567 100644 --- a/src/views/standardsAssociation/model/BindMemberModel.vue +++ b/src/views/standardsAssociation/model/BindMemberModel.vue @@ -147,7 +147,7 @@ export default { } - \ No newline at end of file