LK/income_payments_enterprise_terminal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【bug】 修改会议“上传凭证”、“查看凭证”按钮的判断条件；修改线上不能预览会员文件的配置项

Browse Source
This commit is contained in:
fengchenchen
2022-01-13 22:16:38 +08:00
parent 7aaa20282f
commit c954431e1d
6 changed files with 77 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/meetingActivity/MeetingActivity.vue
+26 -5
View File
@@ -121,24 +121,44 @@
@click.stop="signUpRecord(item)">报名
</a-button>
<!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
<template
<!-- <template
v-if="(item.payMode === 2 || item.payMode === 1)
&& item.meetingStatus === MeetingStatusEnums.onGoing.index
&& item.registerCheckResult === 1
&& item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
>
<!-- 凭证待审核 状态有查看凭证按钮 -->
&lt;!&ndash; 凭证待审核 状态有查看凭证按钮 &ndash;&gt;
<a-button v-if="item.signUpStatus === SignUpStatusEnum.pendingReviewVoucher.index" class="cell-btn"
type="primary"
@click.stop="uploadPaymentRecord(item)">查看凭证
</a-button>
<!-- 待上传凭证 | 凭证被拒绝 状态有上传凭证按钮 -->
&lt;!&ndash; 待上传凭证 | 凭证被拒绝 状态有上传凭证按钮 &ndash;&gt;
<a-button
v-if="item.signUpStatus === SignUpStatusEnum.pendingUploadVoucher.index || item.signUpStatus === SignUpStatusEnum.rejectedVoucher.index"
class="cell-btn" type="primary"
@click.stop="uploadPaymentRecord(item)">上传凭证
</a-button>
</template>-->
<!-- A 缴费方式 为 汇款 或者现场缴费 B 报名审核信息通过 -->
<template v-if="(item.payMode === 2 || item.payMode === 1) && item.registerCheckResult === 1">
<!-- 有查看凭证按钮 : A 身份是参会人 B 凭证字段有值 C 不是(待上传凭证 | 凭证被拒绝) 状态 D 会议状态是进行中 || 已结束 || (未开始 && 缴费方式是汇款) -->
<a-button
v-if="item.identity === MeetIdentifyTypeEnums.attendee.index
&& (item.paymentRecord)
&& (item.signUpStatus !== SignUpStatusEnum.pendingUploadVoucher.index && item.signUpStatus !== SignUpStatusEnum.rejectedVoucher.index)
&& (item.meetingStatus === MeetingStatusEnums.onGoing.index || item.meetingStatus === MeetingStatusEnums.ended.index || (item.meetingStatus === MeetingStatusEnums.noStart.index && item.payMode === 1))"
class="cell-btn"
type="primary"
@click.stop="uploadPaymentRecord(item)"
>查看凭证
</a-button>
<!-- 有上传凭证按钮: A 待上传凭证 | 凭证被拒绝 状态 B 缴费方式为汇款+现场缴费、会议状态进行中 || 缴费方式为汇款 、会议状态为未开始-->
<a-button
v-if="(item.signUpStatus === SignUpStatusEnum.pendingUploadVoucher.index || item.signUpStatus === SignUpStatusEnum.rejectedVoucher.index)
&& (item.meetingStatus === MeetingStatusEnums.onGoing.index || (item.payMode === 1 && item.meetingStatus === MeetingStatusEnums.noStart.index))"
class="cell-btn" type="primary"
@click.stop="uploadPaymentRecord(item)">上传凭证
</a-button>
</template>
</p>
<!-- 有缴费方式在显示 -->
@@ -206,7 +226,7 @@ import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCerti
import {getAction} from '@api/manage'
import JEllipsis from '@comp/jero/JEllipsis'
import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal'
import {SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums} from '@/enums/commonEnum'
import {SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetIdentifyTypeEnums} from '@/enums/commonEnum'
import { compareCurrentTime } from '../../utils/meetingJudgeUtil'
export default {
@@ -224,6 +244,7 @@ export default {
SignUpStatusEnum,
MeetingStatusEnums,
MeetingSignUpTypeEnums,
MeetIdentifyTypeEnums,
// 会议分类 全部 0 可报名 1 已报名 2
meetingStatusArr: [
{