diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue
index b126458..e967694 100644
--- a/src/views/caseManagement/caseList.vue
+++ b/src/views/caseManagement/caseList.vue
@@ -324,15 +324,17 @@ export default {
         checkDetail(val) {
             this.addVisable = true;
             this.caseData = val;
-            this.caseData.flag = 1;
+            this.$set(this.caseData,'flag',1)
             this.caseDisabled = true;
             this.tabFlag = true;
         },
         /** 修改案件 */
         eidtNodeprocess(row,val) {
+            console.log(row,val)
             this.addModifyData = val
             this.addVisable = true;
             this.caseData = row;
+            this.$set(this.caseData,'flag',2)
             this.caseDisabled = false;
             this.tabFlag = false;
         },
@@ -585,15 +587,15 @@ export default {
         cancelcaseLog() {
             this.showcaseLog = false
         },
-        // 案件归档
+        // 案件送达
         caseFiling(row) {
             console.log(row.id)
             let paramValues = {
                 ids:[row.id]
             }
-            this.$modal.confirm("你确定要案件归档吗？").then((res) => {
+            this.$modal.confirm("你确定要案件送达吗？").then((res) => {
                msCaseFile(paramValues).then(res=>{
-                    this.$modal.msgSuccess("案件归档成功");
+                    this.$modal.msgSuccess("案件送达成功");
                     this.getList(this.queryParams);
                }) 
             }).catch(() => {
diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue
index 6871cee..154bc6b 100644
--- a/src/views/caseManagement/components/addCase.vue
+++ b/src/views/caseManagement/components/addCase.vue
@@ -192,7 +192,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="选择机构或自然人" prop="affiliate.organizeFlag">
-                            <el-radio-group v-model="formData.affiliate.organizeFlag">
+                            <el-radio-group v-model="formData.affiliate.organizeFlag" @change="clearValidate">
                                 <el-radio :label="0">自然人</el-radio>
                                 <el-radio :label="1">机构</el-radio>
                             </el-radio-group>
@@ -729,11 +729,37 @@ export default {
       deep: true,
       handler(val) {
         this.getTemplateFn();
-        if (val.id && val.flag == 2) {
-          this.modelFlag = true;
-          this.title = "修改案件";
-          this.caseApplicationSelectByIdFn(val.id);
-        } else if (!val.id && val.flag == 2) {
+        // if (val.id && !val.flag) {
+        //   this.modelFlag = true;
+        //   this.title = "修改案件";
+        //   this.caseApplicationSelectByIdFn(val.id);
+        // } else if (!val.id && !val.flag) {
+        //   this.modelFlag = false;
+        //   this.title = "新增案件";
+        //   this.formData = {
+        //     affiliate: {
+        //         organizeFlag:0,
+        //       respondentSex: 0,
+        //     },
+        //     columnValueList: [],
+        //     caseAttachList: [],
+        //   };
+        // } else if (val.id && val.flag == 1) {
+        //   this.modelFlag = true;
+        //   this.title = "案件详情";
+        //   this.caseApplicationSelectByIdFn(val.id);
+        // }
+        if(val.id){
+          if(val.flag==1){
+            this.modelFlag = true;
+            this.title = "案件详情";
+            this.caseApplicationSelectByIdFn(val.id);
+          }else{
+             this.modelFlag = true;
+            this.title = "修改案件";
+            this.caseApplicationSelectByIdFn(val.id);
+          }
+        }else{
           this.modelFlag = false;
           this.title = "新增案件";
           this.formData = {
@@ -744,10 +770,6 @@ export default {
             columnValueList: [],
             caseAttachList: [],
           };
-        } else if (val.id && val.flag == 1) {
-          this.modelFlag = true;
-          this.title = "案件详情";
-          this.caseApplicationSelectByIdFn(val.id);
         }
       },
     },
@@ -758,7 +780,6 @@ export default {
     },
   },
   created() {
-      console.log(this.formData,"000000000000000000")
   },
   methods: {
     /** 根据案件id获取对应信息 */
@@ -853,6 +874,9 @@ export default {
         }
       });
     },
+    clearValidate(){
+      this.$refs["ruleForm"].clearValidate()
+    },
     cancel() {
       this.$emit("cancelCaseAdd");
     },
diff --git a/src/views/caseManagement/components/mediation.vue b/src/views/caseManagement/components/mediation.vue
index 43c47c6..9bcb3c2 100644
--- a/src/views/caseManagement/components/mediation.vue
+++ b/src/views/caseManagement/components/mediation.vue
@@ -39,11 +39,29 @@
         <el-col :span="24">
           <el-form-item label="申请人案件证据：">
             <div v-if="applicateArr.length == 0">申请人暂未提供证据！</div>
-            <div v-else v-for="(item, index) in applicateArr" :key="index" v-if="item.annexType == 2">
+            <div  v-for="(item, index) in applicateArr" :key="index" v-if="item.annexType == 2">
               <a href="#" @click="toFile(item, index)" style="color: blue">{{ item.annexName }}</a>
             </div>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="调解结果">
+             <el-radio-group v-model="radio" @change="yyb">
+                <el-radio :label="3">达成调解书</el-radio>
+                <el-radio :label="6">未达成调解</el-radio>
+                <el-radio :label="7">未达成调解但不在争议</el-radio>
+                <el-radio :label="9">未达成调解但同意引入仲裁</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="是否和解" v-if="radio==3">
+             <el-radio-group>
+                <el-radio :label="3">是</el-radio>
+                <el-radio :label="6">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <!-- <el-col :span="24">
           <el-form-item label="被申请人案件证据：">
             <div v-if="quiltArr.length == 0">被申请人暂未提供证据！</div>
@@ -120,6 +138,7 @@ export default {
       formData: {
         affiliate: {}
       },
+      radio:3,
       user: "",
       userId: null,
       flieList: [],
@@ -233,6 +252,9 @@ export default {
         caseFlowId: this.mediationData.caseFlowId,
         attachList: this.attachList
       });
+    },
+    yyb(){
+      console.log(this.radio)
     }
   }
 };