diff --git a/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue b/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue
index b9503ecb..5ff34564 100644
--- a/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue
+++ b/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue
@@ -7,26 +7,28 @@
       <template slot="content">
         <ai-card title="基本信息">
           <template #right>
-            <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span>
+            <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit = true">修改</span>
           </template>
           <template #content v-if="isEdit == false">
             <ai-wrapper>
               <ai-info-item label="标题" :value="info.title"></ai-info-item>
               <ai-info-item label="投票说明" :value="info.votingInstructions"></ai-info-item>
               <ai-info-item label="单位名称" :value="info.organizationName"></ai-info-item>
-              <ai-info-item label="选举方式" :value="info.electionMethod"></ai-info-item>
+              <ai-info-item label="选举方式">
+                {{ info.electionMethod==0? '等额':'差额'}}
+              </ai-info-item>
               <ai-info-item label="应选人数" :value="info.candidatesNumber"></ai-info-item>
               <ai-info-item label="投票日期" :value="info.votingDate"></ai-info-item>
               <ai-info-item label="候选人" isLine>
                 <span v-for="(item,index) in candidateUsersList" :key="index">
                   {{ item }}
-                  <span v-if="index < candidateUsersList.length - 1">,</span>
+                  <span v-if="index < candidateUsersList.length - 1">、</span>
                 </span>
               </ai-info-item>
               <ai-info-item label="投票人" isLine :value="info.voteUsers">
                 <span v-for="(item,index) in voteUsersList" :key="index">
                   {{ item }}
-                  <span v-if="index < voteUsersList.length - 1">,</span>
+                  <span v-if="index < voteUsersList.length - 1">、</span>
                 </span>
               </ai-info-item>
             </ai-wrapper>
@@ -34,7 +36,7 @@
         </ai-card>
       </template>
     </ai-detail>
-    <ai-detail v-else>
+    <ai-detail v-if="!id || isEdit">
       <ai-title slot="title" :title="id? '编辑换届选举':'添加换届选举'" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
       <template slot="content">
         <ai-card title="基本信息">
@@ -64,14 +66,14 @@
                     <i class="el-icon-info" style="margin-right: 8px"></i>
                   </el-tooltip>
                   
-                  <el-radio v-model="form.electionMethod" label="1">等额</el-radio>
-                  <el-radio v-model="form.electionMethod" label="2">差额</el-radio>
+                  <el-radio v-model="form.electionMethod" label="0">等额</el-radio>
+                  <el-radio v-model="form.electionMethod" label="1">差额</el-radio>
                 </el-form-item>
                 
                 <el-row type="flex">
                   <el-col :span="20">
-                    <el-form-item label="应选人数" prop="candidatesNumber">
-                      <el-input type="number" v-model="form.candidatesNumber" placeholder="请输入"></el-input>
+                    <el-form-item label="应选人数" prop="chooseNumber">
+                      <el-input type="number" v-model="form.chooseNumber" placeholder="请输入"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="20">
@@ -89,7 +91,7 @@
                     <template name="option" v-slot:option="{ item }">
                       <span class="iconfont iconProlife">{{ item.name }}</span>
                       <span>{{ item.phone }}</span>
-                      <!-- <span>{{ item}}</span> -->
+                      <span>{{ item}}</span>
                     </template>
                   </ai-person-select>
                 </el-form-item>
@@ -148,7 +150,7 @@ export default {
         votingInstructions: '',
         organizationName: '',
         electionMethod: '',
-        candidatesNumber: '',
+        chooseNumber: '',
         votingDate: '',
         candidateUsers: [],
         voteUsers: [],
@@ -159,7 +161,7 @@ export default {
         title: [{required: true, message: "请输入标题", trigger: "blur"}],
         organizationName: [{required: true, message: "请选择党组织", trigger: "blur"}],
         electionMethod: [{required: true, message: "请选择选举方式", trigger: "blur"}],
-        candidatesNumber: [{required: true, message: "请输入应选人数", trigger: "blur"}],
+        chooseNumber: [{required: true, message: "请输入应选人数", trigger: "blur"}],
         votingDate: [{required: true, message: "请选择投票日期", trigger: "blur"}],
         candidateUsers: [{required: true,validator: validCandidate, trigger: "blur"}],
         voteUsers: [{required: true,validator: validVote, trigger: "blur"}],
@@ -192,15 +194,15 @@ export default {
         params: {id:this.id}
       }).then((res) => {
         if(res?.data) {
-          // console.log(res.data);
-          this.form = res.data,
+          console.log(res.data,'getDetail');
+          this.form = res.data
+          this.form.organizationName = res.data.partyOrganizations[0].name
           this.info = res.data
           this.candidateUsersList = res.data.candidateUsers.map(v=> v.name)
           this.voteUsersList = res.data.voteUsers.map(v=> v.name)
         }
       })
     },
