From 31735fcb277619c65896e40679150cef26976f0a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 23 Dec 2021 17:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=AF=E6=8A=A5=E5=90=8D=E7=9A=84=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dict/JDictSelectTag.vue        | 20 ++++++
 src/enums/commonEnum.js                       |  4 +-
 src/views/MessagePage/MeetingDetailModal.vue  | 16 +++--
 src/views/meetingActivity/MeetingActivity.vue | 64 +++++++++++--------
 4 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue
index cf2773b..ecb8541 100644
--- a/src/components/dict/JDictSelectTag.vue
+++ b/src/components/dict/JDictSelectTag.vue
@@ -32,6 +32,11 @@
       getPopupContainer:{
         type: Function,
         default: (node) => node.parentNode
+      },
+      // 根据传进来的key值 删除某一项
+      delItem:{
+        type:[String,Array],
+        required:false
       }
     },
     data() {
@@ -46,6 +51,13 @@
         handler() {
           this.initDictData()
         },
+      },
+      dictOptions:{
+        immediate:true,
+        handler(val) {
+          return val
+        },
+        deep:true
       }
     },
     created() {
@@ -71,6 +83,10 @@
         //优先从缓存中读取字典配置
         if(getDictItemsFromCache(this.dictCode)){
           this.dictOptions = getDictItemsFromCache(this.dictCode)
+          // 这块写的不全 单纯为了 bug 写的
+          if(this.delItem){
+            this.dictOptions = this.dictOptions.filter(e =>  e.value !== this.delItem )
+          }
           return
         }
 
@@ -79,6 +95,10 @@
           if (res.success) {
 //                console.log(res.result);
             this.dictOptions = res.result
+            if(this.delItem){
+              this.dictOptions = this.dictOptions.filter(e =>  e.value !== this.delItem )
+            }
+
           }
         })
       },
