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

src/views/caseManagement/caseList.vue

@@ -69,7 +69,7 @@
                     <el-button size="mini" @click="caseLog(scope.row)" type="text"
                         icon="el-icon-edit-outline">案件日志</el-button>
                     <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text"
-                        icon="el-icon-edit">查看缴费单</el-button>
+                        icon="el-icon-edit" v-if="scope.row.caseFlowId > 2">查看缴费单</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)"
                         v-hasPermi="['caseManagement:list:evidenceEdit']" v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 ||
@@ -116,7 +116,7 @@
         </paymentdetailsDialog>
         <!-- 案件受理 -->
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance"
-            :caseAcceptanceData="caseAcceptanceData" @getList="getList"></caseAcceptance>
+            :caseAcceptanceData="caseAcceptanceData" @getList="getList" :queryParams="queryParams"></caseAcceptance>
         <!-- 被申请人缴费 -->
         <respondentPay :openResPay="openResPay" :resPayTitle="resPayTitle" :formResPayDetail="formResPayDetail"
             :resPayId="resPayId" :resPayForm="resPayForm" :queryParams="queryParams" @getList="getList"

src/views/caseManagement/components/addCase.vue

@@ -605,7 +605,7 @@ export default {
           if (item.annexType == 2) {
             this.applicantEvidence.push(item);
           } else if (item.annexType == 6) {
-            this.respondentEvidence.push(item);
+            // this.respondentEvidence.push(item);
           } else if (item.annexType == 7) {
             this.showmediate = true
           }

src/views/caseManagement/components/caseAcceptance.vue

@@ -28,12 +28,12 @@
           </el-radio-group>
         </el-form-item> -->
         <el-form-item v-if="courtReviewform.agreeFlag == 0" label="拒绝理由:" prop="rejectReason" :rules="[
-          {
+      {
-            required: true,
+        required: true,
-            message: '拒绝理由不能为空',
+        message: '拒绝理由不能为空',
-            trigger: 'blur',
+        trigger: 'blur',
-          },
+      },
-        ]">
+    ]">
           <el-input v-model="courtReviewform.rejectReason" type="textarea" :rows="8" />
         </el-form-item>
       </el-form>
@@ -63,7 +63,13 @@ export default {
   watch: {
     showAcceptance(val) {
       if (val) {
-        console.log(this.caseAcceptanceData)
+        console.log(this.caseAcceptanceData);
+        this.courtReviewform = {
+          mediationMethod: 2,
+          paperFlag: 0,
+          arbitrateConfirm: 0,
+          agreeFlag: 1
+        }
       }
     },
   },

src/views/caseManagement/components/mediation.vue

@@ -176,6 +176,7 @@ export default {
   },
   watch: {
     mediationVisable(val) {
+      this.mediaResult = 1;
       this.recordArr = [];
       this.recordArrMediate = [];
       if (this.mediationData.mediationMethod == "1") {
@@ -194,7 +195,6 @@ export default {
     },
     recordArrMediate(val){
       if(val.length >= 1){
-        console.log('监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听');
         this.selectRoido = false;
       }
     }

vue.config.js

@@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-const API = 'http://121.40.189.20:7001'  //生产
+// const API = 'http://121.40.189.20:7001'  //生产
-// const API = 'http://121.40.189.20:6001'  //测试
+const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
 // const API = 'http://172.16.0.237:6001' //Q
 // const API = 'http://172.16.1.26:6001' //w