Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev

src/views/caseManagement/caseList.vue

@@ -343,7 +343,7 @@ export default {
             this.tabFlag = true;
         },
         /** 修改案件 */
-        eidtNodeprocess(row,val) {
+        eidtNodeprocess(row) {
             this.addModifyData = 3
             this.addVisable = true;
             this.caseData = row;

src/views/caseManagement/components/addCase.vue

@@ -555,7 +555,6 @@ export default {
     /** 获取裁决书模板 */
     getTemplateFn(data) {
       getTemplate(data).then((res) => {
-        console.log(res);
         this.templateList = res.rows;
       });
     },
@@ -603,9 +602,9 @@ export default {
     submitForm() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
-          if (this.addModifyData == 1) {
+          if (this.addModifyData == 3) {
             this.modifyData(this.formData);
-          } else if (this.addModifyData == 2) {
+          } else if (this.addModifyData == 1) {
             this.insertFn(this.formData);
           }
         }

src/views/caseManagement/components/mediation.vue

@@ -44,21 +44,21 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" v-if="mediationType">
-          <el-form-item label="调解结果">
+          <el-form-item label="调解结果:">
-             <el-radio-group v-model="radio" @change="yyb">
+             <el-radio-group v-model="mediaResult" @change="resultsMediation">
-                <el-radio :label="3">达成调解书</el-radio>
+                <el-radio :label="1">达成调解书</el-radio>
-                <el-radio :label="6">未达成调解</el-radio>
+                <el-radio :label="2">未达成调解</el-radio>
-                <el-radio :label="7">未达成调解但不在争议</el-radio>
+                <el-radio :label="3">未达成调解但不在争议</el-radio>
-                <el-radio :label="9">未达成调解但同意引入仲裁</el-radio>
+                <el-radio :label="4">未达成调解但同意引入仲裁</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="是否和解" v-if="radio==3">
+          <el-form-item label="是否和解" v-if="mediaResult==1">
-             <el-radio-group>
+             <el-radio-group v-model="isReconci">
-                <el-radio :label="3">是</el-radio>
+                <el-radio :label="1">是</el-radio>
-                <el-radio :label="6">否</el-radio>
+                <el-radio :label="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -135,10 +135,11 @@ export default {
       recordArr: [],
       roomId: null,
       startTime: null,
+      mediaResult:1,
+      isReconci:0,
       formData: {
         affiliate: {}
       },
-      radio:3,
       user: "",
       userId: null,
       flieList: [],
@@ -250,11 +251,13 @@ export default {
       this.mediationFn({
         id: this.mediationData.id,
         caseFlowId: this.mediationData.caseFlowId,
-        attachList: this.attachList
+        attachList: this.attachList,
+        isReconci:this.isReconci,
+        mediaResult:this.mediaResult,
       });
     },
-    yyb(){
+    resultsMediation(){
-      console.log(this.radio)
+      
     }
   }
 };