Quellcode durchsuchen

送达加载,新增bug

hanchaobo vor 2 Jahren
Ursprung
Commit
72e79651b6

+ 60
- 36
src/views/caseManagement/caseList.vue Datei anzeigen

@@ -23,7 +23,8 @@
23 23
             </el-form-item>
24 24
             <el-form-item label="创建时间" prop="caseTime">
25 25
                 <el-date-picker v-model="caseTime" type="daterange" align="right" unlink-panels range-separator="至"
26
-                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" @change="caseTimeChange">
26
+                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px"
27
+                    @change="caseTimeChange">
27 28
                 </el-date-picker>
28 29
             </el-form-item>
29 30
             <el-form-item>
@@ -46,8 +47,8 @@
46 47
             <el-table-column label="序号" type="index" align="center">
47 48
                 <template slot-scope="scope">
48 49
                     <span>{{
49
-                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
50
-                    }}</span>
50
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
51
+        }}</span>
51 52
                 </template>
52 53
             </el-table-column>
53 54
             <!-- <el-table-column label="批号" align="center" prop="batchNumber" :show-overflow-tooltip="true" /> -->
@@ -64,33 +65,37 @@
64 65
                 <template slot-scope="scope">
65 66
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text" icon="el-icon-edit"
66 67
                         v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
67
-                    <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
68
-                    <el-button size="mini" @click="caseFlow(scope.row)" type="text" icon="el-icon-zoom-in">查看流程</el-button>
68
+                    <el-button size="mini" @click="checkDetail(scope.row)" type="text"
69
+                        icon="el-icon-view">查看详情</el-button>
70
+                    <el-button size="mini" @click="caseFlow(scope.row)" type="text"
71
+                        icon="el-icon-zoom-in">查看流程</el-button>
69 72
                     <el-button size="mini" @click="caseLog(scope.row)" type="text"
70 73
                         icon="el-icon-edit-outline">案件日志</el-button>
71
-                    <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text"
72
-                        icon="el-icon-edit" v-if="scope.row.caseFlowId > 2">查看缴费单</el-button>
74
+                    <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text" icon="el-icon-edit"
75
+                        v-if="scope.row.caseFlowId > 2">查看缴费单</el-button>
73 76
                     <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>
77
+                        v-hasPermi="['caseManagement:list:evidenceEdit']"
78
+                        v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
75 79
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 ||
76
-                        scope.row.caseFlowId == 16 ||
77
-                        scope.row.caseFlowId == 17
78
-                        " @click="caseFilingDetails(scope.row)">归档详情</el-button>
80
+            scope.row.caseFlowId == 16 ||
81
+            scope.row.caseFlowId == 17
82
+            " @click="caseFilingDetails(scope.row)">归档详情</el-button>
79 83
                     <div class="btnList" v-for="item in buttonList" :key="item.id">
80 84
                         <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
81 85
                             v-if="item.id == scope.row.caseFlowId &&
82
-                                checkPermi([item.buttonAuthFlag]) &&
83
-                                scope.row.signButtonFlag != 1
84
-                                ">{{ item.nodeName }}</el-button>
86
+            checkPermi([item.buttonAuthFlag]) &&
87
+            scope.row.signButtonFlag != 1
88
+            ">{{ item.nodeName }}</el-button>
85 89
                     </div>
86 90
                 </template>
87 91
             </el-table-column>
88 92
         </el-table>
89
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
90
-            @pagination="getList(queryParams)" />
93
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
94
+            :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" />
91 95
         <!-- 新增编辑详情 -->
92 96
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
93
-            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData"></addCase>
97
+            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData">
98
+        </addCase>
94 99
         <!-- 压缩包导入     -->
95 100
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
96 101
             @cancelCompreess="cancelCompreess" :getList="getList">
@@ -103,11 +108,12 @@
103 108
         <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr"
104 109
             :flagLoading="flagLoading"></mediationCaseLog>
105 110
         <!-- 证据修改 -->
