Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb

src/views/caseManagement/components/mediation.vue

@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="调解结果:">
-            <el-radio-group v-model="mediaResult" :disabled="!selectRoido" @change="resultsMediation">
+            <el-radio-group v-model="formData.mediaResult" :disabled="!selectRoido" @change="resultsMediation">
               <el-radio :label="1">达成调解</el-radio>
               <el-radio :label="2">未达成调解</el-radio>
               <el-radio :label="3">未达成调解但不在争议</el-radio>
@@ -111,7 +111,6 @@
       </el-form>
       <el-button @click="openmeeting" type="primary" v-if="mediationType">{{ isSecretaryRole ? '发起会议' :
         '进入会议' }}</el-button>
-      <!-- v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'" -->
       <el-button @click="openArbitrationresults" type="primary"
         v-if="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole">确认会议结果</el-button>
       <div slot="footer" class="dialog-footer">
@@ -155,7 +154,8 @@ export default {
       mediaResult: 1,
       // isReconci:0,
       formData: {
-        affiliate: {}
+        affiliate: {},
+        mediaResult:1
       },
       user: "",
       userId: null,
@@ -176,7 +176,7 @@ export default {
   },
   watch: {
     mediationVisable(val) {
-      this.mediaResult = 1;
+      this.formData.mediaResult = 1
       this.recordArr = [];
       this.recordArrMediate = [];
       if (this.mediationData.mediationMethod == "1") {