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

src/views/caseManagement/caseList.vue

@@ -110,7 +110,7 @@
             :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"></payDialog>
         <!-- 缴费确认查看详情 -->
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
-            :detailform="detailform" :flag="flag" :paymentConfirma="paymentConfirma" @getList="getList">
+            :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma" @getList="getList">
         </paymentdetailsDialog>
         <!-- 案件受理 -->
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance"
@@ -272,8 +272,10 @@ export default {
                 // 签名
             }else if(type == 12){
                 // 用印申请
+                this.consultantApplica(val)
             }else if(type == 13){
                 // 用印
+                this.departmentApplica(val)
             }else if(type == 14){
                 // 归档
                 this.caseFiling(val);

src/views/caseManagement/components/mediation.vue

@@ -86,7 +86,7 @@
       <el-button
         @click="openArbitrationresults"
         type="primary"
-        v-if="this.recordArr.length <= 0"
+        v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'"
       >确认会议结果</el-button>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel" class="endbutton1">
@@ -94,7 +94,7 @@
         </el-button>
         <el-button
           @click="submitMediation"
-          :disabled="this.recordArr.length <= 0"
+          :disabled="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'"
           class="endbutton1"
         >
           <span>提 交</span>

src/views/caseManagement/components/paymentdetailsDialog.vue

@@ -31,7 +31,7 @@
 <script>
 import {confirmPaid} from '@/api/caseManagement/caseManagement.js'
 export default {
-  props: ["openDialog", "title", "flag", "detailform", "getList","paymentConfirma"],
+  props: ["openDialog", "title", "flag", "detailform", "getList","paymentConfirma","queryParams"],
   data() {
     return {
       form: {},
@@ -66,11 +66,10 @@ export default {
           message: "确认成功",
           type: "success",
         });
-        if (res.code == 200) {
-          this.getList();
-        }
+       
       });
       this.cancel();
+      this.$emit("getList", this.queryParams);
     },
     cancel() {
       this.$emit("cancelpaymentdetails");