106
-        <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence" :evidenceData="evidenceData">
111
+        <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence"
112
+            :evidenceData="evidenceData">
107 113
         </evidenceDialog>
108 114
         <!-- 缴费 -->
109
-        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId" :payForm="payForm"
110
-            :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
115
+        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId"
116
+            :payForm="payForm" :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
111 117
             :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
112 118
         <!-- 缴费确认查看详情 -->
113 119
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
@@ -134,8 +140,8 @@
134 140
         <timeConfirm @cancelTimeConfirm="cancelTimeConfirm" :timeConfirmVisable="timeConfirmVisable"
135 141
             :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
136 142
         <!-- 待调解     -->
137
-        <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable" :mediationData="mediationData"
138
-            @getList="getList" :queryParams="queryParams"></mediation>
143
+        <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable"
144
+            :mediationData="mediationData" @getList="getList" :queryParams="queryParams"></mediation>
139 145
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
140 146
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
141 147
         <!-- 归档详情 -->
@@ -293,12 +299,12 @@ export default {
293 299
             // this.getList(this.queryParams);
294 300
         });
295 301
         if (this.$route.query.caseFlowId) {
296
-                let querydata = Number(this.$route.query.caseFlowId);
297
-                if (querydata > 0) {
298
-                    this.$set(this.queryParams, 'caseFlowId', querydata)
299
-                }
302
+            let querydata = Number(this.$route.query.caseFlowId);
303
+            if (querydata > 0) {
304
+                this.$set(this.queryParams, 'caseFlowId', querydata)
300 305
             }
301
-            this.getList(this.queryParams);
306
+        }
307
+        this.getList(this.queryParams);
302 308
     },
303 309
     methods: {
304 310
         /**所有按钮事件 */
@@ -684,15 +690,33 @@ export default {
684 690
             let paramValues = {
685 691
                 ids: [row.id],
686 692
             };
687
-            this.$modal
688
-                .confirm("你确定要案件送达吗?")
689
-                .then((res) => {
690
-                    msCaseFile(paramValues).then((res) => {
691
-                        this.$modal.msgSuccess("案件送达成功");
692
-                        this.getList(this.queryParams);
693
-                    });
694
-                })
695
-                .catch(() => { });
693
+            this.$confirm("你确定要案件送达吗?", "提示", {
694
+                    confirmButtonText: '确定',
695
+                    cancelButtonText: '取消',
696
+                    type: 'warning',
697
+                    callback: () => { },
698
+                    beforeClose: (action, ctx, close) => {
699
+                        if (action !== 'confirm') {
700
+                            close();
701
+                            return;
702
+                        }
703
+                        ctx.confirmButtonLoading = true;
704
+                        msCaseFile(paramValues).then((res) => {
705
+                            this.$modal.msgSuccess("案件送达成功");
706
+                            close();
707
+                            this.getList(this.queryParams);
708
+                        }).finally(() => {
709
+                            ctx.confirmButtonLoading = false;
710
+                        })
711
+                    }
712
+                }).finally(() => { })
713
+            // .then((res) => {
714
+            //     msCaseFile(paramValues).then((res) => {
715
+            //         this.$modal.msgSuccess("案件送达成功");
716
+            //         this.getList(this.queryParams);
717
+            //     });
718
+            // })
719
+            // .catch(() => { });
696 720
         },
697 721
         //申请人签收调解书
698 722
         signMediation(row) {

+ 2
- 0
src/views/caseManagement/components/addCase.vue Datei anzeigen

@@ -633,6 +633,8 @@ export default {
633 633
           this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
634 634
           this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
635 635
           this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
636
+          this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType);
637
+          this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality);
636 638
         }
637 639
         this.activeName = "first";
638 640
         this.showmediate = false;

+ 2
- 2
vue.config.js Datei anzeigen

@@ -12,10 +12,10 @@ 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:7001'  //生产
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 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
19 19
 
20 20
 // vue.config.js 配置说明 
21 21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions