Просмотр исходного кода

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

hanchaobo 2 лет назад
Родитель
Сommit
c2f5d6d8bd

+ 2
- 2
src/views/caseManagement/caseList.vue Просмотреть файл

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

+ 1
- 1
src/views/caseManagement/components/addCase.vue Просмотреть файл

605
           if (item.annexType == 2) {
605
           if (item.annexType == 2) {
606
             this.applicantEvidence.push(item);
606
             this.applicantEvidence.push(item);
607
           } else if (item.annexType == 6) {
607
           } else if (item.annexType == 6) {
608
-            this.respondentEvidence.push(item);
608
+            // this.respondentEvidence.push(item);
609
           } else if (item.annexType == 7) {
609
           } else if (item.annexType == 7) {
610
             this.showmediate = true
610
             this.showmediate = true
611
           }
611
           }

+ 13
- 7
src/views/caseManagement/components/caseAcceptance.vue Просмотреть файл

28
           </el-radio-group>
28
           </el-radio-group>
29
         </el-form-item> -->
29
         </el-form-item> -->
30
         <el-form-item v-if="courtReviewform.agreeFlag == 0" label="拒绝理由:" prop="rejectReason" :rules="[
30
         <el-form-item v-if="courtReviewform.agreeFlag == 0" label="拒绝理由:" prop="rejectReason" :rules="[
31
-          {
32
-            required: true,
33
-            message: '拒绝理由不能为空',
34
-            trigger: 'blur',
35
-          },
36
-        ]">
31
+      {
32
+        required: true,
33
+        message: '拒绝理由不能为空',
34
+        trigger: 'blur',
35
+      },
36
+    ]">
37
           <el-input v-model="courtReviewform.rejectReason" type="textarea" :rows="8" />
37
           <el-input v-model="courtReviewform.rejectReason" type="textarea" :rows="8" />
38
         </el-form-item>
38
         </el-form-item>
39
       </el-form>
39
       </el-form>
63
   watch: {
63
   watch: {
64
     showAcceptance(val) {
64
     showAcceptance(val) {
65
       if (val) {
65
       if (val) {
66
-        console.log(this.caseAcceptanceData)
66
+        console.log(this.caseAcceptanceData);
67
+        this.courtReviewform = {
68
+          mediationMethod: 2,
69
+          paperFlag: 0,
70
+          arbitrateConfirm: 0,
71
+          agreeFlag: 1
72
+        }
67
       }
73
       }
68
     },
74
     },
69
   },
75
   },

+ 1
- 1
src/views/caseManagement/components/mediation.vue Просмотреть файл

176
   },
176
   },
177
   watch: {
177
   watch: {
178
     mediationVisable(val) {
178
     mediationVisable(val) {
179
+      this.mediaResult = 1;
179
       this.recordArr = [];
180
       this.recordArr = [];
180
       this.recordArrMediate = [];
181
       this.recordArrMediate = [];
181
       if (this.mediationData.mediationMethod == "1") {
182
       if (this.mediationData.mediationMethod == "1") {
194
     },
195
     },
195
     recordArrMediate(val){
196
     recordArrMediate(val){
196
       if(val.length >= 1){
197
       if(val.length >= 1){
197
-        console.log('监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听监听');
198
         this.selectRoido = false;
198
         this.selectRoido = false;
199
       }
199
       }
200
     }
200
     }

+ 2
- 2
vue.config.js Просмотреть файл

11
 
11
 
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13
 
13
 
14
-const API = 'http://121.40.189.20:7001'  //生产
15
-// const API = 'http://121.40.189.20:6001'  //测试
14
+// const API = 'http://121.40.189.20:7001'  //生产
15
+const API = 'http://121.40.189.20:6001'  //测试
16
 // const API = 'http://192.168.3.18:6001'  //B
16
 // const API = 'http://192.168.3.18:6001'  //B
17
 // const API = 'http://172.16.0.237:6001' //Q
17
 // const API = 'http://172.16.0.237:6001' //Q
18
 // const API = 'http://172.16.1.26:6001' //w
18
 // const API = 'http://172.16.1.26:6001' //w