From c954431e1d3d3a2cc5cbd785018775e3b39fdcbd Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 13 Jan 2022 22:16:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E2=80=9C=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E2=80=9D=E3=80=81=E2=80=9C=E6=9F=A5=E7=9C=8B=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E2=80=9D=E6=8C=89=E9=92=AE=E7=9A=84=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=9B=E4=BF=AE=E6=94=B9=E7=BA=BF=E4=B8=8A=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=A2=84=E8=A7=88=E4=BC=9A=E5=91=98=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/local_production_address_config.js     |  2 +-
 public/production_address_config.js           |  2 +-
 src/components/detailPage/MeetingList.vue     | 37 ++++++++++++-------
 src/enums/commonEnum.js                       |  6 +++
 src/views/meetingActivity/MeetingActivity.vue | 31 +++++++++++++---
 .../meeting/MeetingList.vue                   | 34 ++++++++++-------
 6 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js
index a545193..d7d4e11 100644
--- a/public/local_production_address_config.js
+++ b/public/local_production_address_config.js
@@ -21,4 +21,4 @@ window._CONFIG["singInQRCodHref"]= 'http://bxxt.hzwlsoft.com/signupentrance'
 window._CONFIG["memberURL"] = "/memberApi";
 // 会员系统的静态文件的地址
 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static";
-window._CONFIG["memberDomianWebSocketURL"] = "http://139.9.235.66:2015/memberApi";
+window._CONFIG["memberDomianWebSocketURL"] = "http://139.9.235.66/memberApi";
diff --git a/public/production_address_config.js b/public/production_address_config.js
index 38987ec..791dcfd 100644
--- a/public/production_address_config.js
+++ b/public/production_address_config.js
@@ -22,4 +22,4 @@ window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn/signupentrance'
 window._CONFIG["memberURL"] = "/memberApi";
 // 会员系统的静态文件的地址
 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static";
-window._CONFIG["memberDomianWebSocketURL"] = "http://cwp.catarc.org.cn:8077/memberApi";
+window._CONFIG["memberDomianWebSocketURL"] = "http://cwp.catarc.org.cn/memberApi";
diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue
index b5a932e..856198b 100644
--- a/src/components/detailPage/MeetingList.vue
+++ b/src/components/detailPage/MeetingList.vue
@@ -39,19 +39,27 @@
         <!-- 可报名 或者不存在会议报名状态 且 会议未结束 有报名按钮 -->
 <!--        <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 缴费方式 为 汇款 或者现场缴费 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>
+        <!-- A 缴费方式为 汇款 || 现场缴费   B 报名审核信息通过  -->
+        <template v-if="(record.payMode === 1 || record.payMode === 2) && record.registerCheckResult === 1">
+          <!--  上传凭证按钮 判断依据: A 待上传凭证 | 凭证被拒绝 状态 B 缴费方式为汇款+现场缴费、会议状态进行中 || 缴费方式为汇款 、会议状态为未开始 -->
+          <a v-if="(record.signUpStatus === SignUpStatusEnum.pendingUploadVoucher.index || record.signUpStatus === SignUpStatusEnum.rejectedVoucher.index)
+              && (record.meetingStatus === MeetingStatusEnums.onGoing.index || (record.payMode === 1 && record.meetingStatus === MeetingStatusEnums.noStart.index))"
+             class="action-btn"
+             @click="uploadPaymentRecord(record)"
+          >上传凭证</a>
+
+          <!-- 查看凭证按钮判断依据:  A 身份是参会人 B 凭证字段有值 C 会议签到状态 不是(待上传凭证 | 凭证被拒绝) 状态  D 会议状态是进行中 || 已结束 || (未开始 && 缴费方式是汇款)-->
+          <!-- 查看凭证按钮判断依据:会议签到状态是 凭证审核中 -->
+          <a v-if="record.identity === MeetIdentifyTypeEnums.attendee.index
+          && record.paymentRecord
+          && (record.signUpStatus !== SignUpStatusEnum.pendingUploadVoucher.index && record.signUpStatus !== SignUpStatusEnum.rejectedVoucher.index)
+          && (record.meetingStatus === MeetingStatusEnums.onGoing.index || record.meetingStatus === MeetingStatusEnums.ended.index || (record.meetingStatus === MeetingStatusEnums.noStart.index && record.payMode === 1))"
+             class="action-btn"
+             @click="uploadPaymentRecord(record)"
+          >查看凭证</a>
         </template>
