Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!12

src/components/uploadSingleFile.vue

@@ -148,7 +148,7 @@ import caseManagement from "@/services/caseManagement";
                     this.$emit('handleUploadFile')
 
                 }catch (e) {
-                    this.$message.error(e.msg)
+                    // this.$message.error(e.msg)
                 }
             },
         },

src/pages/case-management/index.vue

@@ -163,7 +163,7 @@
                                     <el-input v-model.trim="queryParam.creditorCode"
                                               clearable placeholder="请输入被申请人证件号"
                                               @keydown.enter.native="handleSearch"
-                                              maxlength="11"
+                                              maxlength="18"
                                               >
                                     </el-input>
                                 </div>
@@ -206,8 +206,8 @@
                     <div class="flex-row">
                         <!-- <el-button size="small" @click="handleImport">导入</el-button>
                         <el-button size="small" @click="handleBatchDelete">删除</el-button>-->
-                        <el-button size="small" @click="handleConclude">案件办结</el-button>
+                        <el-button size="small" @click="handleConclude"><i class="el-icon-receiving f14 mr-4"></i>案件办结</el-button>
-                        <el-button size="small" type="primary" @click="handleCaseAllocation">案件分配</el-button>
+                        <el-button size="small" type="primary" @click="handleCaseAllocation"><i class="el-icon-rank f14 mr-4"></i>案件分配</el-button>
                     </div>
                 </div>
                 <div class="height-56 flex-row align-items-center justify-content-between" style="height: 22px;margin-left: 10px;margin-top: -10px;margin-bottom: 5px">

src/pages/case-package/index.vue

@@ -95,9 +95,9 @@
                 <div class="height-56 flex-row align-items-center justify-content-between">
                     <div class="f22 color-text-primary">列表</div>
                     <div class="flex-row">
-                        <el-button size="small" type="primary" @click="handleImport">批量导入案件</el-button>
+                        <el-button size="small" type="primary" @click="handleImport"><i class="el-icon-upload f14 mr-4"></i>批量导入案件</el-button>
-                        <el-button size="small" @click="handleAddForm">添加案件</el-button>
+                        <el-button size="small" @click="handleAddForm"><i class="el-icon-plus f14 mr-4"></i>添加案件</el-button>
-                        <el-button size="small" @click="jumpUrl(`/case-mistake`)">错误修复</el-button>
+                        <el-button size="small" @click="jumpUrl(`/case-mistake`)"><i class="el-icon-takeaway-box f14 mr-4"></i>错误修复</el-button>
                     </div>
                 </div>
                 

src/pages/event-tracing/components/CallDialog.vue

@@ -72,11 +72,11 @@
                             </template>
                         </el-table-column> -->
                         
-                        <el-table-column  label="操作" width="160">
+                        <el-table-column  label="操作" width="200">
                             <template slot-scope="scope">
                                 <div class="flex-row align-items-center">
                                     <el-button size="mini" v-if="scope.row.status.code == 1" @click="handleEnterqueue(scope.row)">进入外呼队列</el-button>
-                                    <!-- <el-button size="mini" v-if="scope.row.notCalledCount != 0" @click="handleBackCase(scope)">取消</el-button> -->
+                                    <el-button size="mini" v-if="scope.row.status.code == 1" @click="handleBackCase(scope.row)">取消</el-button>
                                 </div>
                             </template>
                         </el-table-column>

src/pages/mediation-management/index.vue

@@ -175,7 +175,7 @@
                                     <el-input v-model.trim="queryParam.creditorCode"
                                               clearable placeholder="请输入被申请人证件号"
                                               @keydown.enter.native="handleSearch"
-                                              maxlength="11"
+                                              maxlength="18"
                                               >
                                     </el-input>
                                 </div>
@@ -217,13 +217,13 @@
                 <div class="height-56 flex-row align-items-center justify-content-between">
                     <div class="f22 color-text-primary">案件列表</div>
                     <div class="flex-row">
-                        <el-button size="small" @click="handleConclude">案件办结</el-button> 
+                        <el-button size="small" @click="handleConclude"><i class="el-icon-receiving f14 mr-4"></i>案件办结</el-button> 
-                        <el-button size="small" @click="handleSMSSend">发送短信</el-button> 
+                        <el-button size="small" @click="handleSMSSend"><i class="el-icon-message f14 mr-4"></i>发送短信</el-button> 
-                        <el-button size="small" @click="handleBrainCall">智能外呼</el-button> 
+                        <el-button size="small" @click="handleBrainCall"><i class="el-icon-service f14 mr-4"></i>智能外呼</el-button> 
-                        <el-button size="small" @click="handleOffice">文书生成</el-button> 
+                        <el-button size="small" @click="handleOffice"><i class="el-icon-document-checked f14 mr-4"></i>文书生成</el-button> 
-                        <el-button size="small" @click="handleOfficeWrite">发起签字</el-button> 
+                        <el-button size="small" @click="handleOfficeWrite"><i class="el-icon-reading f14 mr-4"></i>发起签字</el-button> 
-                        <el-button size="small" @click="handleOfficeSeal">发起签章</el-button> 
+                        <el-button size="small" @click="handleOfficeSeal"><i class="el-icon-coordinate f14 mr-4"></i>发起签章</el-button> 
-                        <el-button size="small" @click="handleOfficeDelivery">文书送达</el-button> 
+                        <el-button size="small" @click="handleOfficeDelivery"><i class="el-icon-mobile-phone f14 mr-4"></i>文书送达</el-button> 
                         <!-- <el-button size="small" @click="handleCaseAllocation">案件下载</el-button> -->
                     </div>
                 </div>

