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

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

hhlxayunmei 2 лет назад
Родитель
Сommit
9e8ccdf6ff

+ 8
- 0
src/api/caseManagement/caseManagement.js Просмотреть файл

@@ -56,6 +56,14 @@ export function confirmPaid(data) {
56 56
     data: data,
57 57
   });
58 58
 }
59
+//   缴费确认(被申请人)
60
+export function resConfirmPaid(data) {
61
+  return request({
62
+    url: "/pay/resConfirmPaid",
63
+    method: "post",
64
+    data: data,
65
+  });
66
+}
59 67
 //   案件id查询缴费清单
60 68
 export function selectPaymentDetail(data) {
61 69
   return request({

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

@@ -79,7 +79,7 @@
79 79
                     <!-- <el-button size="mini" @click="receivedMediation(scope.row)" type="text" icon="el-icon-edit-outline">被申请人签收</el-button>                 -->
80 80
                     <el-button size="mini" type="text" icon="el-icon-edit"
81 81
                         @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']">上传证据</el-button>
82
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
82
+                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId > 14" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
83 83
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button> -->
84 84
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button> -->
85 85
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="secretaryConfirm(scope.row)">秘书审核</el-button> -->
@@ -113,7 +113,7 @@
113 113
             :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow" :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
114 114
         <!-- 缴费确认查看详情 -->
115 115
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
116
-            :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma" @getList="getList">
116
+            :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma" :isapplicant="isapplicant" @getList="getList">
117 117
         </paymentdetailsDialog>
118 118
         <!-- 案件受理 -->
119 119
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance"
@@ -250,7 +250,8 @@ export default {
250 250
             timeConfirmVisable: false,
251 251
             timeConfirmData: {},
252 252
             confirmTionData:{},
253
-            buttonList: []
253
+            buttonList: [],
254
+            isapplicant: true, //判断角色申请人或非申请人
254 255
         };
255 256
     },
256 257
     created() {
@@ -269,7 +270,7 @@ export default {
269 270
                 this.payStatus(val);
270 271
             }else if(type == 3 || type == 45){
271 272
                 // 确认缴费
272
-                this.paymentconfirmationRow(val);
273
+                this.paymentconfirmationRow(val,type);
273 274
             }else if(type == 4){
274 275
                 // 受理分配
275 276
                 this.caseAccep(val);
@@ -589,7 +590,7 @@ export default {
589 590
             this.showAcceptance = false
590 591
         },
591 592
         // 缴费确认
592
-        paymentconfirmationRow(row) {
593
+        paymentconfirmationRow(row,type) {
593 594
             this.paymentConfirma = row
594 595
             console.log(this.paymentConfirma)
595 596
             this.paymentDetails({
@@ -599,6 +600,12 @@ export default {
599 600
             this.payTitle = "缴费确认"
600 601
             this.flag = 0;
601 602
             this.detailform = {}
603
+            if (type == 3) {
604
+            // 申请人
605
+                this.isapplicant = true
606
+            }else {
607
+                this.isapplicant = false
608
+            }
602 609
         },
603 610
         cancelpaymentdetails() {
604 611
             this.openDialog = false

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

@@ -97,6 +97,15 @@
97 97
               </div>
98 98
             </el-form-item>
99 99
           </el-col>
100
+          <el-col :span="24" v-if="modelFlag">
101
+            <el-form-item label="调解申请书:">
102
+              <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 3">
103
+                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
104
+                  {{ item.annexName }}
105
+                </div>
106
+              </div>
107
+            </el-form-item>
108
+          </el-col>
100 109
           <el-col :span="24" v-if="modelFlag">
101 110
             <el-form-item label="调解书:">
102 111
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 7">

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

@@ -11,7 +11,7 @@
11 11
         </el-form-item>
12 12
         <el-form-item label="调解方式:" v-if="courtReviewform.agreeFlag == 1">
13 13
           <el-radio-group v-model="courtReviewform.mediationMethod">
14
-            <el-radio :label="1">开庭调解</el-radio>
14
+            <el-radio :label="1">线上调解</el-radio>
15 15
             <el-radio :label="2">线下调解</el-radio>
16 16
           </el-radio-group>
17 17
         </el-form-item>

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

@@ -130,7 +130,7 @@ export default {
130 130
   data() {
131 131
     return {
132 132
       loanStartDate: "",
133
-      title: "开庭调解",
133
+      title: "线上调解",
134 134
       applicateArr: [],
135 135
       quiltArr: [],
136 136
       recordArr: [],
@@ -159,7 +159,7 @@ export default {
159 159
     mediationVisable(val) {
160 160
       this.recordArr = [];
161 161
       if (this.mediationData.mediationMethod == "1") {
162
-        this.title = "开庭调解";
162
+        this.title = "线上调解";
163 163
         this.mediationType = true;
164 164
       } else if (this.mediationData.mediationMethod == "2") {
165 165
         this.title = "线下调解";

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

@@ -23,6 +23,11 @@
23 23
             {{ formPayDetail.caseStatusName }}
24 24
           </el-tag>
25 25
         </el-descriptions-item>
26
+        <el-descriptions-item label="驳回原因" v-if="formPayDetail.reason">
27
+          <el-tag size="mini" type='danger' effect="dark">
28
+            {{ formPayDetail.reason }}
29
+          </el-tag>
30
+        </el-descriptions-item>
26 31
       </el-descriptions>
27 32
       <div class="paySelectType">
28 33
         <el-radio-group v-model="paySelect" @input="changPayType">

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

@@ -3,18 +3,15 @@
3 3
     <el-dialog :title="title" :visible="openDialog" @close="cancel" :destroy-on-close="true" center>
4 4
       <el-form ref="form" :model="form" label-width="180px" :disabled="true">
5 5
         <el-form-item label="案件编号:" prop="caseNum">
6
-          <el-input v-model="form.caseNum" placeholder="" />
6
+          <el-input v-model="form.caseNum" placeholder="" :disabled="true"/>
7
+        </el-form-item>
8
+        <el-form-item label="案件标的:" prop="caseSubjectAmount">
9
+          <el-input v-model="form.caseSubjectAmount" :disabled="true"/>
7 10
         </el-form-item>
8
-        <!-- <el-form-item label="案件标的:" prop="caseSubjectAmount">
9
-          <el-input v-model="form.caseSubjectAmount" />
10
-        </el-form-item> -->
11 11
         <!-- <el-form-item label="缴费人:" prop="applicantName">
12 12
           <el-input v-model="form.applicationName" placeholder="" />
13 13
         </el-form-item> -->
14
-        <el-form-item label="申请人缴费金额:" prop="feePayable">
15
-          <el-input v-model="form.feePayable" />
16
-        </el-form-item>
17
-        <el-form-item label="被申请人缴费金额:" prop="feePayable">
14
+        <el-form-item label="缴费金额:" prop="feePayable">
18 15
           <el-input v-model="form.feePayable" />
19 16
         </el-form-item>
20 17
         <el-form-item label="申请人缴费凭证:" v-if="form.caseAttachList.length > 0">
@@ -29,9 +26,21 @@
29 26
             {{ item.annexName }}
30 27
           </div>
31 28
         </el-form-item>
29
+        <!-- 判断缴费是否通过 -->
30
+        <el-form-item label="是否缴费通过:" v-if="flag == 0">
31
+          <el-radio-group v-model="yesOrNo">
32
+            <el-radio :label="1">通过</el-radio>
33
+            <el-radio :label="0">驳回</el-radio>
34
+          </el-radio-group>   
35
+        </el-form-item>
36
+        <!-- 缴费驳回原因-->
37
+        <el-form-item label="驳回原因:" v-if="yesOrNo == 0" prop="reason" :rules="[{ required: true, message: '请输入驳回原因',trigger: 'blur',},]">
38
+          <el-input type="textarea" :rows="2" placeholder="请输入驳回原因" v-model="form.reason"></el-input>
39
+        </el-form-item>
32 40
       </el-form>
33 41
       <div slot="footer" class="dialog-footer">
34
-        <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton">确认已缴费</el-button>
42
+        <!-- <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton">确认已缴费</el-button> -->
43
+        <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton">确 认</el-button>
35 44
         <el-button @click="cancel" class="endbutton1">取 消</el-button>
36 45
       </div>
37 46
     </el-dialog>
@@ -39,13 +48,16 @@
39 48
 </template>
40 49
 
41 50
 <script>
42
-import { confirmPaid } from '@/api/caseManagement/caseManagement.js'
51
+import { confirmPaid, resConfirmPaid } from '@/api/caseManagement/caseManagement.js'
43 52
 export default {
44
-  props: ["openDialog", "title", "flag", "detailform", "getList", "paymentConfirma", "queryParams"],
53
+  props: ["openDialog", "title", "flag", "detailform", "getList", "paymentConfirma", "queryParams",'isapplicant'],
45 54
   data() {
46 55
     return {
47
-      form: {},
48
-      srcList: []
56
+      form: {
57
+        reason: '',//驳回原因
58
+      },
59
+      yesOrNo: 1,
60
+      srcList: [],
49 61
     };
50 62
   },
51 63
   watch: {
@@ -56,6 +68,13 @@ export default {
56 68
         }
57 69
       },
58 70
     },
71
+    openDialog: {
72
+      handler(val) {
73
+        if (val) {
74
+          this.yesOrNo = 1
75
+        }
76
+      }
77
+    }
59 78
   },
60 79
   methods: {
61 80
     preview(data) {
@@ -69,16 +88,34 @@ export default {
69 88
       let paramsVal = {
70 89
         caseId: this.paymentConfirma.id,
71 90
         batchNumber: "",
72
-        caseFlowId: this.paymentConfirma.caseFlowId
91
+        caseFlowId: this.paymentConfirma.caseFlowId,
92
+        yesOrNo: this.yesOrNo,
93
+        reason: this.form.reason
94
+      }
95
+      this.$refs["form"].validate((valid) => {
96
+      if (valid) {
97
+      if (this.isapplicant) {
98
+        confirmPaid(paramsVal).then((res) => {
99
+          this.$message({
100
+            message: "确认成功",
101
+            type: "success",
102
+          });
103
+        })
104
+        console.log('申请人');
105
+      } else {
106
+        // 被申请人 resConfirmPaid
107
+        resConfirmPaid(paramsVal).then((res) => {
108
+          this.$message({
109
+            message: "确认成功",
110
+            type: "success",
111
+          });
112
+        })
113
+        console.log('被申请人');
114
+      }
115
+      this.cancel();
116
+      this.$emit("getList", this.queryParams);
73 117
       }
74
-      confirmPaid(paramsVal).then((res) => {
75
-        this.$message({
76
-          message: "确认成功",
77
-          type: "success",
78
-        });
79
-        this.cancel();
80
-        this.$emit("getList", this.queryParams);
81
-      });
118
+      })
82 119
     },
83 120
     cancel() {
84 121
       this.$emit("cancelpaymentdetails");

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

@@ -23,6 +23,11 @@
23 23
               {{ formResPayDetail.caseStatusName }}
24 24
             </el-tag>
25 25
           </el-descriptions-item>
26
+          <el-descriptions-item label="驳回原因" v-if="formResPayDetail.reason">
27
+            <el-tag size="mini" type='danger' effect="dark">
28
+              {{ formResPayDetail.reason }}
29
+            </el-tag>
30
+          </el-descriptions-item>
26 31
         </el-descriptions>
27 32
         <div class="paySelectType">
28 33
           <el-radio-group v-model="paySelect" @input="changPayType">

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

@@ -12,10 +12,20 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
12 12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13 13
 
14 14
 // const API = 'http://121.40.189.20:9001'  //生产
15
-const API = 'http://121.40.189.20:6001'  //测试
15
+// const API = 'http://121.40.189.20:6001'  //测试
16 16
 // const API = 'http://192.168.3.18:6001'  //B
17
+<<<<<<< HEAD
18
+// const API = 'http://172.16.0.237:6001' //Q
19
+// const API = 'http://172.16.1.43:6001' //w
20
+=======
17 21
 // const API = 'http://172.16.1.30:6001' //Q
22
+<<<<<<< HEAD
18 23
 // const API = 'http://172.16.1.43:6001' //w
24
+=======
25
+// const API = 'http://172.16.1.17:6001' //w
26
+>>>>>>> 14df1eebfbde9573a5c541678ad9dfbb33797007
27
+>>>>>>> 2fbaf17b60f7f1acb11b1a884129643927270d1b
28
+
19 29
 // vue.config.js 配置说明
20 30
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
21 31
 // 这里只列一部分,具体配置参考文档