diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
index 2d1a38c..57542a3 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
@@ -186,11 +186,12 @@ export default {
     },
     // 会议报名信息维护
     handleMeetingApplyInfo (record) {
-      // 跳转到会议报名详情页面
+      // 跳转到会议报名信息维护页面
       this.$router.push({
         path: '/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo',
         query: {
-          projectId: record.id
+          projectId: record.id,
+          year: record.year
         }
       })
     }
diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo.vue b/src/views/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo.vue
index 86ffd6a..116fe56 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo.vue
@@ -2,171 +2,173 @@
   <div>
     <page-header-title :is-level-one="false" level-two-title="会议报名详情"></page-header-title>
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="会议名称">
-              <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName" :maxLength='50'></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="会议类型">
-              <j-dict-select-tag v-model="queryParam.meetingType" placeholder="请选择会议类型"
-                                 dictCode="meeting_type"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="参会单位">
-              <a-input placeholder="请输入参会单位" v-model="queryParam.companyName" :maxLength='50'></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="参会人">
-              <a-input placeholder="请输入参会人" v-model="queryParam.companyContactName" :maxLength='50'></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="签到">
-              <j-dict-select-tag v-model="queryParam.checkIn" placeholder="请选择"
-                                 dictCode="signin_status"/>
-            </a-form-item>
-          </a-col>
+    <a-card :bordered="false">
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="会议名称">
+                <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="会议类型">
+                <j-dict-select-tag v-model="queryParam.tbMeetingType" placeholder="请选择会议类型"
+                                   dictCode="standard_meeting_type"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="参会单位">
+                <a-input placeholder="请输入参会单位" v-model="queryParam.companyName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="参会人">
+                <a-input placeholder="请输入参会人" v-model="queryParam.companyContactName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="签到">
+                <j-dict-select-tag v-model="queryParam.checkIn" placeholder="请选择"
+                                   dictCode="signin_status"/>
+              </a-form-item>
+            </a-col>
 
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="来款年份">
-              <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.particularYear"></j-year-date>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="身份">
-              <j-dict-select-tag v-model="queryParam.identity" placeholder="请选择身份" @input="selectIdentity"
-                                 dictCode="meet_identify_type"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="是否打包">
-              <j-dict-select-tag v-model="queryParam.pack" placeholder="请选择是否打包" @input="selectIdentity"
-                                 dictCode="yn"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
-            <a-form-item label="缴费方式">
-              <j-dict-select-tag
-                v-model="queryParam.payMode"
-                placeholder="请选择缴费方式"
-                dictCode="meeting_pay_type"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
-            <a-form-item label="发票项目">
-              <j-dict-select-tag
-                v-model="queryParam.invoiceProject"
-                placeholder="请选择发票项目"
-                dictCode="invoice_project"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="来款年份">
+                <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.particularYear"></j-year-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="身份">
+                <j-dict-select-tag v-model="queryParam.identity" placeholder="请选择身份" @input="selectIdentity"
+                                   dictCode="meet_identify_type"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否打包">
+                <j-dict-select-tag v-model="queryParam.pack" placeholder="请选择是否打包" @input="selectIdentity"
+                                   dictCode="yn"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
+              <a-form-item label="缴费方式">
+                <j-dict-select-tag
+                  v-model="queryParam.payMode"
+                  placeholder="请选择缴费方式"
+                  dictCode="meeting_pay_type"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
+              <a-form-item label="发票项目">
+                <j-dict-select-tag
+                  v-model="queryParam.invoiceProject"
+                  placeholder="请选择发票项目"
+                  dictCode="invoice_project"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 查询区域-END -->
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button type="primary" icon="download" @click="handleExportXls('会议报名信息')">
-        导出
-      </a-button>
-      <a-button type="danger" icon="delete" @click="batchDel">
-        批量删除
-      </a-button>
-      <a-button type="primary" @click="batchSetGuestsUploadFileFlag">
-        批量设置资料状态
-      </a-button>
-    </div>
+      <!-- 操作按钮区域 -->
+      <div class="table-operator">
+        <a-button type="primary" icon="download" @click="handleExportXls('会议报名信息')">
+          导出
+        </a-button>
+        <a-button type="danger" icon="delete" @click="batchDel">
+          批量删除
+        </a-button>
+        <a-button type="primary" @click="batchSetGuestsUploadFileFlag">
+          批量设置资料状态
+        </a-button>
+      </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
+      <!-- table区域-begin -->
+      <div>
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :scroll="{x:true}"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          class="j-table-force-nowrap"
+          @change="handleTableChange">
 
