diff --git a/src/enums/memberEnums.js b/src/enums/memberEnums.js
index fef97a1..cea2526 100644
--- a/src/enums/memberEnums.js
+++ b/src/enums/memberEnums.js
@@ -23,3 +23,11 @@ export const ChargeTypeEnums = {
freeCert: { name: '免费证书', index: 1 },
chargeCert: { name: '收费证书', index: 2 },
}
+
+
+// 缴费方式
+export const PaymentMethodEnums = {
+ wireTransfer: { name: '电汇', index: 1 },
+ pack: { name: '打包会员', index: 2 },
+ cash: { name: '现金', index: 3 }
+}
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index 74cf73d..3821bfd 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -136,22 +136,22 @@
-
-
-
-
- 请上传pdf文件
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{text}} (待上传凭证)
-
+
- {{ record.paymentStatus === 1 ? '对公银行预计15个工作日完成费用核验,请耐心等待' : text }}
- {{ text }}?
+ {{ record.paymentStatus === 1 && record.paymentMethod === PaymentMethodEnums.wireTransfer.index ? '对公银行预计15个工作日完成费用核验,请耐心等待' : text }}
+ {{ text }}?
@@ -183,11 +183,12 @@ import CombinationPaymentModal from '@views/standardsAssociation/PaymentInfo/mod
import UploadRecordModal from '@views/standardsAssociation/PaymentInfo/modules/UploadRecordModal'
import CertificatePaymentInfoModal from '../PaymentInfo/modules/CertificatePaymentInfoModal'
-import {getAction, postAction} from '@/api/memberManage'
+import {getAction, postAction, deleteAction} from '@/api/memberManage'
import {filterObj} from '../../../utils/util'
import {RangeDateMixin} from '@/mixins/RangeDateMixin'
import {mixinDevice} from '@/utils/mixin'
import {downNewestNotice, previewPdf , withDrawPayment} from '../../../api/standardsAssociationApi'
+import {PaymentMethodEnums} from "../../../enums/memberEnums";
const columns = [
{
@@ -273,6 +274,7 @@ export default {
},
data() {
return {
+ PaymentMethodEnums,
getAction,
newestNoticeInfo:{},
/* 查询条件-请不要在queryParam中声明非字符串值的属性 */
@@ -462,7 +464,7 @@ export default {
title: '确认删除',
content: '确定要删除此条数据吗?',
onOk: function() {
- postAction(that.url.delete, {id: id}).then((res) => {
+ deleteAction(that.url.delete, {id: id}).then((res) => {
if (res.success) {
that.$message.success(res.message)
// 判断当前删除的数据是否是最后一页的最后一条数据,如果是的话页码减一