diff --git a/src/pages/case-management/index.vue b/src/pages/case-management/index.vue
index 396d947..fd63d13 100644
--- a/src/pages/case-management/index.vue
+++ b/src/pages/case-management/index.vue
@@ -532,20 +532,20 @@ import { values } from "lodash";
             //         title:'新增案件',
             //     }
             // },
-          handleConclude() {
-            // 批量办结
-            if (this.selectionData.length == 0) {
-              this.$message.warning(`请至少选中一个调解案件！`)
-              return
-            }
-            if (!this.$clickThrottle()) {
-              return
-            }//防止重复点击
-            api.updateCaseStatus({caseStatus: 2, ids: this.selectionData}).then(res => {
-              this.$message.success("成功");
-              this.getCaseInfoList(1)
-            })
-          },
+            handleConclude() {
+                // 批量办结
+                if (this.selectionData.length == 0) {
+                this.$message.warning(`请至少选中一个调解案件！`)
+                return
+                }
+                if (!this.$clickThrottle()) {
+                return
+                }//防止重复点击
+                api.updateCaseStatus({caseStatus: 2, ids: this.selectionData}).then(res => {
+                this.$message.success("成功");
+                this.getCaseInfoList(1)
+                })
+            },
             // 案件分配
             handleCaseAllocation(){
 
@@ -587,6 +587,7 @@ import { values } from "lodash";
                     }
                 })
             },
+            
             handleToggleSearch() {
                 this.showSearch = !this.showSearch
             },
diff --git a/src/pages/mediation-management/index.vue b/src/pages/mediation-management/index.vue
index 5fe51eb..70e33aa 100644
--- a/src/pages/mediation-management/index.vue
+++ b/src/pages/mediation-management/index.vue
@@ -13,11 +13,11 @@
                 <el-tab-pane name="all">
                     <span slot="label"><span>全部</span> <el-badge :value="caseStatusNum.total" :max="99" class="item"></el-badge></span>
                 </el-tab-pane>
-                <el-tab-pane name="mediate">
-                    <span slot="label"><span>在办</span> <el-badge :value="caseStatusNum.not" :max="99" class="item"></el-badge></span>
+                <el-tab-pane name="mediation">  
+                    <span slot="label"><span>在办</span> <el-badge :value="caseStatusNum.ing" :max="99" class="item"></el-badge></span>
                 </el-tab-pane>
-                <el-tab-pane name="mediation">
-                    <span slot="label"><span>办结</span> <el-badge :value="caseStatusNum.ing" :max="99" class="item"></el-badge></span>
+                <el-tab-pane name="mediated">
+                    <span slot="label"><span>办结</span> <el-badge :value="caseStatusNum.end" :max="99" class="item"></el-badge></span>
                 </el-tab-pane>
             </el-tabs>
 
@@ -228,7 +228,7 @@
                     </div>
                 </div>
                 <div class="height-56 flex-row align-items-center justify-content-between" style="height: 22px;margin-left: 10px;margin-top: -10px;margin-bottom: 5px">
-                    <div class="f22 color-text-primary"><el-checkbox  :indeterminate="indeterminate" @change="handleCheckAllChange">全选</el-checkbox></div>
+                    <div class="f22 color-text-primary"><el-checkbox :indeterminate="indeterminate" v-model="checkedCheckAll" @change="handleCheckAllChange">全选</el-checkbox></div>
                 </div>
                 
                 <div class="case-table">
@@ -249,7 +249,7 @@
                                             <el-checkbox-group v-model="selectionData">
                                                 <!-- 此处的label是复选框右边显示的值，也是选中后的值。如果要一行的数据，直接使用row即可 -->
                                                 <!-- label的内容会显示在页面上，需要配合css把label的内容隐藏掉 -->
-                                                <el-checkbox :disabled="scope.row.caseStatus == 1 ? true :false" :key="scope.row.id" :label="scope.row.id"></el-checkbox>
+                                                <el-checkbox :disabled="scope.row.caseStatus == 1 ? false :true" :key="scope.row.id" :label="scope.row.id"></el-checkbox>
                                             </el-checkbox-group>
                                         </span>
                                         <span class="f-weight500 color-000 f16">被申请人：
@@ -383,6 +383,7 @@ import { values } from "lodash";
         },
         data() {
             return {
+                checkedCheckAll:false,
                 officeDeliveryIdsDialog:null,//批量文书送达
                 officeSealIdsDialog:null,//批量文书签章
                 officeWriteIdsDialog:null,//批量文书签字
@@ -453,6 +454,7 @@ import { values } from "lodash";
             // 监听选中的数据，选中的数据发生变化，通过判断长度给多选按钮赋值
             selectionData: {
                 handler(v) {
+                    console.log(this.enabledDataList,'this.enabledDataList')
                     if (this.enabledDataList.length) {
                         let checkedCount = v.length;
                         this.isCheck = checkedCount === this.enabledDataList.length;
@@ -485,6 +487,7 @@ import { values } from "lodash";
             }  
         },
         methods: {
+            
             handleConclude(){
                 // 批量办结
                 if(this.selectionData.length == 0 ){
@@ -543,7 +546,7 @@ import { values } from "lodash";
                 if(tab.name == 'mediate'){
                     this.queryParam.caseStatus = 0//待调解
                     this.caseStatusShow = false
-                }else if(tab.name == 'mediation'){
+                }else if(tab.name == 'mediation'){ 
                     this.queryParam.caseStatus = 1//调解中
                     this.caseStatusShow = true
                 }else if(tab.name == 'mediated'){
@@ -561,10 +564,9 @@ import { values } from "lodash";
             // 全选
             handleCheckAllChange(value){
                 // console.log(value,this.enabledDataList,'this.enabledDataList')
-                let chooseData = this.enabledDataList.filter(el=>el.caseStatus == 0)
+                let chooseData = this.enabledDataList.filter(el=>el.caseStatus == 1)
                 this.selectionData = value ? chooseData.map(el=>el.id) : [];
                 this.indeterminate = false;
-                // console.log(this.selectionData,'his.selectionData')
             },
 
             // 导入
@@ -621,7 +623,6 @@ import { values } from "lodash";
             },
             // 案件分配
             handleCaseAllocation(){
-
                 if(this.selectionData.length > 0){
                     this.caseAllocationDialog={
                         title:'案件分配',
@@ -649,6 +650,10 @@ import { values } from "lodash";
             },
             // 列表数据
             getCaseInfoList(val){
+                // 选择状态重置
+                this.selectionData = []
+                this.checkedCheckAll = false
+                
                 this.queryParam.current = val
                 api.getCaseInfoList(this.queryParam).then(res => {
                     if (!res.code) {
@@ -659,6 +664,15 @@ import { values } from "lodash";
                         this.enabledDataList = this.tableData.filter(v=>!v.disabled)
                     }
                 })
+                this.getCaseCount()
+            },
+            // 列表数据
+            getCaseCount(){
+                api.getCaseCount({}).then(res => {
+                    if (!res.code) {
+                        this.caseStatusNum = res
+                    }
+                })
             },
             handleToggleSearch() {
                 this.showSearch = !this.showSearch