-        <template slot="htmlSlot" slot-scope="text,record">
-          <div class="primary-color" @click="openDetailModal(record)">{{ text }}</div>
-        </template>
+          <template slot="htmlSlot" slot-scope="text,record">
+            <div class="primary-color" @click="openDetailModal(record)">{{ text }}</div>
+          </template>
 
-        <template slot="person" slot-scope="text,record">
-          <!--缴费方式为付款 可以先签到后付款 需要添加标识-->
-          <div
-            v-if="record.payMode === 1 && record.checkIn === 1 && (record.paymentMethod !== '' || record.paymentMethod !== null)"
-            class="primary-color" @click="toSignUpDetail(record)">{{ text }}<span v-show="record.inAccount !== 1" style="color: red">(参会未付款)</span>
-          </div>
-          <div v-else class="primary-color" @click="toSignUpDetail(record)">{{ text }}</div>
-        </template>
+          <template slot="person" slot-scope="text,record">
+            <!--缴费方式为付款 可以先签到后付款 需要添加标识-->
+            <div
+              v-if="record.payMode === 1 && record.checkIn === 1 && (record.paymentMethod !== '' || record.paymentMethod !== null)"
+              class="primary-color" @click="toSignUpDetail(record)">{{ text }}<span v-show="record.inAccount !== 1" style="color: red">(参会未付款)</span>
+            </div>
+            <div v-else class="primary-color" @click="toSignUpDetail(record)">{{ text }}</div>
+          </template>
 
-        <template slot="text" slot-scope="text">
-          <a-tooltip>
-            <template slot="title">{{ text }}</template>
-            <div class="table-text">{{ text }}</div>
-          </a-tooltip>
-        </template>
+          <template slot="text" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
+          </template>
 
-        <!--金钱 3位一逗号分隔-->
-        <template slot="allMoney" slot-scope="text">
-          <a-tooltip>
-            <template slot="title">{{ formatMoney(text) }}</template>
-            <div class="table-text">{{ formatMoney(text) }}</div>
-          </a-tooltip>
-        </template>
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
+          </template>
 
-        <!--        打包、需要发票、到账、开票、确收状态-->
-        <template slot="status" slot-scope="text,record">
-          <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
-        </template>
+          <!--        打包、需要发票、到账、开票、确收状态-->
+          <template slot="status" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+          </template>
 
-        <template slot="status-pack" slot-scope="text,record">
-          <status-slot :statu-obj="record" :status-no="text"></status-slot>
-        </template>
+          <template slot="status-pack" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text"></status-slot>
+          </template>
 
-        <!--          开票-->
-        <template slot="status-bill" slot-scope="text,record">
-          <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
-        </template>
+          <!--  开票  -->
+          <template slot="status-bill" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+          </template>
 
-        <!--          邮寄-->
-        <template slot="status-mail" slot-scope="text,record">
-          <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
-        </template>
+          <!--  确收  -->
+          <template slot="status-confirm-get" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="confirm"></status-slot>
+          </template>
 
