diff --git a/src/views/dataMember/DataMember.vue b/src/views/dataMember/DataMember.vue
index cccacdf..c0de53c 100644
--- a/src/views/dataMember/DataMember.vue
+++ b/src/views/dataMember/DataMember.vue
@@ -10,18 +10,24 @@
                 <a-input placeholder="请输入项目名称" v-model="queryParam.projectName" :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
+
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
-              <a-form-item label="需要发票">
-                <j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"
-                                   v-model="queryParam.needInvoice"></j-dict-select-tag>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="8" :md="8" :sm="24">
-              <a-form-item label="打包项目">
-                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"
-                                   v-model="queryParam.pack"></j-dict-select-tag>
+              <a-form-item label="运行年份">
+                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
+<!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
+<!--              <a-form-item label="需要发票">-->
+<!--                <j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"-->
+<!--                                   v-model="queryParam.needInvoice"></j-dict-select-tag>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
+<!--              <a-form-item label="打包项目">-->
+<!--                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"-->
+<!--                                   v-model="queryParam.pack"></j-dict-select-tag>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
 
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -36,56 +42,82 @@
 
       <!--    表格区域-->
       <div>
-        <a-spin :spinning="loading">
-          <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
-            <!--          打包、需要发票-->
-            <template v-slot:status-pack="{record, text}">
-              <status-slot :statu-obj="record" :status-no="text"></status-slot>
-            </template>
-            <!--            到账-->
-            <template v-slot:status="{record, text}">
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
-            </template>
-            <!--            开票-->
-            <template v-slot:status-bill="{record, text}">
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
-            </template>
-            <!--            邮寄-->
-            <template v-slot:status-mail="{record, text}">
-              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
-            </template>
-            <!--          项目名称-->
-            <template v-slot:projectName="{record}">
-              <div @click="openDetailModal(record)" class="project-name">
-                {{ record.chargeProject }}
-              </div>
-            </template>
-            <!--          项目名称-->
-            <template v-slot:projectName="{record}">
-              <div @click="openDetailModal(record)" class="project-name">
-                <j-ellipsis :value="record.projectName" :length="20"></j-ellipsis>
-              </div>
-            </template>
-            <!--          需要tooltip的文本-->
-            <template v-slot:text="{record,text}">
-              <a-tooltip>
-                <template slot="title">
-                  {{ text }}
-                </template>
-                {{ text }}
-              </a-tooltip>
-            </template>
-            <!--            金额-->
-            <template v-slot:money="{record,text}">
-              <a-tooltip>
-                <template slot="title">
-                  {{ text }}元
-                </template>
-                {{ text }}元
-              </a-tooltip>
-            </template>
-          </project-table>
-        </a-spin>
+<!--        <a-spin :spinning="loading">-->
+<!--          <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">-->
+<!--            &lt;!&ndash;          打包、需要发票&ndash;&gt;-->
+<!--            <template v-slot:status-pack="{record, text}">-->
+<!--              <status-slot :statu-obj="record" :status-no="text"></status-slot>-->
+<!--            </template>-->
+<!--            &lt;!&ndash;            到账&ndash;&gt;-->
+<!--            <template v-slot:status="{record, text}">-->
+<!--              <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>-->
+<!--            </template>-->
+<!--            &lt;!&ndash;            开票&ndash;&gt;-->
+<!--            <template v-slot:status-bill="{record, text}">-->
+<!--              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>-->
+<!--            </template>-->
+<!--            &lt;!&ndash;            邮寄&ndash;&gt;-->
+<!--            <template v-slot:status-mail="{record, text}">-->
+<!--              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>-->
+<!--            </template>-->
+<!--            &lt;!&ndash;          项目名称&ndash;&gt;-->
+<!--            <template v-slot:projectName="{record}">-->
+<!--              <div @click="openDetailModal(record)" class="project-name">-->
+<!--                {{ record.chargeProject }}-->
+<!--              </div>-->
+<!--            </template>-->
+<!--            &lt;!&ndash;          项目名称&ndash;&gt;-->
+<!--            <template v-slot:projectName="{record}">-->
+<!--              <div @click="openDetailModal(record)" class="project-name">-->
+<!--                <j-ellipsis :value="record.projectName" :length="20"></j-ellipsis>-->
+<!--              </div>-->
+<!--            </template>-->
+<!--            &lt;!&ndash;          需要tooltip的文本&ndash;&gt;-->
+<!--            <template v-slot:text="{record,text}">-->
+<!--              <a-tooltip>-->
+<!--                <template slot="title">-->
+<!--                  {{ text }}-->
+<!--                </template>-->
+<!--                {{ text }}-->
+<!--              </a-tooltip>-->
+<!--            </template>-->
+<!--            &lt;!&ndash;            金额&ndash;&gt;-->
+<!--            <template v-slot:money="{record,text}">-->
+<!--              <a-tooltip>-->
+<!--                <template slot="title">-->
+<!--                  {{ text }}元-->
+<!--                </template>-->
+<!--                {{ text }}元-->
+<!--              </a-tooltip>-->
+<!--            </template>-->
+<!--          </project-table>-->
+<!--        </a-spin>-->
+        <a-table
+          ref="table"
+          rowKey="id"
+          size="middle"
+          :scroll="{x: 1200}"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
+
+          <!--        项目名称-->
+          <template slot="projectName" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="20" class="project-name" @click="openDetailModal(record)"></j-ellipsis>
+          </template>
+
+          <template slot="text" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+          </template>
+
+          <!--          缴费凭证-->
+          <span slot="action" class="action-span-cell" slot-scope="text,record">
+            <a @click="paymentVoucher(record)">缴费凭证</a>
+          </span>
+        </a-table>
       </div>
       <!--    表格区域end-->
 