-        <!-- 待签到状态 显示-->
+        <!--  A 缴费方式 为 汇款 或者现场缴费 B 会议状态为进行中 || 已结束 C报名审核信息通过  D身份是参会人 E凭证字段有值 F 不是（待上传凭证 | 凭证被拒绝）状态 -->
+        <!--  待签到状态 显示-->
         <a v-if="record.signUpStatus === SignUpStatusEnum.pendingSignIn.index" class="action-btn action-text">请用小程序现场签到</a>
       </template>
     </a-table>
@@ -68,7 +76,7 @@
 import { getAction } from '../../api/manage'
 import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal'
 import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCertificateModal'
-import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums } from '../../enums/commonEnum'
+import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetIdentifyTypeEnums } from '../../enums/commonEnum'
 import { compareCurrentTime } from '../../utils/meetingJudgeUtil'
 
 // 表格的列配置
@@ -136,7 +144,7 @@ const columns = [
     dataIndex: 'action',
     align: 'center',
     fixed: 'right',
-    width: 180,
+    width: 220,
     scopedSlots: { customRender: 'action' }
   }
 ]
@@ -173,6 +181,7 @@ export default {
       SignUpStatusEnum,
       MeetingStatusEnums,
       MeetingSignUpTypeEnums,
+      MeetIdentifyTypeEnums,
       dataSource: [],
       loading: false,
       /* 分页参数 */
diff --git a/src/enums/commonEnum.js b/src/enums/commonEnum.js
index 300ec41..df958b4 100644
--- a/src/enums/commonEnum.js
+++ b/src/enums/commonEnum.js
@@ -41,3 +41,9 @@ export const MeetingTypeEnums = {
   committee: { name: '分标委会议', index: 5 },
   council: { name: '理事会会议', index: 6 }
 }
+// 参会人员身份类型
+export const MeetIdentifyTypeEnums = {
+  guest: { name: '嘉宾', index: 1 },
+  attendee: { name: '参会人', index: 2 },
+  internal: { name: '内部企业', index: 3 }
+}
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index ccecc49..baccee9 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -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: [
         {
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index 46ee13b..8156aaa 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -107,20 +107,25 @@
               <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.onGoing.index
-                && item.registerCheckResult === 1
-                && item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
-              >
-                <!-- 凭证待审核 状态有查看凭证按钮 -->
-                <a-button v-if="item.signUpStatus === SignUpStatusEnum.pendingReviewVoucher.index" class="cell-btn" type="primary"
-                          @click.stop="uploadPaymentRecord(item)">查看凭证
+              <!-- 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-button v-if="item.signUpStatus === SignUpStatusEnum.pendingUploadVoucher.index || item.signUpStatus === SignUpStatusEnum.rejectedVoucher.index" class="cell-btn" type="primary"
-                          @click.stop="uploadPaymentRecord(item)">上传凭证
+                <!-- 有上传凭证按钮: 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>
@@ -182,7 +187,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, MeetingTypeEnums } from '@/enums/commonEnum'
+import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetingTypeEnums, MeetIdentifyTypeEnums } from '@/enums/commonEnum'
 import { compareCurrentTime } from '../../../utils/meetingJudgeUtil'
 
 
@@ -224,6 +229,7 @@ export default {
       MeetingStatusEnums,
       MeetingSignUpTypeEnums,
       MeetingTypeEnums,
+      MeetIdentifyTypeEnums,
       // 会议分类 全部 0  可报名 1 已报名 2
       meetingStatusArr: [
         {