-    edit() {},
     selectCandidate(v) {
       this.form.candidateUsers = v
     },
@@ -223,12 +225,8 @@ export default {
               ...this.form
             }).then(res => {
               if(res.code == 0) {
-                if(this.id) {
-                  this.$message.success('编辑成功')
-                } else {
-                  this.$message.success('新增成功')
-                }
-                this.cancel(false)
+                this.$message.success(this.id ? '编辑成功' : '新增成功')
+                this.cancel(true)
               }
             }).catch((err) => {
               console.log(err);
diff --git a/project/pingchang/apps/AppGeneralElection/components/electionList.vue b/project/pingchang/apps/AppGeneralElection/components/electionList.vue
index 42441eeb..7a9502f2 100644
--- a/project/pingchang/apps/AppGeneralElection/components/electionList.vue
+++ b/project/pingchang/apps/AppGeneralElection/components/electionList.vue
@@ -6,10 +6,10 @@
         <ai-search-bar>
           <template #left>
             <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('', false)" >添加</el-button>
-            <ai-select v-model="search.status" @change=";(page.current = 1), getList()" placeholder="请选择状态" :selectList="dict.getDict('cwpStatus')"></ai-select>
+            <ai-select v-model="search.status" @change=";(page.current = 1), getList()" placeholder="请选择状态" :selectList="dict.getDict('electionStatus')"></ai-select>
           </template>
           <template #right>
-            <el-input v-model="search.groupName" class="search-input" size="small" v-throttle="() => {     ;(page.current = 1), getList()   } " placeholder="标题" clearable @change="getList" @clear="page.current = 1, (search.title = ''), getList()" suffix-icon="iconfont iconSearch">
+            <el-input v-model="search.title" class="search-input" size="small" v-throttle="() => {     ;(page.current = 1), getList()   } " placeholder="标题" clearable @change="getList" @clear="page.current = 1, (search.title = ''), getList()" suffix-icon="iconfont iconSearch">
             </el-input>
             <el-button size="small" type="primary" icon="el-icon-refresh-right" @click="reset" >重置</el-button>
           </template>
@@ -17,7 +17,6 @@
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getList" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{ row }">
-              <!--  show-overflow-tooltip -->
               <el-button type="text" @click.native="toAdd(row.id, true)">编辑</el-button>
               <el-button type="text" @click.native="toAdd(row.id, false)">详情</el-button>
               <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
@@ -51,15 +50,16 @@ export default {
     }
   },
   created () {
-    this.dict.load('yesOrNo', 'partyFourLinkageStatus')
-    this.getList()
+    this.$dict.load('electionStatus', 'partyFourLinkageStatus').then(()=> {
+      this.getList()
+    })
   },
   computed: {
     colConfigs() {
       return [
         {prop: "title", label: "标题", align: "left", showOverflowTooltip: true},
         {prop: "organizationName", label: "所属支部", align: "center"},
-        {prop: "electionMethod", label: "选举方式", align: "center"},
+        {prop: "electionMethod", label: "选举方式", align: "center",formart: v => v==0? '等额':'差额'},
         {prop: "chooseNumber", label: "应选人数", align: "center"},
         {prop: "status", label: "状态", align: "center",width: "180px"},
         { slot: "options", },
@@ -76,7 +76,7 @@ export default {
       }).then(res=> {
         if(res?.data) {
           this.tableData = res.data.records
-          this.total.total = res.data.total
+          this.page.total = res.data.total
         }
       })
     },
@@ -89,7 +89,23 @@ export default {
         }
       })
     },
-    reset() {},
+    handleDelete(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appgeneralelectioninfo/delete?ids=${id}`).then(res=>{
+          if(res.code == 0) {
+            this.$message.success('删除成功！')
+            this.getList()
+          }
+        })
+      })
+    },
+    reset() {
+      this.search = {
+        status: '',
+        title: '',
+      }
+      this.getList()
+    },
   }
 }
 </script>