Bläddra i källkod

缴费,案件详情问题处理

Your Name 2 år sedan
förälder
incheckning
5ecea9844c

+ 17
- 0
src/api/caseManagement/caseManagement.js Visa fil

34
 }
34
 }
35
 /** 批量上传证据 */
35
 /** 批量上传证据 */
36
 export function batchUpload(data) {
36
 export function batchUpload(data) {
37
+<<<<<<< HEAD
37
   return request({
38
   return request({
38
     url: "/caseApplication/batchUpload",
39
     url: "/caseApplication/batchUpload",
39
     method: "post",
40
     method: "post",
246
     method: 'get',
247
     method: 'get',
247
   })
248
   })
248
 }
249
 }
250
+=======
251
+    return request({
252
+        url: "/caseApplication/batchUpload",
253
+        method: "post",
254
+        data: data,
255
+    });
256
+}
257
+// 提交 
258
+export function submitCaseApply(data) {
259
+    return request({
260
+      url: '/caseApplication/submit',
261
+      method: 'post',
262
+      data: data
263
+    })
264
+  }
265
+>>>>>>> 0ca62df (缴费,案件详情问题处理)

+ 7
- 1
src/main.js Visa fil

4
 
4
 
5
 import Element from 'element-ui'
5
 import Element from 'element-ui'
6
 import './assets/styles/element-variables.scss'
6
 import './assets/styles/element-variables.scss'
7
-
7
+import './assets/icons' // icon
8
 import '@/assets/styles/index.scss' // global css
8
 import '@/assets/styles/index.scss' // global css
9
 import '@/assets/styles/ruoyi.scss' // ruoyi css
9
 import '@/assets/styles/ruoyi.scss' // ruoyi css
10
 import App from './App'
10
 import App from './App'
13
 import directive from './directive' // directive
13
 import directive from './directive' // directive
14
 import plugins from './plugins' // plugins
14
 import plugins from './plugins' // plugins
15
 import { download } from '@/utils/request'
15
 import { download } from '@/utils/request'
16
+<<<<<<< HEAD
16
 import { Message } from 'element-ui'
17
 import { Message } from 'element-ui'
17
 import NProgress from 'nprogress'
18
 import NProgress from 'nprogress'
18
 import 'nprogress/nprogress.css'
19
 import 'nprogress/nprogress.css'
22
 // 引入Iconfont 矢量图标库
23
 // 引入Iconfont 矢量图标库
23
 import './assets/icon/iconfont.css'
24
 import './assets/icon/iconfont.css'
24
 // import './permission' // permission control
25
 // import './permission' // permission control
26
+=======
27
+
28
+import './assets/icon/iconfont.css'
29
+import './permission' // permission control
30
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
25
 import { getDicts } from "@/api/system/dict/data";
31
 import { getDicts } from "@/api/system/dict/data";
26
 import { getConfigKey } from "@/api/system/config";
32
 import { getConfigKey } from "@/api/system/config";
27
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
33
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";

+ 22
- 0
src/utils/permission.js Visa fil

47
     console.error(`need roles! Like checkRole="['admin','editor']"`)
47
     console.error(`need roles! Like checkRole="['admin','editor']"`)
48
     return false
48
     return false
49
   }
49
   }
50
+<<<<<<< HEAD
51
+=======
52
+}
53
+
54
+/**
55
+ * 状态权限校验
56
+ * @param {Number} value 校验值
57
+ * @returns {Boolean}
58
+ */
59
+export function statusRole(value) {
60
+  let caseStatusStr = sessionStorage.getItem('caseStatus');
61
+  let caseStatus = [];
62
+  caseStatus = JSON.parse(caseStatusStr);
63
+  if (caseStatus.length == 0) {
64
+    return false
65
+  }
66
+  if (caseStatus.includes(value)) {
67
+    return true
68
+  } else {
69
+    return false
70
+  }
71
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
50
 }
72
 }

+ 132
- 0
src/views/caseManagement/caseList.vue Visa fil

63
             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
63
             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
64
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
64
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
65
                 <template slot-scope="scope">
65
                 <template slot-scope="scope">
66
+<<<<<<< HEAD
66
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text" icon="el-icon-edit"
67
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text" icon="el-icon-edit"
67
                         v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
68
                         v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
68
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text"
69
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text"
87
             scope.row.signButtonFlag != 1) && (scope.row.appOperatorFlag == 1 || scope.row.resOperatorFlag == 1 || scope.row.otherFlag == 1)
88
             scope.row.signButtonFlag != 1) && (scope.row.appOperatorFlag == 1 || scope.row.resOperatorFlag == 1 || scope.row.otherFlag == 1)
88
             ">{{ item.nodeName }}</el-button>
89
             ">{{ item.nodeName }}</el-button>
89
                     </div>
90
                     </div>
91
+=======
92
+                    <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)">提交</el-button>
93
+                    <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
94
+                        icon="el-icon-edit">修改</el-button>
95
+                    <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
96
+                    <el-button size="mini" @click="consultantApplica(scope.row)" type="text"
97
+                        icon="el-icon-tickets">法律顾问用印申请</el-button>
98
+                    <el-button size="mini" @click="departmentApplica(scope.row)" type="text"
99
+                        icon="el-icon-edit-outline">部门长用印申请</el-button>
100
+                    <el-button size="mini" @click="caseFlow(scope.row)" type="text" icon="el-icon-zoom-in">查看流程</el-button>
101
+                    <el-button size="mini" @click="caseLog(scope.row)" type="text"
102
+                        icon="el-icon-edit-outline">案件日志</el-button>
103
+                    <el-button size="mini" @click="caseFiling(scope.row)" type="text"
104
+                        icon="el-icon-tickets">案件归档</el-button>
105
+                    <el-button size="mini" @click="signMediation(scope.row)" type="text"
106
+                        icon="el-icon-edit-outline">签收调解书</el-button>
107
+                    <el-button size="mini" type="text" icon="el-icon-edit"
108
+                        @click="evidenceUpload(scope.row)">证据修改</el-button>
109
+                    <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button>
110
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
90
                 </template>