diff --git a/src/enums/commonEnum.js b/src/enums/commonEnum.js
index f643f51..bebd97f 100644
--- a/src/enums/commonEnum.js
+++ b/src/enums/commonEnum.js
@@ -10,8 +10,8 @@ export const YesOrNoEnum = new EsEnums({
 })
 // 会议签到状态
 export const SignUpStatusEnum = {
-  pendingReviewReportInfo: { name: '报名信息待审核', index: 1 },
-  pendingReviewVoucher: { name: '凭证待审核', index: 2 },
+  pendingReviewReportInfo: { name: '报名信息审核中', index: 1 },
+  pendingReviewVoucher: { name: '凭证审核中', index: 2 },
   noParticipation: { name: '不可参会', index: 3 },
   pendingUploadVoucher: { name: '待上传凭证', index: 4 },
   rejectedVoucher: { name: '凭证被拒绝', index: 5 },
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index fab5134..1b51a9f 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -204,9 +204,9 @@
               </span>
             </a-col>
           </a-row>
-          <div>
-            <a-button type="primary" @click="goSignUpPage">报名</a-button>
-          </div>
+<!--          <div>-->
+<!--            <a-button type="primary" @click="goSignUpPage">报名</a-button>-->
+<!--          </div>-->
         </template>
       </section>
       <!--  国际研讨会嘉宾身份个人信息的显示 -->
@@ -517,11 +517,15 @@
               </span>
             </a-col>
           </a-row>
-          <div>
-            <a-button type="primary" @click="goSignUpPage">报名</a-button>
-          </div>
+<!--         只有可报名的会议 才能去报名 -->
+
+
         </template>
       </section>
+
+      <div v-if="model.meetingSignUpType+'' === '1' ">
+        <a-button type="primary" @click="goSignUpPage" >报名 </a-button>
+      </div>
     </a-spin>
     <!--报名信息end-->
     <!--会议资料begin-->
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 4fafe0f..647a84e 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="meeting main-box">
     <div class="title">
-      <a-icon type="user" />
+      <a-icon type="user"/>
       <span class="my-meeting">我的会议</span>
     </div>
     <div class="content">
@@ -59,11 +59,18 @@
                                    v-model="queryParam.meetingStatus"></j-dict-select-tag>
               </a-form-item>
             </a-col>
-
-            <a-col :xl="7" :lg="8" :md="8" :sm="24">
+            <!--可报名的不显示 报名状态  全部显示 的 -->
+            <a-col :xl="7" :lg="8" :md="8" :sm="24" v-if="meetingKey === '0'  ">
               <a-form-item label="报名状态">
-                <j-dict-select-tag dict-code="sign_up_status" placeholder="请选择报名状态"
-                                   v-model="queryParam.signUpStatus"></j-dict-select-tag>
+                <j-dict-select-tag :key="new Date().getTime()" dict-code="sign_up_status" placeholder="请选择报名状态"
+                                   v-model="queryParam.signUpStatus" ></j-dict-select-tag>
+              </a-form-item>
+            </a-col>
+            <!-- 已报名的不显示 可报名选择项 -->
+            <a-col :xl="7" :lg="8" :md="8" :sm="24" v-if="meetingKey === '2'  ">
+              <a-form-item label="报名状态">
+                <j-dict-select-tag dict-code="sign_up_status" placeholder="请选择报名状态" :key="new Date().getTime()"
+                                   v-model="queryParam.signUpStatus" del-item="8"></j-dict-select-tag>
               </a-form-item>
             </a-col>
 
@@ -80,7 +87,8 @@
       <!--列表区域begin-->
       <a-spin :spinning="loading">
         <div class="list" v-if="tableData.length > 0">
-          <div class="item-meeting" v-for="(item,index) of tableData" :key="index" @click.stop="openMeetingDetail(item)">
+          <div class="item-meeting" v-for="(item,index) of tableData" :key="index"
+               @click.stop="openMeetingDetail(item)">
             <p class="item-meeting-meetingName">
               <j-ellipsis class="primary-color" :value="item.meetingName"
                           :length="20"></j-ellipsis>
@@ -88,16 +96,16 @@
             <!--这里需要修改  会议费用分人显示不同的会议费用  2021-09-29 跟需求沟通说是不显示-->
             <!--            <p class="item-meeting-meetingCost"><span>￥</span>{{ item.meetingCosts }}</p>-->
             <p class="item-meeting-img item-meeting-meetingDirector">
-              <img src="../../assets/meetingImgs/meeting-user.png" />
+              <img src="../../assets/meetingImgs/meeting-user.png"/>
               负责人：{{ item.directorName }}
             </p>
             <p class="item-meeting-img item-meeting-meetingAddress">
-              <img src="../../assets/meetingImgs/meeting-address.png" />
+              <img src="../../assets/meetingImgs/meeting-address.png"/>
               召开地点：
               <j-ellipsis :value="item.venue + '/' + item.address " :length="20"></j-ellipsis>
             </p>
             <p class="item-meeting-img item-meeting-meetingTime">
-              <img src="../../assets/meetingImgs/meeting-time.png" />
+              <img src="../../assets/meetingImgs/meeting-time.png"/>
               召开时间：{{ item.startTime }}~{{ item.endTime }}
               <!--              <j-ellipsis :value="item.startTime + '~' + item.endTime" :length="30"></j-ellipsis>-->
             </p>
@@ -105,7 +113,7 @@
             <p class="item-meeting-img item-meeting-meetingTime item-sign-up-status"
                v-show="item.payMode !== 3 ">
               <img src="../../assets/meetingImgs/meeting-audit.png"
-                   class="audit-img" />报名状态：{{ item.signUpStatus_dictText || '无'  }}
+                   class="audit-img"/>报名状态：{{ item.signUpStatus_dictText || '无' }}
               <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为 未开始 或 进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
               <template
                 v-if="(item.payMode === 2 || item.payMode === 1)
@@ -148,9 +156,12 @@
                         </p>
             -->
 
-            <img v-if="item.meetingStatus === MeetingStatusEnums.noStart.index " class="meeting-img-status" src="@/assets/meetingImgs/no-start.png" />
-            <img v-if="item.meetingStatus === MeetingStatusEnums.onGoing.index " class="meeting-img-status" src="@/assets/meetingImgs/ing.png" />
-            <img v-if="item.meetingStatus === MeetingStatusEnums.ended.index " class="meeting-img-status" src="@/assets/meetingImgs/end.png" />
+            <img v-if="item.meetingStatus === MeetingStatusEnums.noStart.index " class="meeting-img-status"
+                 src="@/assets/meetingImgs/no-start.png"/>
+            <img v-if="item.meetingStatus === MeetingStatusEnums.onGoing.index " class="meeting-img-status"
+                 src="@/assets/meetingImgs/ing.png"/>
+            <img v-if="item.meetingStatus === MeetingStatusEnums.ended.index " class="meeting-img-status"
+                 src="@/assets/meetingImgs/end.png"/>
           </div>
           <i></i>
           <i></i>
@@ -159,7 +170,7 @@
           <i></i>
         </div>
         <section v-else class="list-empty">
-          <a-list :data-source="[]" />
+          <a-list :data-source="[]"/>
         </section>
       </a-spin>
       <!--列表区域end-->
@@ -187,13 +198,13 @@
 </template>
 <script>
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
-import { RangeDateMixin } from '@/mixins/RangeDateMixin'
+import {RangeDateMixin} from '@/mixins/RangeDateMixin'
 import JDate from '@comp/tools/JDate'
 import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCertificateModal'
-import { getAction } from '@api/manage'
+import {getAction} from '@api/manage'
 import JEllipsis from '@comp/jero/JEllipsis'
 import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal'
-import { SignUpStatusEnum, MeetingStatusEnums } from '@/enums/commonEnum'
+import {SignUpStatusEnum, MeetingStatusEnums} from '@/enums/commonEnum'
 
 
 export default {
@@ -252,14 +263,14 @@ export default {
       meetingType: '',
       selectedMeetingType: undefined,
       meetingTypeList: [
-        { name: '工作组会议', value: '1' },
-        { name: '国际研讨会', value: '3' },
-        { name: '其他会议', value: '4' },
-        { name: '分标委会议', value: '5' },
-        { name: '理事会会议', value: '6' },
-        { name: '信息交流会', value: '7' },
-        { name: '培训会', value: '8' },
-        { name: '宣贯会', value: '9' }
+        {name: '工作组会议', value: '1'},
+        {name: '国际研讨会', value: '3'},
+        {name: '其他会议', value: '4'},
+        {name: '分标委会议', value: '5'},
+        {name: '理事会会议', value: '6'},
+        {name: '信息交流会', value: '7'},
+        {name: '培训会', value: '8'},
+        {name: '宣贯会', value: '9'}
       ]
     }
   },
@@ -350,7 +361,7 @@ export default {
       this.queryParam.meetingEndTime = this.queryParam.meetingEndTime ? this.queryParam.meetingEndTime + ' ' + '23:59:59' : undefined
       this.queryParam.createTime_begin = this.queryParam.createTime_begin ? this.queryParam.createTime_begin + ' ' + '00:00:00' : undefined
       this.queryParam.createTime_end = this.queryParam.createTime_end ? this.queryParam.createTime_end + ' ' + '23:59:59' : undefined
-      this.lastQueryParam = { ...this.queryParam }
+      this.lastQueryParam = {...this.queryParam}
       this.initData(1)
     },
     /*
@@ -552,6 +563,7 @@ export default {
 .list-empty {
   margin: 20px auto !important;
 }
+
 // 面板中上传凭证按钮等相关功能
 // 报名状态 的row
 .item-sign-up-status {