From bf1238dc26e0c9f8b584502336288f75714aef85 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Wed, 15 Dec 2021 14:41:28 +0800
Subject: [PATCH] =?UTF-8?q?[update]-=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=A8=A1=E6=80=81=E6=A1=86=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4=EF=BC=9B=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=B3=BB=E7=BB=9F=E4=BC=9A=E8=AE=AE=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/MeetingDetailModal.vue  | 892 ++++++++++--------
 src/views/MessagePage/modules/FileTable.vue   |   7 +-
 src/views/MessagePage/modules/SignStep.vue    | 189 ++++
 .../InfoCommunicationMeeting.vue              |   2 +-
 .../standardsAssociation/TrainingMeeting.vue  |   2 +-
 .../meeting/MeetingList.vue                   |   6 +-
 6 files changed, 695 insertions(+), 403 deletions(-)
 create mode 100644 src/views/MessagePage/modules/SignStep.vue

diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 8db8b48..27ed5c7 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -46,10 +46,28 @@
         </a-col>
         <a-col :span="12">
           <label>会议通知：</label>
-          <span style="width: 100%;"><preview-file style="width: 80%" :file-id="model.meetingFiles"></preview-file></span>
+          <span style="width: 100%;">
+            <preview-file style="width: 80%" :file-id="model.meetingFiles"></preview-file>
+          </span>
         </a-col>
       </a-row>
-      <a-row :gutter="24" class="flex-col" v-if="model.paymentQrCode">
+      <a-row :gutter="24" class="flex-col">
+        <a-col :span="12">
+          <label>会议费用：</label>
+          <span>{{ model.meetingCosts }} 元/人</span>
+        </a-col>
+        <a-col :span="12" v-show="model.meetingType === '2' ">
+          <label>会议费用(标协会员)：</label>
+          <span>{{ model.meetingCostsVip }} 元/人</span>
+        </a-col>
+        <a-col :span="12" v-if="model.paymentQrCode && model.meetingType !== '2'">
+          <label>收费二维码：</label>
+          <span>
+            <img :src="paymentQrCodeSrc" alt="nothing show" class="payment-qrcode-img" />
+          </span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" class="flex-col" v-if="model.paymentQrCode && model.meetingType === '2'">
         <a-col :span="24">
           <label>收费二维码：</label>
           <span>
@@ -69,7 +87,8 @@
     <section class="logistics-info">
       <h3 class="title">开票邮寄信息</h3>
       <div>
-        <span class="collapse-span color-blue" @click="showMoreInfo = !showMoreInfo">{{showMoreInfo ? '收起': '查看'}}</span>
+        <span class="collapse-span color-blue"
+              @click="showMoreInfo = !showMoreInfo">{{ showMoreInfo ? '收起' : '查看' }}</span>
       </div>
       <div class="wrap-table" :class="{'hide': !showMoreInfo}">
         <a-table
@@ -95,390 +114,437 @@
     <!--开票邮寄信息end-->
 
     <!--报名信息begin-->
-    <!--  除开国际研讨会嘉宾身份个人信息的显示   -->
-    <section class="base-info" v-if="!(model.meetingType === 3 && situationInfo.identity === 1 )">
-      <h3 class="title">报名信息</h3>
-      <a-row :gutter="24" class="flex-col">
-        <a-col :span="12">
-          <label>参会单位：</label>
-          <span><j-ellipsis :value="situationInfo.companyName" :length="20"></j-ellipsis></span>
-        </a-col>
+    <a-spin :spinning="situationInfoLoading">
+      <!--  除开国际研讨会嘉宾身份个人信息的显示   -->
+      <section class="base-info" v-if="!(model.meetingType === 3 && situationInfo.identity === 1 )">
+        <h3 class="title">报名信息</h3>
+        <template v-if="Object.keys(situationInfo).length > 0">
+          <section>
+            <a-row :gutter="24" class="flex-col">
+              <a-col :span="12">
+                <label>参会单位：</label>
+                <span><j-ellipsis :value="situationInfo.companyName" :length="20"></j-ellipsis></span>
+              </a-col>
 
-      </a-row>
-      <a-row :gutter="24" class="flex-col">
-        <a-col :span="12">
-          <label>参会人：</label>
-          <span><j-ellipsis :value="situationInfo.companyContactName" :length="20"></j-ellipsis></span>
-        </a-col>
-        <a-col :span="12">
-          <label>身份：</label>
-          <span><j-ellipsis :value="situationInfo.identity_dictText" :length="20"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24" class="flex-col">
-        <a-col :span="12">
-          <label>手机号：</label>
-          <span><j-ellipsis :value="situationInfo.phone" :length="20"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-      <!--      行程信息 -->
-      <a-row :gutter="24" class="flex-col">
-        <a-col :span="12" v-show="situationInfo.checkInHotel_dictText">
-          <label>是否住酒店：</label>
-          <span>{{ situationInfo.checkInHotel_dictText }}</span>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24" class="flex-col" v-if=" (situationInfo.arrivalTime || situationInfo.departureTime)">
-        <a-col :span="12" v-show="situationInfo.arrivalTime">
-          <label>抵达时间：</label>
-          <span>{{ situationInfo.arrivalTime }}</span>
-        </a-col>
-        <a-col :span="12" v-show="situationInfo.departureTime">
-          <label>离开时间：</label>
-          <span> {{ situationInfo.departureTime }}</span>
-        </a-col>
-      </a-row>
-      <!--      只有参会人才会显示  会议费用为 0 不显示  -->
-      <a-row :gutter="24" class="flex-col" v-show="situationInfo.identity === 2 && model.meetingCosts !== '0.00' ">
-        <a-col :span="12">
-          <label>付款方式：</label>
-          <span><j-ellipsis :value="situationInfo.payMode_dictText" :length="20"></j-ellipsis></span>
-        </a-col>
-        <!-- 缴费方式为打包不显示-->
-        <a-col :span="12" v-show="situationInfo.payMode !== 3">
-          <label>需要发票：</label>
-          <span><j-ellipsis :value="situationInfo.needInvoice_dictText" :length="20"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-      <!--      缴费方式为打包时候 不需要发票  不显示 会议费用为 0 不显示 -->
-      <a-row :gutter="24"
-             v-if=" situationInfo.needInvoice !== 0 && situationInfo.identity === 2 && model.meetingCosts !== '0.00' "
-             class="flex-col">
-        <a-col :span="12">
-          <label>发票邮寄地址：</label>
-          <span><j-ellipsis :value="situationInfo.postContactAddress" :length="20"></j-ellipsis></span>
-        </a-col>
-        <a-col :span="12">
-          <label>邮编：</label>
-          <span><j-ellipsis :value="situationInfo.postCode" :length="20"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-    </section>
-    <!--  国际研讨会嘉宾身份个人信息的显示 -->
-    <section class="base-info" v-else>
-      <h3 class="title">报名信息</h3>
-      <a-row :gutter="24" class="flex-col">
-        <a-col :span="12">
-          <label>参会单位：</label>
-          <span><j-ellipsis :value="situationInfo.companyName" :length="20"></j-ellipsis></span>
-        </a-col>
-
-      </a-row>
-      <a-row :gutter="24" class="flex-col">
-        <a-col :span="12">
-          <label>参会人：</label>
-          <span><j-ellipsis :value="situationInfo.companyContactName" :length="20"></j-ellipsis></span>
-        </a-col>
-        <a-col :span="12">
-          <label>身份：</label>
-          <span><j-ellipsis :value="situationInfo.identity_dictText" :length="20"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24" class="flex-col">
-        <a-col :span="12">
-          <label>手机号：</label>
-          <span><j-ellipsis :value="situationInfo.phone" :length="20"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-
-      <!--vip身份显示-->
-     <section  v-show="situationInfo.guestType == 1 ">
-       <a-row :gutter="24" class="flex-col">
-         <a-col :span="12" v-show="situationInfo.speechTopic">
-           <label>演讲题目：</label>
-           <span>{{ situationInfo.speechTopic }}</span>
-         </a-col>
-         <a-col :span="12" v-show="situationInfo.speechPpt">
-           <label>演讲ppt：</label>
-           <span style="width: 100%;"><preview-file style="width: 80%" :file-id="situationInfo.speechPpt"></preview-file></span>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24" class="flex-col">
-         <a-col :span="12" v-show="situationInfo.photo">
-           <label>照片：</label>
-           <span><j-image-upload v-if="situationInfo.photo" :return-id="true" v-model="situationInfo.photo" disabled></j-image-upload></span>
-         </a-col>
-         <a-col :span="12" v-show="situationInfo.profile">
-           <label>个人简介：</label>
-           <span>{{situationInfo.profile}}</span>
-         </a-col>
-
-       </a-row>
-       <a-row :gutter="24" class="flex-col">
-         <a-col :span="12">
-           <label>是否用餐：</label>
-           <span>{{ situationInfo.haveMeals_dictText }}</span>
-         </a-col>
-         <a-col :span="12" v-show="situationInfo.haveMeals === 1">
-           <label>是否回民：</label>
-           <span> {{ situationInfo.huiPeople_dictText }}</span>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24" class="flex-col">
-         <a-col :span="12" >
-           <label>是否住酒店：</label>
-           <span>{{ situationInfo.checkInHotel_dictText }}</span>
-         </a-col>
-         <a-col :span="12" v-show="situationInfo.checkInHotel === 1">
-           <label>入住酒店时间：</label>
-           <span> {{ situationInfo.inHotelTime }}</span>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24" class="flex-col" v-show="situationInfo.checkInHotel === 1">
-         <a-col :span="12" >
-           <label>离店时间：</label>
-           <span>{{ situationInfo.outHotelTime }}</span>
-         </a-col>
-         <a-col :span="12"  >
-           <label>房型：</label>
-           <span> {{ situationInfo.roomLayout }}</span>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24" class="flex-col">
-         <a-col :span="12" >
-           <label>是否需要接站：</label>
-           <span>{{ situationInfo.pickUp_dictText }}</span>
-         </a-col>
-         <a-col :span="12" v-show="situationInfo.pickUp === 1">
-           <label>抵达时间：</label>
-           <span> {{ situationInfo.arrivalTime }}</span>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
-         <a-col :span="12" >
-           <label>到达站：</label>
-           <span>{{ situationInfo.destination }}</span>
-         </a-col>
-         <a-col :span="12"  >
-           <label>到达班次：</label>
-           <span> {{ situationInfo.arrivalShift }}</span>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24" class="flex-col">
-         <a-col :span="12" >
-           <label>是否需要送站：</label>
-           <span>{{ situationInfo.deliveryStation_dictText }}</span>
-         </a-col>
-         <a-col :span="12" v-show="situationInfo.deliveryStation === 1">
-           <label>离开时间：</label>
-           <span> {{ situationInfo.departureTime }}</span>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
-         <a-col :span="12" >
-           <label>离开站：</label>
-           <span>{{ situationInfo.departureStation }}</span>
-         </a-col>
-         <a-col :span="12"  >
-           <label>离开班次：</label>
-           <span> {{ situationInfo.departureShift }}</span>
-         </a-col>
-       </a-row>
-       <a-row :gutter="24" class="flex-col">
-         <a-col :span="12" v-show="situationInfo.peer">
-           <label>同行人：</label>
-           <span>{{ situationInfo.peer }}</span>
-         </a-col>
-         <a-col :span="12"  v-show="situationInfo.remark">
-           <label>备注：</label>
-           <span> {{ situationInfo.remark }}</span>
-         </a-col>
-       </a-row>
-     </section>
-<!--     演讲嘉宾显示  -->
-      <section  v-show="situationInfo.guestType == 2 ">
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12" v-show="situationInfo.speechTopic">
-            <label>演讲题目：</label>
-            <span>{{ situationInfo.speechTopic }}</span>
-          </a-col>
-          <a-col :span="12" v-show="situationInfo.speechPpt">
-            <label>演讲ppt：</label>
-            <span style="width: 100%;"><preview-file style="width: 80%" :file-id="situationInfo.speechPpt"></preview-file></span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12" v-show="situationInfo.photo">
-            <label>照片：</label>
-            <span><j-image-upload v-if="situationInfo.photo" :return-id="true" v-model="situationInfo.photo" disabled></j-image-upload></span>
-          </a-col>
-          <a-col :span="12" v-show="situationInfo.profile">
-            <label>个人简介：</label>
-            <span>{{situationInfo.profile}}</span>
-          </a-col>
-
-        </a-row>
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12">
-            <label>是否用餐：</label>
-            <span>{{ situationInfo.haveMeals_dictText }}</span>
-          </a-col>
-          <a-col :span="12" v-show="situationInfo.haveMeals === 1">
-            <label>是否回民：</label>
-            <span> {{ situationInfo.huiPeople_dictText }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12" >
-            <label>是否需要接站：</label>
-            <span>{{ situationInfo.pickUp_dictText }}</span>
-          </a-col>
-          <a-col :span="12" v-show="situationInfo.pickUp === 1">
-            <label>抵达时间：</label>
-            <span> {{ situationInfo.arrivalTime }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
-          <a-col :span="12" >
-            <label>到达站：</label>
-            <span>{{ situationInfo.destination }}</span>
-          </a-col>
-          <a-col :span="12"  >
-            <label>到达班次：</label>
-            <span> {{ situationInfo.arrivalShift }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12" >
-            <label>是否需要送站：</label>
-            <span>{{ situationInfo.deliveryStation_dictText }}</span>
-          </a-col>
-          <a-col :span="12" v-show="situationInfo.deliveryStation === 1">
-            <label>离开时间：</label>
-            <span> {{ situationInfo.departureTime }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
-          <a-col :span="12" >
-            <label>离开站：</label>
-            <span>{{ situationInfo.departureStation }}</span>
-          </a-col>
-          <a-col :span="12"  >
-            <label>离开班次：</label>
-            <span> {{ situationInfo.departureShift }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12" v-show="situationInfo.peer">
-            <label>同行人：</label>
-            <span>{{ situationInfo.peer }}</span>
-          </a-col>
-          <a-col :span="12"  v-show="situationInfo.remark">
-            <label>备注：</label>
-            <span> {{ situationInfo.remark }}</span>
-          </a-col>
-        </a-row>
+            </a-row>
+            <a-row :gutter="24" class="flex-col">
+              <a-col :span="12">
+                <label>参会人：</label>
+                <span><j-ellipsis :value="situationInfo.companyContactName" :length="20"></j-ellipsis></span>
+              </a-col>
+              <a-col :span="12">
+                <label>身份：</label>
+                <span><j-ellipsis :value="situationInfo.identity_dictText" :length="20"></j-ellipsis></span>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" class="flex-col">
+              <a-col :span="12">
+                <label>手机号：</label>
+                <span><j-ellipsis :value="situationInfo.phone" :length="20"></j-ellipsis></span>
+              </a-col>
+            </a-row>
+            <!--      行程信息 -->
+            <a-row :gutter="24" class="flex-col">
+              <a-col :span="12" v-show="situationInfo.checkInHotel_dictText">
+                <label>是否住酒店：</label>
+                <span>{{ situationInfo.checkInHotel_dictText }}</span>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" class="flex-col" v-if=" (situationInfo.arrivalTime || situationInfo.departureTime)">
+              <a-col :span="12" v-show="situationInfo.arrivalTime">
+                <label>抵达时间：</label>
+                <span>{{ situationInfo.arrivalTime }}</span>
+              </a-col>
+              <a-col :span="12" v-show="situationInfo.departureTime">
+                <label>离开时间：</label>
+                <span> {{ situationInfo.departureTime }}</span>
+              </a-col>
+            </a-row>
+            <!--      只有参会人才会显示  会议费用为 0 不显示  -->
+            <a-row :gutter="24" class="flex-col" v-show="situationInfo.identity === 2 && model.meetingCosts !== '0.00' ">
+              <a-col :span="12">
+                <label>付款方式：</label>
+                <span><j-ellipsis :value="situationInfo.payMode_dictText" :length="20"></j-ellipsis></span>
+              </a-col>
+              <!-- 缴费方式为打包不显示-->
+              <a-col :span="12" v-show="situationInfo.payMode !== 3">
+                <label>需要发票：</label>
+                <span><j-ellipsis :value="situationInfo.needInvoice_dictText" :length="20"></j-ellipsis></span>
+              </a-col>
+            </a-row>
+            <!--      缴费方式为打包时候 不需要发票  不显示 会议费用为 0 不显示 -->
+            <a-row :gutter="24"
+                   v-if=" situationInfo.needInvoice !== 0 && situationInfo.identity === 2 && model.meetingCosts !== '0.00' "
+                   class="flex-col">
+              <a-col :span="12">
+                <label>发票邮寄地址：</label>
+                <span><j-ellipsis :value="situationInfo.postContactAddress" :length="20"></j-ellipsis></span>
+              </a-col>
+              <a-col :span="12">
+                <label>邮编：</label>
+                <span><j-ellipsis :value="situationInfo.postCode" :length="20"></j-ellipsis></span>
+              </a-col>
+            </a-row>
+          </section>
+        </template>
+        <template>
+          <a-row :gutter="24" class="flex-col">
+            <!--    /*
+            * 1、判断当前会议是否需要缴费，通过会议详情中的 meetingCosts 字段判断，如果是‘0.00’则是不需要花钱的
+            * 2、报名详情中的 registerProcess 代表报名状态，类型是 1-15 对应需求文档中的不同状态
+            * */      -->
+            <a-col :span="12">
+              <label>报名状态：</label>
+              <span>
+                <sign-step :register-process="Number(situationInfo.registerProcess)" :need-costs="model.meetingCosts !== '0.00'"></sign-step>
+              </span>
+            </a-col>
+          </a-row>
+          <div>
+            <a-button type="primary" @click="goSignUpPage">报名</a-button>
+          </div>
+        </template>
       </section>
-<!--      特邀嘉宾显示-->
-      <section  v-show="situationInfo.guestType == 3 ">
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12">
-            <label>是否用餐：</label>
-            <span>{{ situationInfo.haveMeals_dictText }}</span>
-          </a-col>
-          <a-col :span="12" v-show="situationInfo.haveMeals === 1">
-            <label>是否回民：</label>
-            <span> {{ situationInfo.huiPeople_dictText }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12" >
-            <label>是否需要接站：</label>
-            <span>{{ situationInfo.pickUp_dictText }}</span>
-          </a-col>
-          <a-col :span="12" v-show="situationInfo.pickUp === 1">
-            <label>抵达时间：</label>
-            <span> {{ situationInfo.arrivalTime }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
-          <a-col :span="12" >
-            <label>到达站：</label>
-            <span>{{ situationInfo.destination }}</span>
-          </a-col>
-          <a-col :span="12"  >
-            <label>到达班次：</label>
-            <span> {{ situationInfo.arrivalShift }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12" >
-            <label>是否需要送站：</label>
-            <span>{{ situationInfo.deliveryStation_dictText }}</span>
-          </a-col>
-          <a-col :span="12" v-show="situationInfo.deliveryStation === 1">
-            <label>离开时间：</label>
-            <span> {{ situationInfo.departureTime }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
-          <a-col :span="12" >
-            <label>离开站：</label>
-            <span>{{ situationInfo.departureStation }}</span>
-          </a-col>
-          <a-col :span="12"  >
-            <label>离开班次：</label>
-            <span> {{ situationInfo.departureShift }}</span>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" class="flex-col">
-          <a-col :span="12" v-show="situationInfo.peer">
-            <label>同行人：</label>
-            <span>{{ situationInfo.peer }}</span>
-          </a-col>
-        </a-row>
+      <!--  国际研讨会嘉宾身份个人信息的显示 -->
+      <section class="base-info" v-else>
+        <h3 class="title">报名信息</h3>
+        <template v-if="Object.keys(situationInfo).length > 0">
+          <section>
+            <a-row :gutter="24" class="flex-col">
+              <a-col :span="12">
+                <label>参会单位：</label>
+                <span><j-ellipsis :value="situationInfo.companyName" :length="20"></j-ellipsis></span>
+              </a-col>
+
+            </a-row>
+            <a-row :gutter="24" class="flex-col">
+              <a-col :span="12">
+                <label>参会人：</label>
+                <span><j-ellipsis :value="situationInfo.companyContactName" :length="20"></j-ellipsis></span>
+              </a-col>
+              <a-col :span="12">
+                <label>身份：</label>
+                <span><j-ellipsis :value="situationInfo.identity_dictText" :length="20"></j-ellipsis></span>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" class="flex-col">
+              <a-col :span="12">
+                <label>手机号：</label>
+                <span><j-ellipsis :value="situationInfo.phone" :length="20"></j-ellipsis></span>
+              </a-col>
+            </a-row>
+
+            <!--vip身份显示-->
+            <section v-show="situationInfo.guestType == 1 ">
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12" v-show="situationInfo.speechTopic">
+                  <label>演讲题目：</label>
+                  <span>{{ situationInfo.speechTopic }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.speechPpt">
+                  <label>演讲ppt：</label>
+                  <span style="width: 100%;"><preview-file style="width: 80%"
+                                                           :file-id="situationInfo.speechPpt"></preview-file></span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12" v-show="situationInfo.photo">
+                  <label>照片：</label>
+                  <span><j-image-upload v-if="situationInfo.photo" :return-id="true" v-model="situationInfo.photo"
+                                        disabled></j-image-upload></span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.profile">
+                  <label>个人简介：</label>
+                  <span>{{ situationInfo.profile }}</span>
+                </a-col>
+
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否用餐：</label>
+                  <span>{{ situationInfo.haveMeals_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.haveMeals === 1">
+                  <label>是否回民：</label>
+                  <span> {{ situationInfo.huiPeople_dictText }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否住酒店：</label>
+                  <span>{{ situationInfo.checkInHotel_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.checkInHotel === 1">
+                  <label>入住酒店时间：</label>
+                  <span> {{ situationInfo.inHotelTime }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col" v-show="situationInfo.checkInHotel === 1">
+                <a-col :span="12">
+                  <label>离店时间：</label>
+                  <span>{{ situationInfo.outHotelTime }}</span>
+                </a-col>
+                <a-col :span="12">
+                  <label>房型：</label>
+                  <span> {{ situationInfo.roomLayout }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否需要接站：</label>
+                  <span>{{ situationInfo.pickUp_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.pickUp === 1">
+                  <label>抵达时间：</label>
+                  <span> {{ situationInfo.arrivalTime }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
+                <a-col :span="12">
+                  <label>到达站：</label>
+                  <span>{{ situationInfo.destination }}</span>
+                </a-col>
+                <a-col :span="12">
+                  <label>到达班次：</label>
+                  <span> {{ situationInfo.arrivalShift }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否需要送站：</label>
+                  <span>{{ situationInfo.deliveryStation_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.deliveryStation === 1">
+                  <label>离开时间：</label>
+                  <span> {{ situationInfo.departureTime }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
+                <a-col :span="12">
+                  <label>离开站：</label>
+                  <span>{{ situationInfo.departureStation }}</span>
+                </a-col>
+                <a-col :span="12">
+                  <label>离开班次：</label>
+                  <span> {{ situationInfo.departureShift }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12" v-show="situationInfo.peer">
+                  <label>同行人：</label>
+                  <span>{{ situationInfo.peer }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.remark">
+                  <label>备注：</label>
+                  <span> {{ situationInfo.remark }}</span>
+                </a-col>
+              </a-row>
+            </section>
+            <!--     演讲嘉宾显示  -->
+            <section v-show="situationInfo.guestType == 2 ">
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12" v-show="situationInfo.speechTopic">
+                  <label>演讲题目：</label>
+                  <span>{{ situationInfo.speechTopic }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.speechPpt">
+                  <label>演讲ppt：</label>
+                  <span style="width: 100%;"><preview-file style="width: 80%"
+                                                           :file-id="situationInfo.speechPpt"></preview-file></span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12" v-show="situationInfo.photo">
+                  <label>照片：</label>
+                  <span><j-image-upload v-if="situationInfo.photo" :return-id="true" v-model="situationInfo.photo"
+                                        disabled></j-image-upload></span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.profile">
+                  <label>个人简介：</label>
+                  <span>{{ situationInfo.profile }}</span>
+                </a-col>
+
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否用餐：</label>
+                  <span>{{ situationInfo.haveMeals_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.haveMeals === 1">
+                  <label>是否回民：</label>
+                  <span> {{ situationInfo.huiPeople_dictText }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否需要接站：</label>
+                  <span>{{ situationInfo.pickUp_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.pickUp === 1">
+                  <label>抵达时间：</label>
+                  <span> {{ situationInfo.arrivalTime }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
+                <a-col :span="12">
+                  <label>到达站：</label>
+                  <span>{{ situationInfo.destination }}</span>
+                </a-col>
+                <a-col :span="12">
+                  <label>到达班次：</label>
+                  <span> {{ situationInfo.arrivalShift }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否需要送站：</label>
+                  <span>{{ situationInfo.deliveryStation_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.deliveryStation === 1">
+                  <label>离开时间：</label>
+                  <span> {{ situationInfo.departureTime }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
+                <a-col :span="12">
+                  <label>离开站：</label>
+                  <span>{{ situationInfo.departureStation }}</span>
+                </a-col>
+                <a-col :span="12">
+                  <label>离开班次：</label>
+                  <span> {{ situationInfo.departureShift }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12" v-show="situationInfo.peer">
+                  <label>同行人：</label>
+                  <span>{{ situationInfo.peer }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.remark">
+                  <label>备注：</label>
+                  <span> {{ situationInfo.remark }}</span>
+                </a-col>
+              </a-row>
+            </section>
+            <!--      特邀嘉宾显示-->
+            <section v-show="situationInfo.guestType == 3 ">
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否用餐：</label>
+                  <span>{{ situationInfo.haveMeals_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.haveMeals === 1">
+                  <label>是否回民：</label>
+                  <span> {{ situationInfo.huiPeople_dictText }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否需要接站：</label>
+                  <span>{{ situationInfo.pickUp_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.pickUp === 1">
+                  <label>抵达时间：</label>
+                  <span> {{ situationInfo.arrivalTime }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col" v-show="situationInfo.pickUp === 1">
+                <a-col :span="12">
+                  <label>到达站：</label>
+                  <span>{{ situationInfo.destination }}</span>
+                </a-col>
+                <a-col :span="12">
+                  <label>到达班次：</label>
+                  <span> {{ situationInfo.arrivalShift }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12">
+                  <label>是否需要送站：</label>
+                  <span>{{ situationInfo.deliveryStation_dictText }}</span>
+                </a-col>
+                <a-col :span="12" v-show="situationInfo.deliveryStation === 1">
+                  <label>离开时间：</label>
+                  <span> {{ situationInfo.departureTime }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col" v-show="situationInfo.deliveryStation === 1">
+                <a-col :span="12">
+                  <label>离开站：</label>
+                  <span>{{ situationInfo.departureStation }}</span>
+                </a-col>
+                <a-col :span="12">
+                  <label>离开班次：</label>
+                  <span> {{ situationInfo.departureShift }}</span>
+                </a-col>
+              </a-row>
+              <a-row :gutter="24" class="flex-col">
+                <a-col :span="12" v-show="situationInfo.peer">
+                  <label>同行人：</label>
+                  <span>{{ situationInfo.peer }}</span>
+                </a-col>
+              </a-row>
+            </section>
+            <!--合作伙伴身份显示 -->
+            <a-row :gutter="24" class="flex-col" v-show="situationInfo.guestType == 4 ">
+              <a-col :span="12" v-show="situationInfo.arrivalTime">
+                <label>抵达时间：</label>
+                <span>{{ situationInfo.arrivalTime }}</span>
+              </a-col>
+              <a-col :span="12" v-show="situationInfo.departureTime">
+                <label>离开时间：</label>
+                <span> {{ situationInfo.departureTime }}</span>
+              </a-col>
+            </a-row>
+          </section>
+        </template>
+        <!--      v-if="!model.signUpStatus"-->
+        <template>
+          <a-row :gutter="24" class="flex-col">
+            <!--    /*
+            * 1、判断当前会议是否需要缴费，通过会议详情中的 meetingCosts 字段判断，如果是‘0.00’则是不需要花钱的
+            * 2、报名详情中的 registerProcess 代表报名状态，类型是 1-15 对应需求文档中的不同状态
+            * */      -->
+            <a-col :span="12">
+              <label>报名状态：</label>
+              <span>
+                <sign-step :register-process="Number(situationInfo.registerProcess)" :need-costs="model.meetingCosts !== '0.00'"></sign-step>
+              </span>
+            </a-col>
+          </a-row>
+          <div>
+            <a-button type="primary" @click="goSignUpPage">报名</a-button>
+          </div>
+        </template>
       </section>
-      <!--合作伙伴身份显示 -->
-      <a-row :gutter="24" class="flex-col" v-show="situationInfo.guestType == 4 ">
-        <a-col :span="12" v-show="situationInfo.arrivalTime">
-          <label>抵达时间：</label>
-          <span>{{ situationInfo.arrivalTime }}</span>
-        </a-col>
-        <a-col :span="12" v-show="situationInfo.departureTime">
-          <label>离开时间：</label>
-          <span> {{ situationInfo.departureTime }}</span>
-        </a-col>
-      </a-row>
-
-
-    </section>
+    </a-spin>
     <!--报名信息end-->
     <!--会议资料begin-->
     <section class="base-info">
       <h3 class="title">会议资料</h3>
-      <file-table :file-id="model.meetingData" :is-meeting-data-bool="true"></file-table>
+      <file-table :file-id="model.meetingData" :has-limit-bool="true"></file-table>
     </section>
     <!--会议资料end-->
 
     <!--会议纪要begin-->
     <section class="base-info">
       <h3 class="title">会议纪要</h3>
-      <file-table :file-id="model.meetingMinute" :is-meeting-data-bool="false"></file-table>
+      <file-table :file-id="model.meetingMinute" :has-limit-bool="true"></file-table>
     </section>
     <!--会议纪要end-->
     <!--到账信息 begin 2021-12-10 版需求变更去掉了-->
-<!--    <section class="payment-info">
-      <h3 class="title">付款信息</h3>
-      <div class="payment-info-box">
-        <section class="payment-info-title">付款信息</section>
-        <template v-if="paymentInfoList && paymentInfoList.length > 0">
-          <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
-            {{ item.paymentDate }}付款{{ item.amountReceived }}元
+    <!--    <section class="payment-info">
+          <h3 class="title">付款信息</h3>
+          <div class="payment-info-box">
+            <section class="payment-info-title">付款信息</section>
+            <template v-if="paymentInfoList && paymentInfoList.length > 0">
+              <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
+                {{ item.paymentDate }}付款{{ item.amountReceived }}元
+              </div>
+            </template>
+            <a-list v-else :data-source="[]"/>
           </div>
-        </template>
-        <a-list v-else :data-source="[]"/>
-      </div>
-    </section>-->
+        </section>-->
     <!--到账信息end-->
 
     <template slot="footer">
@@ -491,10 +557,11 @@
 import PreviewFile from '@comp/jero/PreviewFile'
 import FileTable from '@/views/MessagePage/modules/FileTable'
 import JEllipsis from '@comp/jero/JEllipsis'
-import {getMeetInfoById, queryCommonProjectById} from '@api/incomePaymentsApi'
-import {getSingUpUserInfo} from '@api/incomePaymentsApi'
+import { getMeetInfoById, queryCommonProjectById } from '@api/incomePaymentsApi'
+import { getSingUpUserInfo } from '@api/incomePaymentsApi'
 import JImageUpload from '@comp/jero/JImageUpload'
 import '@/assets/less/TableExpand.less'
+import SignStep from './modules/SignStep'
 
 const columns = [
   {
@@ -541,7 +608,7 @@ const columns = [
     title: '操作',
     align: 'center',
     dataIndex: '',
-    scopedSlots: {customRender: 'action'}
+    scopedSlots: { customRender: 'action' }
   }
 ]
 export default {
@@ -550,7 +617,8 @@ export default {
     PreviewFile,
     JEllipsis,
     JImageUpload,
-    FileTable
+    FileTable,
+    SignStep
   },
   props: {
     // 是否是从会议点进来的  默认走消息
@@ -570,6 +638,8 @@ export default {
       meetingInfo: {},
       // 参会人信息
       situationInfo: {},
+      // 加载参会信息的标识
+      situationInfoLoading: false,
       columns,
       // 到账信息
       paymentInfoList: [],
@@ -595,10 +665,10 @@ export default {
 
   },
   methods: {
-    open(param) {
+    async open(param) {
       this.visible = true
       // 通过id查询项目详情
-      queryCommonProjectById({id: param.situationId}).then(res => {
+      queryCommonProjectById({ id: param.situationId }).then(res => {
         if (res.success) {
           console.log(res.result, 'res.result')
           // 到账信息
@@ -611,6 +681,7 @@ export default {
       })
 
       if (param && !this.isMeetingBool) {
+        await this.getSingUpUserInfoFunc(param)
         // 消息进来的获取会议的详情
         this.queryMeetingInfoById(param.id).then(res => {
           // 会议详情
@@ -618,24 +689,37 @@ export default {
           console.log(this.model, 'this.model')
         })
         // 查询参会人的信息
-        getSingUpUserInfo({id: param.situationId}).then(res => {
-          if (res.success) {
-            this.situationInfo = res.result
-          }
-        })
+        // getSingUpUserInfo({ id: param.situationId }).then(res => {
+        //   if (res.success) {
+        //     this.situationInfo = res.result
+        //   }
+        // })
 
 
       } else {
         // 会议进来查询的会议信息
         this.model = Object.assign({}, param)
         // 会议进来的查询参会人信息
-
-        getSingUpUserInfo({id: param.situationId}).then(res => {
+        await this.getSingUpUserInfoFunc(param)
+        // getSingUpUserInfo({ id: param.situationId }).then(res => {
+        //   if (res.success) {
+        //     this.situationInfo = res.result
+        //   }
+        // })
+      }
+    },
+    getSingUpUserInfoFunc(param) {
+      return new Promise(resolve => {
+        this.situationInfoLoading = true
+        getSingUpUserInfo({ id: param.situationId }).then(res => {
           if (res.success) {
             this.situationInfo = res.result
           }
+        }).finally(() => {
+          this.situationInfoLoading = false
+          resolve()
         })
-      }
+      })
     },
     close() {
       this.visible = false
@@ -645,8 +729,8 @@ export default {
     },
 
     /*
-* 生成每一个开票信息
-* */
+    * 生成每一个开票信息
+    * */
     createItemInfo(item) {
       let porjectItem = ''
       if (item.projects.length > 0) {
@@ -673,7 +757,7 @@ export default {
     queryMeetingInfoById(id) {
       return new Promise(resolve => {
         let result = {}
-        getMeetInfoById({id}).then(res => {
+        getMeetInfoById({ id }).then(res => {
           if (res.success) {
             result = res.result
           }
@@ -690,7 +774,16 @@ export default {
         case '1':
           return '工作组会议'
         case '2':
-          return '标协会议'
+          switch (this.model.tbMeetingType) {
+            case '1':
+              return '标协会议-标准宣贯'
+            case '2':
+              return '标协会议-培训会'
+            case '3':
+              return '标协会议-信息交流会'
+          }
+          break
+          // return '标协会议'
         case '3':
           return '国际研讨会'
         case '4':
@@ -701,6 +794,10 @@ export default {
           return '其他会议'
       }
     },
+    goSignUpPage() {
+      let url = `${window._CONFIG['singUpQRCodeURL']}?id=${this.model.id}`
+      window.open(url, '_blank')
+    }
 
   }
 }
@@ -840,27 +937,27 @@ h3.title::before {
     border-bottom: 1px solid #ccc;
   }
 }
+
 .payment-qrcode-img {
   width: 100px;
   height: 100px
 }
 
 // 查看 开票邮寄信息
-.logistics-info{
+.logistics-info {
   position: relative;
-  .wrap-table.hide{
+
+  .wrap-table.hide {
     height: 0;
     display: none;
     transition: all 0.5s ease-out;
   }
-  .wrap-table{
+
+  .wrap-table {
     transition: all 0.5s ease-out;
   }
-  //.ant-table.hide{
-  //  height: 0;
-  //  display: none;
-  //}
 }
+
 .collapse-span {
   cursor: pointer;
   color: #069f99 !important;
@@ -870,4 +967,9 @@ h3.title::before {
   right: 0;
   top: 0;
 }
+
+/deep/ .ant-empty-normal {
+  padding: 0;
+  margin: 0;
+}
 </style>
diff --git a/src/views/MessagePage/modules/FileTable.vue b/src/views/MessagePage/modules/FileTable.vue
index 8f3a598..b837e80 100644
--- a/src/views/MessagePage/modules/FileTable.vue
+++ b/src/views/MessagePage/modules/FileTable.vue
@@ -53,8 +53,8 @@ export default {
       type: String,
       required: false
     },
-    /* 是否是会议资料 会议资料有下载的限制 */
-    isMeetingDataBool:{
+    /* 是否有下载的限制 */
+    hasLimitBool:{
       type:Boolean,
       required: false,
       default:false
@@ -113,7 +113,7 @@ export default {
     },
     handleDownLoad(file) {
       console.log(file)
-      if(this.isMeetingDataBool){
+      if(this.hasLimitBool){
         // 会议资料更换了接口
         downloadFile(`sys/common/userDownload/${file.id}`, file.name)
       }else {
@@ -137,5 +137,4 @@ export default {
   padding-left: 20px;
 }
 
-
 </style>
diff --git a/src/views/MessagePage/modules/SignStep.vue b/src/views/MessagePage/modules/SignStep.vue
new file mode 100644
index 0000000..831423f
--- /dev/null
+++ b/src/views/MessagePage/modules/SignStep.vue
@@ -0,0 +1,189 @@
+<!--显示报名的进度-->
+<template>
+<div class="sign-step">
+<!--  wait error-->
+  <a-steps :current="currentShowInfo.currentStep" :status="currentShowInfo.status" size="small" labelPlacement="vertical">
+    <a-step v-for="item in currentShowInfo.stepArr" :description="item" :key="item"></a-step>
+  </a-steps>
+</div>
+</template>
+
+<script>
+/*进度条显示的条件*/
+/*
+* 1、判断当前会议是否需要缴费，通过会议详情中的 meetingCosts 字段判断，如果是‘0.00’则是不需要花钱的
+* 2、报名详情中的 registerProcess 代表报名状态，类型是 1-15 对应需求文档中的不同状态
+* */
+// const
+const stepStatusArr = [
+  {
+    stepArr: ['已报名', '报名成功', '上传凭证', '缴费成功', '已签到'],
+    currentStep: 0,
+    status: 'wait',
+    description: '需要缴费-未报名'
+  },
+  {
+    stepArr: ['已报名', '报名待审核', '上传凭证', '缴费成功', '已签到'],
+    currentStep: 1,
+    status: 'wait',
+    registerProcess: 1,
+    description: '需要缴费-非成员已报名审核'
+  },
+  {
+    stepArr: ['已报名', '不可参会', '上传凭证', '缴费成功', '已签到'],
+    currentStep: 1,
+    status: 'error',
+    registerProcess: 2,
+    description: '需要缴费-非成员被拒绝'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '待上传凭证', '缴费成功', '已签到'],
+    currentStep: 2,
+    status: 'wait',
+    registerProcess: 3,
+    description: '需要缴费-付款方式为汇款现场缴费'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '上传凭证', '凭证待审核', '已签到'],
+    currentStep: 3,
+    status: 'wait',
+    registerProcess: 4,
+    description: '需要缴费-上传完缴费凭证 待审核'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '上传凭证', '凭证被拒绝', '已签到'],
+    currentStep: 3,
+    status: 'error',
+    registerProcess: 5,
+    description: '需要缴费-缴费凭证被拒绝'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '上传凭证', '缴费成功', '待签到'],
+    currentStep: 4,
+    status: 'wait',
+    registerProcess: 6,
+    description: '需要缴费-凭证审核通过且未签到'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '上传凭证', '缴费成功', '已签到'],
+    currentStep: 5,
+    status: 'finish',
+    registerProcess: 7,
+    description: '需要缴费-签到完成'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '已签到', '待上传凭证', '缴费成功'],
+    currentStep: 3,
+    status: 'wait',
+    registerProcess: 8,
+    description: '需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '已签到', '上传凭证', '凭证待审核'],
+    currentStep: 4,
+    status: 'wait',
+    registerProcess: 9,
+    description: '需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '已签到', '上传凭证', '凭证被拒绝'],
+    currentStep: 4,
+    status: 'error',
+    registerProcess: 10,
+    description: '需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '已签到', '上传凭证', '缴费成功'],
+    currentStep: 5,
+    status: 'finish',
+    registerProcess: 11,
+    description: '需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到'
+  },
+  {
+    stepArr: ['已报名', '报名待审核', '已签到'],
+    currentStep: 1,
+    status: 'wait',
+    registerProcess: 12,
+    description: '不需要缴费-非成员已报名审核'
+  },
+  {
+    stepArr: ['已报名', '不可参会', '已签到'],
+    currentStep: 1,
+    status: 'error',
+    registerProcess: 13,
+    description: '不需要缴费-非成员被拒绝'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '待签到'],
+    currentStep: 2,
+    status: 'wait',
+    registerProcess: 14,
+    description: '不需要缴费-待签到'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '已签到'],
+    currentStep: 3,
+    status: 'finish',
+    registerProcess: 15,
+    description: '不需要缴费-已签到'
+  },
+  {
+    stepArr: ['已报名', '报名成功', '已签到'],
+    currentStep: 0,
+    status: 'wait',
+    registerProcess: 16,
+    description: '不需要缴费-未报名'
+  }
+]
+
+export default {
+  name: 'SignStep',
+  props: {
+    // 是否需要缴费
+    needCosts: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    // 报名状态
+    registerProcess: {
+      type: Number,
+      required: false,
+      default: 0
+    }
+  },
+  computed: {
+    currentShowInfo() {
+      if(this.registerProcess) {
+        return stepStatusArr[this.registerProcess]
+      } else {
+        // 若会议需要缴费 则显示 第一条数据；若不需要缴费 显示第17条数据
+        if(this.needCosts) {
+          return stepStatusArr[0]
+        } else {
+          return stepStatusArr[16]
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      currentStatus: 'wait'
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.ant-steps{
+  padding: 0 0 10px;
+  .ant-steps-item{
+    position: relative;
+  }
+}
+/deep/.ant-steps-item-description{
+
+}
+
+</style>
diff --git a/src/views/standardsAssociation/InfoCommunicationMeeting.vue b/src/views/standardsAssociation/InfoCommunicationMeeting.vue
index fe9508e..0cda7e4 100644
--- a/src/views/standardsAssociation/InfoCommunicationMeeting.vue
+++ b/src/views/standardsAssociation/InfoCommunicationMeeting.vue
@@ -1,7 +1,7 @@
 <!--信息交流会-->
 <template>
   <div class="main-box">
-    <meeting-list :standard-meeting-type="2"></meeting-list>
+    <meeting-list :standard-meeting-type="3"></meeting-list>
   </div>
 </template>
 
diff --git a/src/views/standardsAssociation/TrainingMeeting.vue b/src/views/standardsAssociation/TrainingMeeting.vue
index 76a101d..e7bb936 100644
--- a/src/views/standardsAssociation/TrainingMeeting.vue
+++ b/src/views/standardsAssociation/TrainingMeeting.vue
@@ -1,7 +1,7 @@
 <!--培训会-->
 <template>
   <div class="main-box">
-    <meeting-list :standard-meeting-type="3"></meeting-list>
+    <meeting-list :standard-meeting-type="2"></meeting-list>
   </div>
 </template>
 
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index 77153a6..e250684 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -43,8 +43,10 @@
 
             <a-col :xl="7" :lg="8" :md="8" :sm="24">
               <a-form-item label="会议状态">
-                <j-dict-select-tag dict-code="meeting_status" placeholder="请选择会议状态"
-                                   v-model="queryParam.meetingStatus"></j-dict-select-tag>
+                <j-dict-select-tag
+                  dict-code="meeting_status"
+                  placeholder="请选择会议状态"
+                  v-model="queryParam.meetingStatus"></j-dict-select-tag>
               </a-form-item>
             </a-col>