diff --git a/project/pingchang/apps/AppGeneralElection/components/electionList.vue b/project/pingchang/apps/AppGeneralElection/components/electionList.vue
index 49070ccd..5ccb22da 100644
--- a/project/pingchang/apps/AppGeneralElection/components/electionList.vue
+++ b/project/pingchang/apps/AppGeneralElection/components/electionList.vue
@@ -39,24 +39,25 @@ export default {
   data () {
     return {
       search: {
-        status: '',
+        status: '',  // 0、未开始；1、进行中；2、已结束
         title: '',
-        tableData: [],
       },
       page: {
         current: 1,
         size: 10,
-        total: '',
+        total: 0,
       },
+      tableData: [],
     }
   },
   created () {
     this.dict.load('yesOrNo', 'partyFourLinkageStatus')
+    this.getList()
   },
   computed: {
     colConfigs() {
       return [
-        {prop: "", label: "标题", align: "left"},
+        {prop: "", label: "标题", align: "left", showOverflowTooltip: true},
         {prop: "", label: "所属支部", align: "center"},
         {prop: "", label: "选举方式", align: "center"},
         {prop: "", label: "应选人数", align: "center"},
@@ -66,7 +67,18 @@ export default {
     }
   },
   methods: {
-    getList () {},
+    getList() {
+      this.instance.post(`/app/appgeneralelectioninfo/list`,null,{
+        params: {
+          ...this.page,
+          ...this.search,
+        }
+      }).then(res=> {
+        if(res?.data) {
+          console.log(res);
+        }
+      })
+    },
     toAdd(id) {
       this.$emit('change', {
         type: 'electionAdd',
diff --git a/project/pingchang/apps/AppOrganizationChange/components/List.vue b/project/pingchang/apps/AppOrganizationChange/components/List.vue
index 9a18aa45..41980a50 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/List.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/List.vue
@@ -1,6 +1,6 @@
 <template>
   <ai-list class="List">
-    <template slot="title" class="title">
+    <template slot="title">
       <ai-title title="组织换届" isShowBottomBorder>
         <template slot="rightBtn">
           <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')" >换届设置</el-button>
@@ -18,13 +18,17 @@
             @select="onTreeChange"/>
       </ai-tree-menu>
     </template>
-    <template slot="content">
-      <el-tabs v-model="currIndex">
+    <template slot="content" class="content">
+      <el-tabs v-model="currIndex" >
         <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
           <component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" lazy :instance="instance"
                       :dict="dict" :permissions="permissions" v-on="$listeners"/>
         </el-tab-pane>
+        
       </el-tabs>
+      <div class="add_btn">
+        <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')" >新增换届</el-button>
+      </div>
     </template>
   </ai-list>
 </template>
@@ -181,12 +185,17 @@ export default {
     top: 8px;
   }
 
-  // .add_btn {
-  //   position: absolute;
-  //   right: 38px;
-  //   top: 78px;
-  // }
+  ::v-deep .ai-list__content--right {
+    position: relative;
 
+    .add_btn {
+      position: absolute;
+      right: 18px;
+      top: 11px;
+    }
+  }
+
+  
   ::v-deep .audit-0 {
     color: #FF8822 !important;
   }
diff --git a/project/pingchang/apps/AppOrganizationChange/components/history.vue b/project/pingchang/apps/AppOrganizationChange/components/history.vue
index 182b2f92..a101fce5 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/history.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/history.vue
@@ -1,7 +1,33 @@
 <template>
-  <section class="history">
-    历史届次hhh 
-  </section>
+  <ai-list class="history">
+    <template slot="content">
+      <ai-search-bar>
+        <template #left>
+          <el-button type="primary" icon="iconfont iconEdit" @click="fillupAdd('')">补录</el-button>
+        </template>
+        <template #right>
+          <el-input size="small" placeholder="请输入届次" v-model="search.name" clearable
+                      v-throttle="() => {page.current = 1, getList()}"/>
+          <el-button icon="iconfont iconResetting" @click="reset('')">重置</el-button>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        class="detail-table__table"
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="totalJob"
+        :current.sync="current"
+        :size.sync="size"
+        @getList="getJobList">
+        <el-table-column slot="options" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
+            <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
 </template>
 
 <script>
@@ -12,6 +38,37 @@ export default {
     permissions: Function,
     dict: Object,
   },
+  data() {
+    return {
+      search: {
+        name: '',
+      },
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  computed: {
+    colConfigs() {
+      return [
+        {prop: '', label: '届次', align: 'left'},
+        {prop: '', label: '换届日期', align: 'center'},
+        {prop: '', label: '操作时间', align: 'center'},
+        {prop: '', label: '操作人', align: 'center'},
+        {slot: 'options'},
+      ]
+    }
+  },
+  methods: {
+    fillupAdd() {},
+    reset() {},
+    getList() {}
+  },
+  created() {
+
+  },
 }
 </script>
 
diff --git a/project/pingchang/apps/AppOrganizationChange/components/moment.vue b/project/pingchang/apps/AppOrganizationChange/components/moment.vue
index a2920e4e..b8008cce 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/moment.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/moment.vue
@@ -1,61 +1,59 @@
 <template>
-  <section class="moment">
-    <ai-detail>
-      <template slot="content">
-        <ai-bar title="总体概况">
-          <template slot="right">
-            <el-button size="small" type="text" icon="iconfont iconEdit" @click="toEdit('')" >修改</el-button>
+  <ai-list class="moment">
+    <template slot="content">
+      <ai-bar title="总体概况">
+        <template slot="right">
+          <el-button size="small" type="text" icon="iconfont iconEdit" @click="toEdit('')" >修改</el-button>
+        </template>
+      </ai-bar>
+      <ai-wrapper>
+        <ai-info-item label="本届换届时间" :value="111" />
+        <ai-info-item label="换届类型" :value="111" />
+        <ai-info-item label="下届换届时间" :value="111" />
+        <ai-info-item label="当前届次" :value="111" />
+      </ai-wrapper>
+      <ai-bar title="本届任职">
+        <template slot="right">
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="toAdd('')" >添加任职人员</el-button>
+        </template>
+      </ai-bar>
+      <ai-table
+          class="detail-table__table"
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="totalJob"
+          :current.sync="current"
+          :size.sync="size"
+          @getList="getJobList">
+          <el-table-column slot="options" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
+              <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+        <ai-bar title="本届候选人">
+        <template slot="right">
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="toAdd('')" >添加候选人</el-button>
+        </template>
+      </ai-bar>
+      <ai-table
+        class="detail-table__table"
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="totalJob"
+        :current.sync="current"
+        :size.sync="size"
+        @getList="getJobList">
+        <el-table-column slot="options" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
+            <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
           </template>
-        </ai-bar>
-        <ai-wrapper>
-          <ai-info-item label="本届换届时间" :value="111" />
-          <ai-info-item label="换届类型" :value="111" />
-          <ai-info-item label="下届换届时间" :value="111" />
-          <ai-info-item label="当前届次" :value="111" />
-        </ai-wrapper>
-        <ai-bar title="本届任职">
-          <template slot="right">
-            <el-button size="small" type="text" icon="iconfont iconAdd" @click="toAdd('')" >添加任职人员</el-button>
-          </template>
-        </ai-bar>
-        <ai-table
-            class="detail-table__table"
-            :tableData="tableData"
-            :col-configs="colConfigs"
-            :total="totalJob"
-            :current.sync="current"
-            :size.sync="size"
-            @getList="getJobList">
-            <el-table-column slot="options" label="操作" align="center">
-              <template slot-scope="{ row }">
-                <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
-                <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
-              </template>
-            </el-table-column>
-          </ai-table>
-          <ai-bar title="本届候选人">
-          <template slot="right">
-            <el-button size="small" type="text" icon="iconfont iconAdd" @click="toAdd('')" >添加候选人</el-button>
-          </template>
-        </ai-bar>
-        <ai-table
-            class="detail-table__table"
-            :tableData="tableData"
-            :col-configs="colConfigs"
-            :total="totalJob"
-            :current.sync="current"
-            :size.sync="size"
-            @getList="getJobList">
-            <el-table-column slot="options" label="操作" align="center">
-              <template slot-scope="{ row }">
-                <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
-                <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
-              </template>
-            </el-table-column>
-          </ai-table>
-      </template>
-    </ai-detail>
-  </section>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
 </template>
 
 <script>
@@ -103,24 +101,11 @@ export default {
 
 <style lang="scss" scope>
 .moment {
-  ::v-deep .ai-detail .ai-detail__content .ai-detail__content--wrapper {
-    padding-top: 0;
-    background-color: blue;
-    // ::v-deep .aibar {
-    //   height: 40px;
-    // }
+  padding-top: 0 !important;
+  .btn {}
+
+  ::v-deep .ai-list .ai-list__single .ai-list__content {
+    padding: 0;
   }
-  ai-detail {
-    ::v-deep .ai-detail__content {
-      background-color: #FFF;
-    }
-
-    
-  }
-  
-
-  
-
-  
 }
 </style>
\ No newline at end of file