-        <span slot="action" slot-scope="text, record" class="action-span-cell">
-          <!--            非成员报名被拒绝 无法编辑 -->
-          <a @click="handleEdit(record)" v-if="record.registerCheckResult !== 2">编辑</a>
-          <!--删除参会人需要判断改参会人是否与合同关联-->
-          <a @click="handleDelete(record.id)">删除</a>
-          <!--  只有嘉宾才可以设置 且报名信息不需要审核-->
-          <a @click="setGuestsUploadFileFlag(record)"
-             v-show="record.identity === 1 && record.registerCheckResult !== 0">
-            资料状态
-          </a>
-        </span>
-      </a-table>
-    </div>
+          <span slot="action" slot-scope="text, record" class="action-span-cell">
+            <!--            非成员报名被拒绝 无法编辑 -->
+            <a @click="handleEdit(record)" v-if="record.registerCheckResult !== 2">编辑</a>
+            <!--删除参会人需要判断改参会人是否与合同关联-->
+            <a @click="handleDelete(record.id)">删除</a>
+            <!--  只有嘉宾才可以设置 且报名信息不需要审核-->
+            <a @click="setGuestsUploadFileFlag(record)"
+               v-show="record.identity === 1 && record.registerCheckResult !== 0">
+              资料状态
+            </a>
+          </span>
+        </a-table>
+      </div>
+    </a-card>
     <!--设置资料状态--即嘉宾是否可以在企业端上传资料-->
     <set-guess-upload-flag-modal ref="setGuessUploadFlagModal" :meeting-id="meetingId" :meeting-type="meetingTypeValue" @ok="modalFormOk"></set-guess-upload-flag-modal>
   </div>
@@ -175,11 +177,15 @@
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import SetGuessUploadFlagModal from '../meetManage/modules/SetGuessUploadFlagModal'
+import PageHeaderTitle from '@/components/layouts/PageHeaderTitle'
+import JYearDate from '@/components/jero/JYearDate'
+import StatusSlot from '@/components/tools/StatusSlot'
+import { formatMoney } from '@/utils/formatMoney'
 
 export default {
   name: 'StardsMemberProjectMeetingApplyInfo',
   mixins: [JeroListMixin],
-  components: { SetGuessUploadFlagModal },
+  components: { SetGuessUploadFlagModal, PageHeaderTitle, JYearDate, StatusSlot },
   data () {
     return {
       columns: [
@@ -203,7 +209,7 @@ export default {
         {
           title: '会议类型',
           align: 'center',
-          dataIndex: 'meetingType_dictText',
+          dataIndex: 'tbMeetingType_dictText',
           scopedSlots: { customRender: 'text' },
           width: 180
         },
@@ -292,21 +298,31 @@ export default {
           align: 'center',
           width: 100,
           dataIndex: 'confirmGet',
-          scopedSlots: { customRender: 'status-mail' }
+          scopedSlots: { customRender: 'status-confirm-get' }
         },
         {
           title: '操作',
           align: 'center',
           fixed: 'right',
-          width: 300,
+          width: 230,
           scopedSlots: { customRender: 'action' }
         }
       ],
       meetingId: '',
-      meetingTypeValue: '',
+      meetingTypeValue: 2,
+      disableMixinCreated: true,
+      url: {
+        list: '/meeting/standardsMeetingSituation/standardPage',
+        exportXlsUrl: '/meeting/standardsMeetingSituation/exportStandardXls'
+      }
     }
   },
+  created () {
+    this.filters.year = this.$route.query.year
+    this.loadData()
+  },
   methods: {
+    formatMoney,
     selectIdentity(){
       console.log(this.queryParam.identity)
       if(this.queryParam.identity !== '1'){
@@ -335,6 +351,20 @@ export default {
       }
       this.$refs.setGuessUploadFlagModal.showBatch(this.selectedRowKeys)
     },
+    /*
+    * 编辑参会人
+    * */
+    handleEdit(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/SignUpInfoEdit',
+        query: {
+          id: record.id,
+          meetingId: record.meetingId,
+          meetingType: record.tbMeetingType,
+          costBool: this.meetingCostBool
+        }
+      })
+    },
   }
 }
 </script>