111
                 </template>
91
             </el-table-column>
112
             </el-table-column>
92
         </el-table>
113
         </el-table>
94
             :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" />
115
             :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" />
95
         <!-- 新增编辑详情 -->
116
         <!-- 新增编辑详情 -->
96
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
117
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
118
+<<<<<<< HEAD
97
             :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData">
119
             :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData">
98
         </addCase>
120
         </addCase>
121
+=======
122
+            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag"></addCase>
123
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
99
         <!-- 压缩包导入     -->
124
         <!-- 压缩包导入     -->
100
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
125
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
101
             @cancelCompreess="cancelCompreess" :getList="getList">
126
             @cancelCompreess="cancelCompreess" :getList="getList">
102
         </caseCompressionPackage>
127
         </caseCompressionPackage>
103
         <!-- 案件详情 -->
128
         <!-- 案件详情 -->
129
+<<<<<<< HEAD
104
         <mediationCaseDetails :processVisable="processVisable" @cancelViewProcess="cancelViewProcess"
130
         <mediationCaseDetails :processVisable="processVisable" @cancelViewProcess="cancelViewProcess"
105
             :caseFlowNumber="caseFlowNumber">
131
             :caseFlowNumber="caseFlowNumber">
132
+=======
133
+        <mediationCaseDetails :processVisable="processVisable" @cancelViewProcess="cancelViewProcess">
134
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
106
         </mediationCaseDetails>
135
         </mediationCaseDetails>
107
         <!-- 案件日志 -->
136
         <!-- 案件日志 -->
108
         <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr"
137
         <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr"
112
             :evidenceData="evidenceData">
141
             :evidenceData="evidenceData">
113
         </evidenceDialog>
142
         </evidenceDialog>
114
         <!-- 缴费 -->
143
         <!-- 缴费 -->
144
+<<<<<<< HEAD
115
         <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId"
145
         <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId"
116
             :payForm="payForm" :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
146
             :payForm="payForm" :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
117
             :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
147
             :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
148
         <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" :caseFilingData="caseFilingData"
178
         <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" :caseFilingData="caseFilingData"
149
             @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS">
179
             @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS">
150
         </caseFilingDetailsPage>
180
         </caseFilingDetailsPage>
181
+=======
182
+        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId" :payForm="payForm"
183
+            :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"></payDialog>
184
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
151
     </div>
185
     </div>
152
 </template>
186
 </template>
153
 
187
 
154
 <script>
188
 <script>
