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-10 22:43:22 +08:00
parent 5f62cf7202
commit 4d1eac281d
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/detailPage/MeetingList.vue
+12 -4
View File
@@ -39,10 +39,18 @@
<!-- 可报名 或者不存在会议报名状态 且 会议未结束 有报名按钮 -->
<!-- <a v-if="record.meetingStatus !== MeetingStatusEnums.ended.index && (record.signUpStatus === SignUpStatusEnum.canReport.index || !record.signUpStatus)" class="action-btn" @click="signUpRecord(record)">报名</a>-->
<a v-if="Number(record.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(record.registerDeadline)" class="action-btn" @click="signUpRecord(record)">报名</a>
<!-- 凭证待审核 状态有查看凭证按钮 -->
<a v-if="record.signUpStatus === SignUpStatusEnum.pendingReviewVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">查看凭证</a>
<!-- 待上传凭证 | 凭证被拒绝 状态有上传凭证按钮 -->
<a v-if="record.signUpStatus === SignUpStatusEnum.pendingUploadVoucher.index || record.signUpStatus === SignUpStatusEnum.rejectedVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">上传凭证</a>
<!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
<template
v-if="(record.payMode === 2 || record.payMode === 1)
&& record.meetingStatus === MeetingStatusEnums.onGoing.index
&& record.registerCheckResult === 1
&& record.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
>
<!-- 凭证待审核 状态有查看凭证按钮 -->
<a v-if="record.signUpStatus === SignUpStatusEnum.pendingReviewVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">查看凭证</a>
<!-- 待上传凭证 | 凭证被拒绝 状态有上传凭证按钮 -->
<a v-if="record.signUpStatus === SignUpStatusEnum.pendingUploadVoucher.index || record.signUpStatus === SignUpStatusEnum.rejectedVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">上传凭证</a>
</template>
<!-- 待签到状态 显示-->
<a v-if="record.signUpStatus === SignUpStatusEnum.pendingSignIn.index" class="action-btn action-text">请用小程序现场签到</a>
</template>
src/views/meetingActivity/MeetingActivity.vue
+4 -3
View File
@@ -114,15 +114,16 @@
<p class="item-meeting-img item-meeting-meetingTime item-sign-up-status">
<img src="../../assets/meetingImgs/meeting-audit.png"
class="audit-img"/>报名状态：{{ item.signUpStatus_dictText || '无' }}
<!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为 未开始 或 进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
<!-- -->
<!-- 可报名 状态有报名按钮 -->
<a-button v-if="Number(item.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(item.registerDeadline)" class="cell-btn"
type="primary"
@click.stop="signUpRecord(item)">报名
</a-button>
<!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
<template
v-if="(item.payMode === 2 || item.payMode === 1) && (item.meetingStatus == MeetingStatusEnums.noStart.index || item.meetingStatus === MeetingStatusEnums.onGoing.index)
v-if="(item.payMode === 2 || item.payMode === 1)
&& item.meetingStatus === MeetingStatusEnums.onGoing.index
&& item.registerCheckResult === 1
&& item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
>
src/views/standardsAssociation/meeting/MeetingList.vue
+2 -2
View File
@@ -106,10 +106,10 @@
<a-button v-if="Number(item.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(item.registerDeadline)" class="cell-btn" type="primary"
@click.stop="signUpRecord(item)">报名
</a-button>
<!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为 未开始 或 进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
<!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
<template
v-if="(item.payMode === 2 || item.payMode === 1)
&& (item.meetingStatus == MeetingStatusEnums.noStart.index || item.meetingStatus === MeetingStatusEnums.onGoing.index)
&& item.meetingStatus === MeetingStatusEnums.onGoing.index
&& item.registerCheckResult === 1
&& item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
>