diff --git a/project/pingchang/apps/AppOrganizationChange/components/List.vue b/project/pingchang/apps/AppOrganizationChange/components/List.vue
index bdff762a..3bce306e 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/List.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/List.vue
@@ -25,9 +25,6 @@
                      :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>
diff --git a/project/pingchang/apps/AppOrganizationChange/components/addChange.vue b/project/pingchang/apps/AppOrganizationChange/components/addChange.vue
index 18dbaa47..c67d6d17 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/addChange.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/addChange.vue
@@ -99,6 +99,16 @@ export default {
     }
   },
   methods: {
+    // getDetail() {
+    //   const {id: organizationId} = this.$route.query
+    //   organizationId && this.instance.post(`/app/apporganizationgeneralelection/queryDetailByOrganizationId`, null, {
+    //     params: {organizationId}
+    //   }).then(res => {
+    //     if (res?.data) {
+    //       this.form = res.data
+    //     }
+    //   })
+    // },
     cancel() {
       this.$router.push({})
     },
diff --git a/project/pingchang/apps/AppOrganizationChange/components/moment.vue b/project/pingchang/apps/AppOrganizationChange/components/moment.vue
index 62212705..8b60104b 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/moment.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/moment.vue
@@ -1,56 +1,61 @@
 <template>
   <section class="moment">
-    <ai-title title="总体概况" class="mar-b8">
-      <template slot="rightBtn">
-        <el-button size="small" type="text" icon="iconfont iconEdit" @click="toEdit('')">修改</el-button>
-      </template>
-    </ai-title>
-    <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-title title="本届任职" class="mar-b8">
-      <template slot="rightBtn">
-        <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogJob=true">添加任职人员</el-button>
-      </template>
-    </ai-title>
-    <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 v-if="detail.id">
+      <ai-title title="总体概况" class="mar-b8">
+        <template slot="rightBtn">
+          <el-button size="small" type="text" icon="iconfont iconEdit" @click="toEdit(oid)">修改</el-button>
         </template>
-      </el-table-column>
-    </ai-table>
-    <ai-title title="本届候选人" class="mar-b8">
-      <template slot="rightBtn">
-        <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogCandidate = true">添加候选人</el-button>
-      </template>
-    </ai-title>
-    <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>
+      </ai-title>
+      <ai-wrapper>
+        <ai-info-item label="本届换届时间" :value="detail.changeTime"/>
+        <ai-info-item label="换届类型" :value="dict.getLabel('organizationChangeType',detail.type)"/>
+        <ai-info-item label="下届换届时间" :value="detail.nextChangeTime"/>
+        <ai-info-item label="当前届次" :value="detail.sessionTime"/>
+      </ai-wrapper>
+      <ai-title title="本届任职" class="mar-b8">
+        <template slot="rightBtn">
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogJob=true">添加任职人员</el-button>
         </template>
-      </el-table-column>
-    </ai-table>
+      </ai-title>
+      <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-title title="本届候选人" class="mar-b8">
+        <template slot="rightBtn">
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogCandidate = true">添加候选人</el-button>
+        </template>
+      </ai-title>
+      <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-empty>暂无换届信息,请完善基础内容后,再进行后续操作<br/><br/><br/>
+      <el-button size="small" type="primary" @click="toEdit(oid)">开始设置</el-button>
+    </ai-empty>
     <ai-dialog :visible.sync="dialogJob" title="添加本届任职人" width="720px" @closed="jobForm={}" @onConfirm="handleJobForm">
       <el-form ref="jobForm" size="small" :model="jobForm" :rules="jobRules" label-width="80px">
         <el-form-item label="职位" prop="job">
@@ -85,7 +90,7 @@ export default {
   },
   data() {
     return {
-      isEdit: false,
+      detail: {},
       tableData: [],
       totalJob: 0,
       current: 1,
@@ -121,7 +126,8 @@ export default {
         job: [{required: true, message: "请输入职位"}],
         name: [{required: true, message: "请输入姓名"}],
       }
-    }
+    },
+    oid: v => v.selected.id
   },
   mounted() {
     this.getList(this.selected.id)
@@ -139,7 +145,7 @@ export default {
     getList(id) {
       this.instance.post(`/app/apporganizationgeneralelection/queryDetailByOrganizationId?organizationId=${id}`).then(res => {
         if (res?.data) {
-          console.log(res, '111');
+          this.detail = res.data
         }
       })
     },