189
+<<<<<<< HEAD
155
 import {
190
 import {
156
     caseApplicationList,
191
     caseApplicationList,
157
     caseApplicationSelectById,
192
     caseApplicationSelectById,
184
 import mediation from "./components/mediation.vue";
219
 import mediation from "./components/mediation.vue";
185
 import confirmMediation from "./components/confirmMediation.vue";
220
 import confirmMediation from "./components/confirmMediation.vue";
186
 import caseFilingDetailsPage from "./components/caseFilingDetailsPage.vue";
221
 import caseFilingDetailsPage from "./components/caseFilingDetailsPage.vue";
222
+=======
223
+import { caseApplicationList, caseApplicationSelectById,submitCaseApply } from '@/api/caseManagement/caseManagement.js'
224
+import { listDept } from '@/api/system/dept.js'
225
+import moment from "moment";
226
+import addCase from './components/addCase.vue'
227
+import evidenceDialog from './components/evidenceDialog.vue';
228
+import caseCompressionPackage from './components/caseCompressionPackage.vue';
229
+import mediationCaseDetails from './components/mediationCaseDetails.vue'
230
+import mediationCaseLog from './components/mediationCaseLog.vue'
231
+import payDialog from "./components/payDialog.vue";
232
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
187
 export default {
233
 export default {
188
     name: "caseList",
234
     name: "caseList",
189
     dicts: ["case_flow_node"],
235
     dicts: ["case_flow_node"],
194
         mediationCaseLog,
240
         mediationCaseLog,
195
         evidenceDialog,
241
         evidenceDialog,
196
         payDialog,
242
         payDialog,
243
+<<<<<<< HEAD
197
         paymentdetailsDialog,
244
         paymentdetailsDialog,
198
         caseAcceptance,
245
         caseAcceptance,
199
         selectMediator, //调解员弹窗
246
         selectMediator, //调解员弹窗
204
         confirmMediation,
251
         confirmMediation,
205
         caseFilingDetailsPage,
252
         caseFilingDetailsPage,
206
         respondentPay,
253
         respondentPay,
254
+=======
255
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
207
     },
256
     },
208
     data() {
257
     data() {
209
         return {
258
         return {
221
             // 校验表单
270
             // 校验表单
222
             rules: {},
271
             rules: {},
223
             dataList: [],
272
             dataList: [],
273
+<<<<<<< HEAD
224
             addVisable: false, //新增弹窗
274
             addVisable: false, //新增弹窗
225
             openPay: false, //缴费弹框
275
             openPay: false, //缴费弹框
226
             openResPay: false, //被申请人缴费弹窗
276
             openResPay: false, //被申请人缴费弹窗
276
             isapplicant: true, //判断角色申请人或非申请人
326
             isapplicant: true, //判断角色申请人或非申请人
277
             caseFilingData: {},
327
             caseFilingData: {},
278
             applicant:""
328
             applicant:""
329
+=======
330
+            addVisable: false,//新增弹窗
331
+            openCompressedPackages: false,//压缩包导入弹窗
332
+            processVisable: false,//案件详情
333
+            showcaseLog: false,//案件日志
334
+            evidenceVisable: false,//证据修改弹窗
335
+            openPay: false, //缴费弹框
336
+            formPayDetail: {},
337
+            payId: null,
338
+            payForm: {},
339
+            caseData: {},
340
+            evidenceData: {},
341
+            caseDisabled: false,
342
+            caseTime: '',
343
+            deptList: [],
344
+            payTitle: '',
345
+            tabFlag: false
346
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
279
         };
347
         };
280
     },
348
     },
281
     created() {
349
     created() {
406
         /** 缴费 */
474
         /** 缴费 */
407
         payStatus(val) {
475
         payStatus(val) {
408
             this.getDetail({ id: val.id });
476
             this.getDetail({ id: val.id });
477
+<<<<<<< HEAD
409
             this.payTitle = "申请人缴费";
478
             this.payTitle = "申请人缴费";
410
             this.payId = val.id;
479
             this.payId = val.id;
411
             this.openPay = true;
480
             this.openPay = true;
476
                 resStr = this.formPayDetailAffiliate.res.map(item => item.res.name).join(',');
545
                 resStr = this.formPayDetailAffiliate.res.map(item => item.res.name).join(',');
477
                 this.formPayDetailAffiliate.applicationName = applicantStr;
546
                 this.formPayDetailAffiliate.applicationName = applicantStr;
478
                 this.formPayDetailAffiliate.respondentName = resStr;
547
                 this.formPayDetailAffiliate.respondentName = resStr;
548
+=======
549
+            this.payTitle = "缴费";
550
+            this.payId = val.id;
551
+            this.openPay = true;
552
+        },
553
+        /** 列表提交立案 */
554
+        onsubmitRow(row) {
555
+            this.$modal
556
+                .confirm("是否提交立案申请?")
557
+                .then(function () {
558
+                    return submitCaseApply({ id: row.id,caseFlowId:row.caseFlowId });
559
+                })
560
+                .then(() => {
561
+                    this.getList(this.queryParams);
562
+                    this.$modal.msgSuccess("立案申请成功");
563
+                })
564
+                .catch(() => { });
565
+        },
566
+        getDetail(parms) {
567
+            caseApplicationSelectById(parms).then((res) => {
568
+                this.formPayDetail = res.data;
569
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
479
                 this.payForm.feePayable = res.data.feePayable;
570
                 this.payForm.feePayable = res.data.feePayable;
480
                 this.payForm.caseId = res.data.id;
571
                 this.payForm.caseId = res.data.id;
481
             });
572
             });
482
         },
573
         },
574
+<<<<<<< HEAD
483
         getResDetail(parms) {
575
         getResDetail(parms) {
484
             caseApplicationSelectById(parms).then((res) => {
576
             caseApplicationSelectById(parms).then((res) => {
485
                 this.formResPayDetail = res.data;
577
                 this.formResPayDetail = res.data;
509
             this.timeConfirmVisable = true;
601
             this.timeConfirmVisable = true;
510
             this.timeConfirmData = val;
602
             this.timeConfirmData = val;
511
         },
603
         },
604
+=======
605
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
512
         /** 时间改变处理 */
606
         /** 时间改变处理 */
513
         caseTimeChange() {
607
         caseTimeChange() {
514
             if (this.caseTime) {
608
             if (this.caseTime) {
550
         paycancelRow(row) {
644
         paycancelRow(row) {
551
             this.openPay = false;
645
             this.openPay = false;
552
         },
646
         },
647
+<<<<<<< HEAD
553
         /**被申请人取消缴费*/
648
         /**被申请人取消缴费*/
554
         paycancelRes(row) {
649
         paycancelRes(row) {
555
             this.openResPay = false;
650
             this.openResPay = false;
582
         cancelTimeConfirm() {
677
         cancelTimeConfirm() {
583
             this.timeConfirmVisable = false;
678
             this.timeConfirmVisable = false;
584
         },
679
         },
680
+=======
681
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
585
         /** 搜索按钮操作 */
682
         /** 搜索按钮操作 */
586
         handleQuery() {
683
         handleQuery() {
587
             this.queryParams.pageNum = 1;
684
             this.queryParams.pageNum = 1;
619
                 .catch(() => { });
716
                 .catch(() => { });
620
         },
717
         },
621
         // 部门长用印申请
718
         // 部门长用印申请
719
+<<<<<<< HEAD
622
         departmentApplica(row) {
720
         departmentApplica(row) {
623
             this.$modal
721
             this.$modal
624
                 .confirm("你确定要用印确认吗?")
722
                 .confirm("你确定要用印确认吗?")
793
         },
891
         },
794
         cancelDetail() {
892
         cancelDetail() {
795
             this.showarchiveDetails = false;
893
             this.showarchiveDetails = false;
894
+=======
895
+        departmentApplica() {
896
+
897
+        },
898
+        //案件流程
899
+        caseFlow(row) {
900
+            this.processVisable = true
901
+        },
902
+        cancelViewProcess() {
903
+            this.processVisable = false
904
+        },
905
+        //案件日志
906
+        caseLog() {
907
+            this.showcaseLog = true
908
+        },
909
+        cancelcaseLog() {
910
+            this.showcaseLog = false
911
+        },
912
+        // 案件归档
913
+        caseFiling() {
914
+            this.$modal.confirm("你确定要案件归档吗?").then((res) => {
915
+
916
+            }).catch(() => {
917
+
918
+            })
919
+        },
920
+        //签收调解书
921
+        signMediation() {
922
+            this.$modal.confirm("你确定要签收调解书吗?").then((res) => {
923
+
924
+            }).catch(() => {
925
+
926
+            })
927
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
796
         },
928
         },
797
     },
929
     },
798
 };
930
 };

+ 455
- 0
src/views/caseManagement/components/addCase.vue Visa fil

1
 <template>
1
 <template>
2
+<<<<<<< HEAD
2
   <div>
3
   <div>
3
     <el-dialog :title="title" :visible="addVisable" v-if="addVisable" @close="cancel" width="1000px" center
4
     <el-dialog :title="title" :visible="addVisable" v-if="addVisable" @close="cancel" width="1000px" center
4
       :distroy-on-close="true">
5
       :distroy-on-close="true">
101
             <div style="display: inline-flex">
102
             <div style="display: inline-flex">
102
               <div class="infoIcon"></div>
103
               <div class="infoIcon"></div>
103
               <div class="caseInfo" style="margin-right: 20px;">双方信息:</div>
104
               <div class="caseInfo" style="margin-right: 20px;">双方信息:</div>
105
+=======
106
+    <div>
107
+        <el-dialog :title="title" :visible="addVisable" v-if="addVisable" @close="cancel" width="1000px" center
108
+            :distroy-on-close="true">
109
+            <el-tabs v-model="activeName">
110
+                <el-tab-pane label="案件信息" name="first">
111
+
112
+                </el-tab-pane>
113
+                <el-tab-pane label="证据清单" name="second" v-if="tabFlag">
114
+                    
115
+                </el-tab-pane>
116
+            </el-tabs>
117
+            <el-form v-if="activeName == 'first'" :disabled="caseDisabled" :model="formData" ref="ruleForm" label-width="130px" class="demo-ruleForm">
118
+                <el-row>
119
+                    <div style="display: inline-flex">
120
+                        <div class="infoIcon"></div>
121
+                        <div class="caseInfo">案件信息:</div>
122
+                    </div>
123
+                    <el-divider></el-divider>
124
+                    <el-col :span="24">
125
+                        <el-form-item label="申请人仲裁请求" prop="arbitratClaims" :rules="[
126
+                            {
127
+                                required: true,
128
+                                message: '申请人仲裁请求不能为空',
129
+                                trigger: 'blur',
130
+                            },
131
+                        ]">
132
+                            <el-input v-model="formData.arbitratClaims" placeholder="请输入申请人仲裁诉求" type="textarea"
133
+                                :autosize="{ minRows: 4, maxRows: 8 }" />
134
+                        </el-form-item>
135
+                    </el-col>
136
+                    <el-col :span="24">
137
+                        <el-form-item label="事实和理由" prop="facts" :rules="[
138
+                            {
139
+                                required: true,
140
+                                message: '事实和理由不能为空',
141
+                                trigger: 'blur',
142
+                            },
143
+                        ]">
144
+                            <el-input v-model="formData.facts" placeholder="请输入事实和理由" type="textarea"
145
+                                :autosize="{ minRows: 4, maxRows: 8 }" />
146
+                        </el-form-item>
147
+                    </el-col>
148
+                    <el-col :span="24">
149
+                        <el-form-item label="申请人请求仲裁庭裁决" prop="requestRule">
150
+                            <el-input v-model="formData.requestRule" placeholder="请输入申请人请求仲裁庭裁决" type="textarea"
151
+                                :autosize="{ minRows: 4, maxRows: 8 }" />
152
+                        </el-form-item>
153
+                    </el-col>
154
+                    <el-col :span="24">
155
+                        <el-form-item label="案件描述" prop="caseDescribe">
156
+                            <el-input v-model="formData.caseDescribe" placeholder="请输入案件描述" type="textarea"
157
+                                :autosize="{ minRows: 4, maxRows: 8 }" />
158
+                        </el-form-item>
159
+                    </el-col>
160
+                    <el-col :span="12">
161
+                        <el-form-item label="案件标的" prop="caseSubjectAmount" :rules="[
162
+                            {
163
+                                required: true,
164
+                                message: '案件标的不能为空',
165
+                                trigger: 'blur',
166
+                            },
167
+                        ]">
168
+                            <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" />
169
+                        </el-form-item>
170
+                    </el-col>
171
+                    <el-col :span="24">
172
+                        <el-form-item label="裁决书模板" prop="templateId" :rules="[
173
+                            {
174
+                                required: true,
175
+                                message: '裁决书模板',
176
+                                trigger: 'blur',
177
+                            },
178
+                        ]">
179
+                            <el-select placeholder="请选择裁决书模板" v-model="formData.templateId">
180
+                                <el-option v-for="item in templateList" :label="item.temName" :key="item.id"
181
+                                    :value="item.id"></el-option>
182
+                            </el-select>
183
+                        </el-form-item>
184
+                    </el-col>
185
+                    <el-col :span="12">
186
+                        <el-form-item label="申请人案件证据资料上传:" prop="applicantEvidence">
187
+                            <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
188
+                                :action="UploadUrl()" :on-success="handlSuccess" :on-remove="handleRemove"
189
+                                :on-preview="handlePreview" :before-remove="beforeRemove" :data="filedata"
190
+                                :headers="headers" multiple :limit="50" :on-exceed="handleExceed" :file-list="fileList">
191
+                                <el-button size="small" type="primary">点击上传</el-button>
192
+                                <div slot="tip" class="el-upload__tip">
193
+                                    文件支持上传.jpg,png,.doc,docx,.txt,.pdf文件
194
+                                </div>
195
+                            </el-upload>
196
+                        </el-form-item>
197
+                    </el-col>
198
+                    <el-col :span="24" v-if="modelFlag">
199
+                        <el-form-item label="证据">
200
+                            <div v-for="(item, index) in formData.caseAttachList" :key="index">
201
+                                <div style="color: blue;cursor: pointer;" @click="fileDetil(item.annexPath)">{{
202
+                                    item.annexName }}</div>
203
+                            </div>
204
+                        </el-form-item>
205
+                    </el-col>
206
+                    <el-col :span="24">
207
+                        <div style="display: inline-flex">
208
+                            <div class="infoIcon"></div>
209
+                            <div class="caseInfo">双方信息:</div>
210
+                        </div>
211
+                        <el-divider></el-divider>
212
+                    </el-col>
213
+                    <el-col :span="12">
214
+                        <el-form-item label="申请机构名称" prop="affiliate.applicationOrganName" :rules="[
215
+                            {
216
+                                required: true,
217
+                                message: '申请机构名称不能为空',
218
+                                trigger: 'blur',
219
+                            },
220
+                        ]">
221
+                            <el-input v-model="formData.affiliate.applicationOrganName" placeholder="请输入申请机构名称" />
222
+                        </el-form-item>
223
+                    </el-col>
224
+                    <el-col :span="12">
225
+                        <el-form-item label="统一社会信用代码" prop="affiliate.creditCode" :rules="[
226
+                            {
227
+                                required: true,
228
+                                message: '统一社会信用代码不能为空',
229
+                                trigger: 'blur',
230
+                            },
231
+                        ]">
232
+                            <el-input v-model="formData.affiliate.creditCode" placeholder="请输入统一社会信用代码" />
233
+                        </el-form-item>
234
+                    </el-col>
235
+                    <el-col :span="12">
236
+                        <el-form-item label="法定代表人" prop="affiliate.compLegalPerson" :rules="[
237
+                            {
238
+                                required: true,
239
+                                message: '法定代表人不能为空',
240
+                                trigger: 'blur',
241
+                            },
242
+                        ]">
243
+                            <el-input v-model="formData.affiliate.compLegalPerson" placeholder="请输入法定代表人" />
244
+                        </el-form-item>
245
+                    </el-col>
246
+                    <el-col :span="12">
247
+                        <el-form-item label="申请人住所" prop="affiliate.applicantHome" :rules="[
248
+                            {
249
+                                required: true,
250
+                                message: '申请人住所不能为空',
251
+                                trigger: 'blur',
252
+                            },
253
+                        ]">
254
+                            <el-input v-model="formData.affiliate.applicantHome" placeholder="请输入申请人住所" />
255
+                        </el-form-item>
256
+                    </el-col>
257
+                    <el-col :span="12">
258
+                        <el-form-item label="申请人联系地址" prop="affiliate.applicantAddress" :rules="[
259
+                            {
260
+                                required: true,
261
+                                message: '申请人联系地址不能为空',
262
+                                trigger: 'blur',
263
+                            },
264
+                        ]">
265
+                            <el-input v-model="formData.affiliate.applicantAddress" placeholder="请输入申请人联系地址" />
266
+                        </el-form-item>
267
+                    </el-col>
268
+                    <el-col :span="12">
269
+                        <el-form-item label="代理人联系电话" prop="affiliate.contactTelphoneAgent" :rules="[
270
+                            {
271
+                                required: true,
272
+                                message: '代理人联系电话不能为空',
273
+                                trigger: 'blur',
274
+                            },
275
+                            {
276
+                                pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
277
+                                message: '请输入正确的手机号码',
278
+                                trigger: 'blur',
279
+                            },
280
+                        ]">
281
+                            <el-input v-model="formData.affiliate.contactTelphoneAgent" placeholder="请输入代理人联系电话" />
282
+                        </el-form-item>
283
+                    </el-col>
284
+                    <el-col :span="12">
285
+                        <el-form-item label="委托代理人姓名" prop="affiliate.nameAgent" :rules="[
286
+                            {
287
+                                required: true,
288
+                                message: '委托代理人姓名不能为空',
289
+                                trigger: 'blur',
290
+                            },
291
+                        ]">
292
+                            <el-input v-model="formData.affiliate.nameAgent" placeholder="请输入委托代理人姓名" />
293
+                        </el-form-item>
294
+                    </el-col>
295
+                    <el-col :span="12">
296
+                        <el-form-item label="代理人邮箱" prop="affiliate.agentEmail" :rules="[
297
+                            {
298
+                                required: true,
299
+                                message: '代理人邮箱不能为空',
300
+                                trigger: 'blur',
301
+                            },
302
+                            {
303
+                                pattern:
304
+                                    /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
305
+                                message: '请输入正确的邮箱地址',
306
+                                trigger: 'blur',
307
+                            },
308
+                        ]">
309
+                            <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
310
+                        </el-form-item>
311
+                    </el-col>
312
+                    <el-col :span="12">
313
+                        <el-form-item label="被申请人姓名" prop="affiliate.respondentName" :rules="[
314
+                            {
315
+                                required: true,
316
+                                message: '被申请人姓名不能为空',
317
+                                trigger: 'blur',
318
+                            },
319
+                        ]">
320
+                            <el-input v-model="formData.affiliate.respondentName" placeholder="请输入被申请人姓名" />
321
+                        </el-form-item>
322
+                    </el-col>
323
+                    <el-col :span="12">
324
+                        <el-form-item label="被申请人联系电话" prop="affiliate.respondentPhone" :rules="[
325
+                            {
326
+                                required: true,
327
+                                message: '被申请人联系电话不能为空',
328
+                                trigger: 'blur',
329
+                            },
330
+                            {
331
+                                pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
332
+                                message: '请输入正确的手机号码',
333
+                                trigger: 'blur',
334
+                            },
335
+                        ]">
336
+                            <el-input v-model="formData.affiliate.respondentPhone" placeholder="请输入被申请人联系电话" />
337
+                        </el-form-item>
338
+                    </el-col>
339
+                    <el-col :span="12">
340
+                        <el-form-item label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
341
+                            {
342
+                                required: true,
343
+                                message: '被申请人身份证号不能为空',
344
+                                trigger: 'blur',
345
+                            },
346
+                            {
347
+                                pattern:
348
+                                    /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
349
+                                message: '请输入正确的身份证号码',
350
+                                trigger: 'blur',
351
+                            },
352
+                        ]">
353
+                            <el-input v-model="formData.affiliate.respondentIdentityNum" placeholder="请输入被申请人身份证号" />
354
+                        </el-form-item>
355
+                    </el-col>
356
+                    <el-col :span="12">
357
+                        <el-form-item label="被申请人性别:" prop="affiliate.respondentSex" :rules="[
358
+                            {
359
+                                required: true,
360
+                                message: '请选择性别'
361
+                            },
362
+                        ]">
363
+                            <el-radio-group v-model="formData.affiliate.respondentSex">
364
+                                <el-radio label="0">男</el-radio>
365
+                                <el-radio label="1">女</el-radio>
366
+                            </el-radio-group>
367
+                        </el-form-item>
368
+                    </el-col>
369
+                    <el-col :span="12">
370
+                        <el-form-item label="被申请人出生年月日:" prop="affiliate.respondentBirth" :rules="[
371
+                            {
372
+                                required: true,
373
+                                message: '被申请人出生年月日不能为空',
374
+                                trigger: 'blur',
375
+                            },
376
+                        ]">
377
+                            <el-date-picker v-model="formData.affiliate.respondentBirth" type="date"
378
+                                placeholder="被申请人出生年月日">
379
+                            </el-date-picker>
380
+                        </el-form-item>
381
+                    </el-col>
382
+                    <el-col :span="12">
383
+                        <el-form-item label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
384
+                            {
385
+                                required: true,
386
+                                message: '被申请人申请人住所不能为空',
387
+                                trigger: 'blur',
388
+                            },
389
+                        ]">
390
+                            <el-input v-model="formData.affiliate.respondentHome" placeholder="请输入被申请人申请人住所" />
391
+                        </el-form-item>
392
+                    </el-col>
393
+                    <el-col :span="12">
394
+                        <el-form-item label="被申请人邮箱" prop="affiliate.respondentEmail" :rules="[
395
+                            {
396
+                                required: true,
397
+                                message: '代理人邮箱不能为空',
398
+                                trigger: 'blur',
399
+                            },
400
+                            {
401
+                                pattern:
402
+                                    /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
403
+                                message: '请输入正确的邮箱地址',
404
+                                trigger: 'blur',
405
+                            },
406
+                        ]">
407
+                            <el-input v-model="formData.affiliate.respondentEmail" placeholder="请输入被申请人邮箱" />
408
+                        </el-form-item>
409
+                    </el-col>
410
+                </el-row>
411
+                <el-col :span="24" v-if="modelFlag">
412
+                    <div style="display: inline-flex">
413
+                        <div class="infoIcon"></div>
414
+                        <div class="caseInfo">抓取规则设置</div>
415
+                    </div>
416
+                    <el-divider></el-divider>
417
+                </el-col>
418
+                <el-col :span="24" v-if="modelFlag">
419
+                    <el-form-item v-for="(item) in formData.columnValueList" :label="item.name" :key="item.id">
420
+                        <el-input type="textarea" v-model="item.value"></el-input>
421
+                    </el-form-item>
422
+                </el-col>
423
+            </el-form>
424
+            <div v-if="activeName == 'second'">
425
+                <el-card class="box-card" style="margin-bottom: 30px;">
426
+                    <div slot="header" class="clearfix">
427
+                        <span>申请人证据清单</span>
428
+                    </div>
429
+                    <div v-for="(item, index) in applicantEvidence" :key="index" class="text item"
430
+                        style="color: blue;cursor: pointer;" @click="toPreview(item.annexPath)">
431
+                        {{ item.annexName }}
432
+                    </div>
433
+                </el-card>
434
+                <el-card class="box-card">
435
+                    <div slot="header" class="clearfix">
436
+                        <span>被申请人证据清单</span>
437
+                    </div>
438
+                    <div v-for="(item, index) in respondentEvidence" :key="index" class="text item"
439
+                        style="color: blue;cursor: pointer;" @click="toPreview(item.annexPath)">
440
+                        {{ item.annexName }}
441
+                    </div>
442
+                </el-card>
443
+            </div>
444
+            <div slot="footer" class="dialog-footer">
445
+                <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
446
+                <el-button type="primary" @click="submitForm" class="endbutton"><span>确认</span></el-button>
447
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
104
             </div>