src/pages/mediation-page/components/cassWrit.vue

@@ -78,7 +78,7 @@
         <!-- signStatus  0 未发起  1签字中 2签字完成  3签字失败  -->
         <a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 0" @click="handleFileGenerate(item)"><i class="el-icon-document"></i>生成文书</a>
         <a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 1 || item.documentStaus.code == 3" @click="handleFileAgain(item)"><i class="el-icon-document"></i>重新生成文书</a>
-        <a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 2" @click="handleDelete(item)"><i class="el-icon-delete"></i>删除</a>
+        <a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 2 || item.documentStaus.code == 3" @click="handleDelete(item)"><i class="el-icon-delete"></i>删除</a>
         <a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 2" @click="handlePreview(item)"><i class="el-icon-view"></i>预览</a>
         <a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 0 || item.documentStaus.code == 1" @click="handleTemplateDownload(item)"><i class="el-icon-download"></i>下载模板</a>
         <a class="mr-16 cursor-pointer" v-else @click="handleDownload(item)"><i class="el-icon-download"></i>下载文件</a>

src/pages/mediation-page/components/singleofficeWritPopover.vue

@@ -57,6 +57,11 @@ import api from "@/services/caseManagement";
                 type: String,
                 default: () => {},
             },
+            singleofficevisible: {
+                type: Boolean,
+                default: () => {return false},
+            },
+            
         },
         data() {
             return {
@@ -70,8 +75,18 @@ import api from "@/services/caseManagement";
 
             };
         },
+        watch: {
+            singleofficevisible: {
+                deep: true,
+                handler: function (val) {
+                    if (this.singleofficevisible){
+                        this.getWritCaseList()
+                    }
+                }
+            }
+        },
         mounted () {
-            this.getWritCaseList()
+            // this.getWritCaseList()
         },
         methods: {
             // 列表数据

src/pages/payment-receipt/index.vue

@@ -83,7 +83,7 @@
                                     <el-input v-model.trim="queryParam.respondentIdcard"
                                               clearable placeholder="请输入被申请人证件号"
                                               @keydown.enter.native="handleSearch"
-                                              maxlength="11"
+                                              maxlength="18"
                                               >
                                     </el-input>
                                 </div>

src/pages/workbench/index.vue

@@ -159,10 +159,10 @@
                                     <span>视频调解追踪</span><span><a>{{traceData.videoAppointmentTrackingCount.failed}}</a>/<a>{{traceData.videoAppointmentTrackingCount.total}}</a></span>
                                 </div>
                                 <div class="flex-row justify-content-between cursor-pointer" @click="eventTraDialog={traceType:3,title:'文书生成追踪'}">
-                                    <span>文书生成追踪</span><span><a>{{traceData.videoAppointmentTrackingCount.failed}}</a>/<a>{{traceData.videoAppointmentTrackingCount.total}}</a></span>
+                                    <span>文书生成追踪</span><span><a>{{traceData.documentGenerationTrackingCount.failed}}</a>/<a>{{traceData.documentGenerationTrackingCount.total}}</a></span>
                                 </div>
                                 <div class="flex-row justify-content-between cursor-pointer" @click="eventTraDialog={traceType:4,title:'文书签字追踪'}">
-                                    <span>文书签字追踪</span><span><a>{{traceData.videoAppointmentTrackingCount.failed}}</a>/<a>{{traceData.videoAppointmentTrackingCount.total}}</a></span>
+                                    <span>文书签字追踪</span><span><a>{{traceData.documentSignatureTrackingCount.failed}}</a>/<a>{{traceData.documentSignatureTrackingCount.total}}</a></span>
                                 </div>
                                 <div class="flex-row justify-content-between cursor-pointer" @click="eventTraDialog={traceType:5,title:'文书签章追踪'}">
                                     <span>文书签章追踪</span><span><a>{{traceData.electronicSealTrackingCount.failed}}</a>/<a>{{traceData.electronicSealTrackingCount.total}}</a></span>