Browse Source

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

gyj 2 years ago
parent
commit
ed1165a6ac

+ 2
- 2
src/views/caseManagement/caseList.vue View File

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"

+ 17
- 11
src/views/caseManagement/components/addCase.vue View File

545
         this.getUserInfoFn();
545
         this.getUserInfoFn();
546
         this.modelFlag = false;
546
         this.modelFlag = false;
547
         this.buttonFlag = true;
547
         this.buttonFlag = true;
548
-        this.formData = {
549
-          affiliate: {
550
-            organizeFlag: 0,
551
-            respondentSex: 0,
552
-          },
553
-          columnValueList: [],
554
-          caseAttachList: [],
555
-        };
556
       } else if (val == 3) {
548
       } else if (val == 3) {
557
         this.title = "修改案件";
549
         this.title = "修改案件";
558
         this.modelFlag = true;
550
         this.modelFlag = true;
565
     },
557
     },
566
     addVisable(val) {
558
     addVisable(val) {
567
       if (val) {
559
       if (val) {
560
+        if(this.addModifyData == 1){
561
+          this.formData = {
562
+          affiliate: {
563
+            organizeFlag: 0,
564
+            respondentSex: 0,
565
+          },
566
+          columnValueList: [],
567
+          caseAttachList: [],
568
+        };
569
+        this.$set(this.formData.affiliate, "applicationName", this.getUserInfoList.nickName);
570
+        this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
571
+        this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
572
+        this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
573
+        }
568
         this.activeName = "first";
574
         this.activeName = "first";
569
         this.showmediate = false;
575
         this.showmediate = false;
570
         this.getTemplateFn();
576
         this.getTemplateFn();
605
           if (item.annexType == 2) {
611
           if (item.annexType == 2) {
606
             this.applicantEvidence.push(item);
612
             this.applicantEvidence.push(item);
607
           } else if (item.annexType == 6) {
613
           } else if (item.annexType == 6) {
608
-            this.respondentEvidence.push(item);
614
+            // this.respondentEvidence.push(item);
609
           } else if (item.annexType == 7) {
615
           } else if (item.annexType == 7) {
610
             this.showmediate = true
616
             this.showmediate = true
611
           }
617
           }
765
           // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
771
           // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
766
           // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
772
           // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
767
           // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
773
           // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
768
-          this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
769
-          this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
774
+          // this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
775
+          // this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
770
           this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
776
           this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
771
           this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
777
           this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
772
           this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
778
           this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);

+ 13
- 7
src/views/caseManagement/components/caseAcceptance.vue View File

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 View File

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
     }