Przeglądaj źródła

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

gaogaoyujie 2 lat temu
rodzic
commit
3f2862eab5

+ 1
- 1
src/views/caseManagement/caseList.vue Wyświetl plik

343
             this.tabFlag = true;
343
             this.tabFlag = true;
344
         },
344
         },
345
         /** 修改案件 */
345
         /** 修改案件 */
346
-        eidtNodeprocess(row,val) {
346
+        eidtNodeprocess(row) {
347
             this.addModifyData = 3
347
             this.addModifyData = 3
348
             this.addVisable = true;
348
             this.addVisable = true;
349
             this.caseData = row;
349
             this.caseData = row;

+ 2
- 3
src/views/caseManagement/components/addCase.vue Wyświetl plik

555
     /** 获取裁决书模板 */
555
     /** 获取裁决书模板 */
556
     getTemplateFn(data) {
556
     getTemplateFn(data) {
557
       getTemplate(data).then((res) => {
557
       getTemplate(data).then((res) => {
558
-        console.log(res);
559
         this.templateList = res.rows;
558
         this.templateList = res.rows;
560
       });
559
       });
561
     },
560
     },
603
     submitForm() {
602
     submitForm() {
604
       this.$refs["ruleForm"].validate((valid) => {
603
       this.$refs["ruleForm"].validate((valid) => {
605
         if (valid) {
604
         if (valid) {
606
-          if (this.addModifyData == 1) {
605
+          if (this.addModifyData == 3) {
607
             this.modifyData(this.formData);
606
             this.modifyData(this.formData);
608
-          } else if (this.addModifyData == 2) {
607
+          } else if (this.addModifyData == 1) {
609
             this.insertFn(this.formData);
608
             this.insertFn(this.formData);
610
           }
609
           }
611
         }
610
         }

+ 18
- 15
src/views/caseManagement/components/mediation.vue Wyświetl plik

44
             </div>
44
             </div>
45
           </el-form-item>
45
           </el-form-item>
46
         </el-col>
46
         </el-col>
47
-        <el-col :span="24">
48
-          <el-form-item label="调解结果">
49
-             <el-radio-group v-model="radio" @change="yyb">
50
-                <el-radio :label="3">达成调解书</el-radio>
51
-                <el-radio :label="6">未达成调解</el-radio>
52
-                <el-radio :label="7">未达成调解但不在争议</el-radio>
53
-                <el-radio :label="9">未达成调解但同意引入仲裁</el-radio>
47
+        <el-col :span="24" v-if="mediationType">
48
+          <el-form-item label="调解结果:">
49
+             <el-radio-group v-model="mediaResult" @change="resultsMediation">
50
+                <el-radio :label="1">达成调解书</el-radio>
51
+                <el-radio :label="2">未达成调解</el-radio>
52
+                <el-radio :label="3">未达成调解但不在争议</el-radio>
53
+                <el-radio :label="4">未达成调解但同意引入仲裁</el-radio>
54
             </el-radio-group>
54
             </el-radio-group>
55
           </el-form-item>
55
           </el-form-item>
56
         </el-col>
56
         </el-col>
57
         <el-col :span="24">
57
         <el-col :span="24">
58
-          <el-form-item label="是否和解" v-if="radio==3">
59
-             <el-radio-group>
60
-                <el-radio :label="3">是</el-radio>
61
-                <el-radio :label="6">否</el-radio>
58
+          <el-form-item label="是否和解" v-if="mediaResult==1">
59
+             <el-radio-group v-model="isReconci">
60
+                <el-radio :label="1">是</el-radio>
61
+                <el-radio :label="0">否</el-radio>
62
             </el-radio-group>
62
             </el-radio-group>
63
           </el-form-item>
63
           </el-form-item>
64
         </el-col>
64
         </el-col>
135
       recordArr: [],
135
       recordArr: [],
136
       roomId: null,
136
       roomId: null,
137
       startTime: null,
137
       startTime: null,
138
+      mediaResult:1,
139
+      isReconci:0,
138
       formData: {
140
       formData: {
139
         affiliate: {}
141
         affiliate: {}
140
       },
142
       },
141
-      radio:3,
142
       user: "",
143
       user: "",
143
       userId: null,
144
       userId: null,
144
       flieList: [],
145
       flieList: [],
250
       this.mediationFn({
251
       this.mediationFn({
251
         id: this.mediationData.id,
252
         id: this.mediationData.id,
252
         caseFlowId: this.mediationData.caseFlowId,
253
         caseFlowId: this.mediationData.caseFlowId,
253
-        attachList: this.attachList
254
+        attachList: this.attachList,
255
+        isReconci:this.isReconci,
256
+        mediaResult:this.mediaResult,
254
       });
257
       });
255
     },
258
     },
256
-    yyb(){
257
-      console.log(this.radio)
259
+    resultsMediation(){
260
+      
258
     }
261
     }
259
   }
262
   }
260
 };
263
 };