448
             </div>
105
             <el-divider></el-divider>
449
             <el-divider></el-divider>
106
           </el-col>
450
           </el-col>
679
 import { getTemplate } from "@/api/officialSeal/officialSeal.js";
1023
 import { getTemplate } from "@/api/officialSeal/officialSeal.js";
680
 import { getToken } from "@/utils/auth";
1024
 import { getToken } from "@/utils/auth";
681
 export default {
1025
 export default {
1026
+<<<<<<< HEAD
682
   props: [
1027
   props: [
683
     "addVisable",
1028
     "addVisable",
684
     "queryParams",
1029
     "queryParams",
859
             affiliate:
1204
             affiliate:
860
             {
1205
             {
861
               applicant: [
1206
               applicant: [
1207
+=======
1208
+    props: ["addVisable", "queryParams", "caseData", "caseDisabled","tabFlag"],
1209
+    dicts: ["case_built_type"],
1210
+    data() {
1211
+        return {
1212
+            activeName: 'first',
1213
+            title: "新增案件",
1214
+            formData: {
1215
+                affiliate: {
1216
+                    respondentSex: 0
1217
+                },
1218
+                columnValueList: [],
1219
+                caseAttachList: []
1220
+            },
1221
+            templateList: [],
1222
+            modelFlag: false,
1223
+            fileURL: window.location.origin + "/API",
1224
+            fileList: [],
1225
+            filedata: {
1226
+                annexType: 2,
1227
+            },
1228
+            headers: {
1229
+                Authorization: "Bearer " + getToken(),
1230
+            },
1231
+            applicantEvidence: [],//申请人证据
1232
+            respondentEvidence: [],//被申请人证据
1233
+        };
1234
+    },
1235
+    watch: {
1236
+        caseData: {
1237
+            deep: true,
1238
+            handler(val) {
1239
+                this.getTemplateFn();
1240
+                if (val.id && !val.flag) {
1241
+                    this.modelFlag = true;
1242
+                    this.title = '修改案件';
1243
+                    this.caseApplicationSelectByIdFn(val.id)
1244
+                } else if (!val.id && !val.flag) {
1245
+                    this.modelFlag = false;
1246
+                    this.title = '新增案件';
1247
+                    this.formData = {
1248
+                        affiliate: {
1249
+                            respondentSex: 0
1250
+                        },
1251
+                        columnValueList: [],
1252
+                        caseAttachList: []
1253
+                    };
1254
+                } else if (val.id && val.flag == 1) {
1255
+                    this.modelFlag = true;
1256
+                    this.title = '案件详情';
1257
+                    this.caseApplicationSelectByIdFn(val.id);
1258
+                }
1259
+            },
1260
+        },
1261
+        addVisable(val){
1262
+            if(val){
1263
+                this.activeName = 'first';
1264
+            }
1265
+        }
1266
+    },
1267
+    created() {
1268
+
1269
+    },
1270
+    methods: {
1271
+        /** 根据案件id获取对应信息 */
1272
+        caseApplicationSelectByIdFn(data) {
1273
+            this.applicantEvidence = [];
1274
+            this.respondentEvidence = [];
1275
+            caseApplicationSelectById({ id: data }).then((res => {
1276
+                this.formData = res.data;
1277
+                this.formData.caseAttachList.forEach(item => {
1278
+                    if (item.annexType == 2) {
1279
+                        this.applicantEvidence.push(item)
1280
+                    } else if (item.annexType == 6) {
1281
+                        this.respondentEvidence.push(item)
1282
+                    }
1283
+                })
1284
+            }))
1285
+        },
1286
+        // 新增案件
1287
+        insertFn(data) {
1288
+            caseApplicationInsert(data).then(res => {
1289
+                this.$modal.msgSuccess("新增成功!");
1290
+                this.$emit("cancelCaseAdd");
1291
+                this.$emit('getList', this.queryParams);
1292
+            })
1293
+        },
1294
+        /** 获取裁决书模板 */
1295
+        getTemplateFn(data) {
1296
+            getTemplate(data).then(res => {
1297
+                console.log(res)
1298
+                this.templateList = res.rows;
1299
+            })
1300
+        },
1301
+        /** 查看证据 */
1302
+        fileDetil(val) {
1303
+            window.open(this.fileURL + val)
1304
+        },
1305
+        /** 查看证据 */
1306
+        toPreview(val) {
1307
+            window.open(this.fileURL + val)
1308
+        },
1309
+        /** 文件上传地址 */
1310
+        UploadUrl() {
1311
+            return window.location.origin + "/API/common/upload";
1312
+        },
1313
+        /**文件上传成功*/
1314
+        handlSuccess(res, file) {
1315
+            this.formData.caseAttachList.push(
1316
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
862
                 {
1317
                 {
863
                   applicant: {
1318
                   applicant: {
864
                     roleType: 1,
1319
                     roleType: 1,

+ 47
- 0
src/views/caseManagement/components/payDialog.vue Visa fil

7
           formPayDetail.caseNum
7
           formPayDetail.caseNum
8
         }}</el-descriptions-item>
8
         }}</el-descriptions-item>
9
         <el-descriptions-item label="申请人">{{
9
         <el-descriptions-item label="申请人">{{
10
+<<<<<<< HEAD
10
           formPayDetailAffiliate.applicationName || ''
11
           formPayDetailAffiliate.applicationName || ''
11
         }}</el-descriptions-item>
12
         }}</el-descriptions-item>
12
         <!-- <el-descriptions-item label="案件标的">{{
13
         <!-- <el-descriptions-item label="案件标的">{{
28
             {{ formPayDetail.reason }}
29
             {{ formPayDetail.reason }}
29
           </el-tag>
30
           </el-tag>
30
         </el-descriptions-item>
31
         </el-descriptions-item>
32
+=======
33
+          formPayDetail.affiliate.applicationOrganName || ''
34
+        }}</el-descriptions-item>
35
+        <el-descriptions-item label="案件标的">{{
36
+          formPayDetail.caseSubjectAmount
37
+        }}</el-descriptions-item>
38
+        <el-descriptions-item label="案件应缴费用">{{
39
+          formPayDetail.feePayable
40
+        }}</el-descriptions-item>
41
+        <el-descriptions-item label="被申请人">{{
42
+          formPayDetail.affiliate.respondentName
43
+        }}</el-descriptions-item>
44
+        <!-- <el-descriptions-item label="案件状态">
45
+          <el-tag size="mini" type='danger' effect="dark">
46
+            {{ formPayDetail.caseStatusName }}
47
+          </el-tag>
48
+        </el-descriptions-item> -->
49
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
31
       </el-descriptions>
50
       </el-descriptions>
32
       <div class="paySelectType">
51
       <div class="paySelectType">
33
         <el-radio-group v-model="paySelect" @input="changPayType">
52
         <el-radio-group v-model="paySelect" @input="changPayType">
57
       </div>
76
       </div>
58
       <div class="payTitle">{{ payMain }}</div>
77
       <div class="payTitle">{{ payMain }}</div>
59
       <div slot="footer" class="dialog-footer">
78
       <div slot="footer" class="dialog-footer">
79
+<<<<<<< HEAD
60
         <el-button @click="payCancel" round><span>取 消</span></el-button>
80
         <el-button @click="payCancel" round><span>取 消</span></el-button>
61
         <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
81
         <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
82
+=======
83
+        <el-button @click="payCancel" class="endbutton"><span>取 消</span></el-button>
84
+        <el-button @click="submitUpload" class="endbutton"><span>确认缴费</span></el-button>
85
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
62
       </div>
86
       </div>
63
     </el-dialog>
87
     </el-dialog>
64
   </div>
88
   </div>
69
 import QRCode from "qrcodejs2";
93
 import QRCode from "qrcodejs2";
70
 import { getToken } from "@/utils/auth";
94
 import { getToken } from "@/utils/auth";
71
 export default {
95
 export default {
96
+<<<<<<< HEAD
72
   props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId","formPayDetailAffiliate"],
97
   props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId","formPayDetailAffiliate"],
98
+=======
99
+  props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId"],
100
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
73
   data() {
101
   data() {
74
     return {
102
     return {
75
       // key: value
103
       // key: value
82
         Authorization: "Bearer " + getToken(),
110
         Authorization: "Bearer " + getToken(),
83
       },
111
       },
84
       filedata: {
112
       filedata: {
113
+<<<<<<< HEAD
85
         annexType: 4,
114
         annexType: 4,
115
+=======
116
+        annexType: 8,
117
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
86
       },
118
       },
87
       submitForm:{
119
       submitForm:{
88
         payType:1,
120
         payType:1,
89
         payOrderList:[],
121
         payOrderList:[],
90
         caseId:null
122
         caseId:null
123
+<<<<<<< HEAD
91
       },
124
       },
92
       payFlagSubmit:true
125
       payFlagSubmit:true
126
+=======
127
+      }
128
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
93
     };
129
     };
94
   },
130
   },
95
   methods: {
131
   methods: {
113
         annexId: res.annexId,
149
         annexId: res.annexId,
114
         annexName:res.annexName
150
         annexName:res.annexName
115
       });
151
       });
152
+<<<<<<< HEAD
116
       this.payFlagSubmit = false;
153
       this.payFlagSubmit = false;
154
+=======
155
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
117
     },
156
     },
118
     submitUpload() {
157
     submitUpload() {
119
       if (this.fileList.length < 1) {
158
       if (this.fileList.length < 1) {
130
     handleRemove(file, fileList) {
169
     handleRemove(file, fileList) {
131
       (this.submitForm.payOrderList = []),
170
       (this.submitForm.payOrderList = []),
132
       fileList.forEach((item) => {
171
       fileList.forEach((item) => {
172
+<<<<<<< HEAD
133
           this.submitForm.payOrderList.push({ annexId:item.response.annexId,annexName:item.response.annexName });
173
           this.submitForm.payOrderList.push({ annexId:item.response.annexId,annexName:item.response.annexName });
174
+=======
175
+          this.submitForm.payOrderList.push({ annexId:item.response.data.annexId,annexName:item.response.data.annexName });
176
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
134
         });
177
         });
135
     },
178
     },
136
     handlePreview(file) {
179
     handlePreview(file) {
189
       this.submitForm.caseId = this.payId;
232
       this.submitForm.caseId = this.payId;
190
       }
233
       }
191
     }
234
     }
235
+<<<<<<< HEAD
192
   },
236
   },
237
+=======
238
+  }
239
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
193
 };
240
 };
194
 </script>
241
 </script>
195
 
242
 

+ 7
- 0
vue.config.js Visa fil

14
 // const API = 'http://121.40.189.20:7001'  //生产
14
 // const API = 'http://121.40.189.20:7001'  //生产
15
 const API = 'http://121.40.189.20:6001'  //测试
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
+<<<<<<< HEAD
17
 // const API = 'http://172.16.0.237:6001' //Q
18
 // const API = 'http://172.16.0.237:6001' //Q
18
 // const API = 'http://172.16.1.26:6001' //w
19
 // const API = 'http://172.16.1.26:6001' //w
19
 
20
 
20
 // vue.config.js 配置说明 
21
 // vue.config.js 配置说明 
22
+=======
23
+// const API = 'http://192.168.3.77:9001' //Q
24
+// const API = 'http://172.16.1.14:6001' //w
25
+
26
+// vue.config.js 配置说明
27
+>>>>>>> 0ca62df (缴费,案件详情问题处理)
21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
28
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
22
 // 这里只列一部分,具体配置参考文档
29
 // 这里只列一部分,具体配置参考文档
23
 module.exports = {
30
 module.exports = {