Merge branch 'dev' into gyj

src/views/caseManagement/caseList.vue

@@ -129,7 +129,9 @@
             :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
         <!-- 待调解     -->
         <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable"
-            :mediationData="mediationData" @getList="getList" :queryParams="queryParams"></mediation>    
+            :mediationData="mediationData" @getList="getList" :queryParams="queryParams"></mediation>
+        <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
+            :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>        
     </div>
 </template>
 
@@ -151,6 +153,7 @@ import confirmMediator from './components/confirmMediator.vue'
 import departmentMediator from './components/departmentMediator.vue'
 import timeConfirm from './components/timeConfirm.vue'
 import mediation from './components/mediation.vue'
+import confirmMediation from './components/confirmMediation.vue'
 export default {
     name: "caseList",
     dicts: ["case_flow_node"],
@@ -167,7 +170,8 @@ export default {
         confirmMediator,
         departmentMediator,
         timeConfirm,
-        mediation
+        mediation,
+        confirmMediation
     },
     data() {
         return {
@@ -207,6 +211,7 @@ export default {
             caseFlowNumber:{},//案件流程数据
             caselogDataArr:[],//案件日志数据
             flagLoading: true, //案件日志弹框loading
+            confirmTionVisable:false,//确认调解书弹窗
             mediatorData:{},
             flag: null,
             caseData: {},
@@ -221,6 +226,7 @@ export default {
             departmentData: {},
             timeConfirmVisable: false,
             timeConfirmData: {},
+            confirmTionData:{},
             buttonList: []
         };
     },
@@ -261,6 +267,7 @@ export default {
                 this.mediationClick(val)
             }else if(type == 10){
                 // 确认调解书
+                this.confirmMediation(val)
             }else if(type == 11){
                 // 签名
             }else if(type == 12){
@@ -349,6 +356,11 @@ export default {
             this.mediationVisable = true;
             this.mediationData = val;
         },
+        /** 确认调解书 */
+        confirmMediation(val){
+            this.confirmTionVisable = true;
+            this.confirmTionData = val;
+        },
         getDetail(parms) {
             caseApplicationSelectById(parms).then((res) => {
                 this.formPayDetail = res.data;
@@ -425,6 +437,10 @@ export default {
         cancelMediation(){
             this.timeConfirmVisable = false;
         },
+        /** 取消确认调解弹窗 */
+        cancelConfirmTion(){
+            this.confirmTionVisable = false;
+        },
         cancelMediation(){
             this.mediationVisable = false;
         },