@@ -96,71 +128,78 @@
   </div>
 </template>
 <script>
+import JYearDate from '@comp/jero/JYearDate'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import ProjectTable from '@comp/table/ProjectTable'
+// import ProjectTable from '@comp/table/ProjectTable'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
-import StatusSlot from '@comp/tools/StatusSlot'
+// import StatusSlot from '@comp/tools/StatusSlot'
 import JEllipsis from '@comp/jero/JEllipsis'
 import MineContractModule from '@views/mineContract/modules/MineContractModule'
 
 export default {
   name: 'DataMember',
-  components: { ProjectTable, ProjectDetailModal, StatusSlot, JEllipsis, MineContractModule },
+  components: {  ProjectDetailModal,  JYearDate,JEllipsis, MineContractModule },
   mixins: [JeroListMixin],
   data() {
     return {
       columns: [
         {
-          title: '',
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '项目名称',
           dataIndex: 'projectName',
-          scopedSlots: 'projectName',
-          col: 4
-        }, {
-          title: '应付金额',
-          dataIndex: 'amountReceivable',
-          scopedSlots: 'money',
-          col: 4
-        }, {
-          title: '实付金额',
-          dataIndex: 'paidAmount',
-          scopedSlots: 'money',
-          col: 3
-        }, {
-          title: '负责人',
+          align: 'center',
+          scopedSlots: { customRender: 'projectName' }
+        },  {
+          title: '项目负责人',
           dataIndex: 'directorName',
-          scopedSlots: 'text',
-          col: 3
-        }, {
-          title: '打包',
-          dataIndex: 'pack',
-          scopedSlots: 'status-pack',
-          col: 2
-        }, {
-          title: '需要发票',
-          col: 2,
-          dataIndex: 'needInvoice',
-          scopedSlots: 'status-pack',
-          slot: 'status'
-        }, {
-          title: '到账',
-          dataIndex: 'inAccount',
-          scopedSlots: 'status',
-          col: 2
-        }, {
-          title: '开票',
-          dataIndex: 'makeInvoice',
-          scopedSlots: 'status-bill',
-          col: 2
-        }, {
-          title: '邮寄',
-          dataIndex: 'mail',
-          scopedSlots: 'status-mail',
-          col: 2
+          align: 'center',
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '负责人电话',
+          dataIndex: 'principalPhone',
+          align: 'center',
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '负责人邮箱',
+          dataIndex: 'principalEmail',
+          align: 'center',
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '缴费凭证状态',
+          dataIndex: 'paymentStatus_dictText',
+          align: 'center',
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 100,
+          scopedSlots: { customRender: 'action' }
         }
       ],
       loading: false,
       // 合同详情
       contractModuleVisible: false,
+      queryParam:{
+        year:this.getCurrentYear()
+      },
+      lastQueryParam:{
+        year:this.getCurrentYear()
+      },
       contractId: '',
       url: {
         list: '/jero/memberProjectSubitem/pageCompany'
@@ -172,11 +211,11 @@ export default {
      * 分页变化获取数据
      * @param pagination
      */
-    handlePageChange(pagination) {
-      this.ipagination.current = pagination.current
-      this.ipagination.pageSize = pagination.pageSize
-      this.loadData()
-    },
+    // handlePageChange(pagination) {
+    //   this.ipagination.current = pagination.current
+    //   this.ipagination.pageSize = pagination.pageSize
+    //   this.loadData()
+    // },
     /**
      * 打开合同详情
      * @param contractId
@@ -184,6 +223,29 @@ export default {
     handleOpenContractModule(contractId) {
       this.contractId = contractId
       this.contractModuleVisible = true
+    },
+    searchReset(){
+      this.queryParam.year = this.getCurrentYear()
+      this.lastQueryParam.year = this.getCurrentYear()
+      this.loadData()
+    },
+    //获取当前年
+    getCurrentYear(){
+      return new Date().getFullYear()+''
+    },
+    /**
+     * 缴费凭证
+     * @param record
+     */
+    paymentVoucher(record) {
+      this.$router.push({
+        path: '/MessagePage/PaymentVoucher',
+        query: {
+          projectId: record.id,
+          projectName: record.projectName,
+          projectType: 4
+        }
+      })
     }
   }
 }