From efd4ea4bcaa7339139ba7ac844dfac0664c52d90 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 18:32:13 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/event-tracing/components/CallDialog.vue | 4 ++-- .../event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue | 2 +- src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue | 2 +- src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue | 2 +- src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue | 2 +- src/pages/mediation-page/components/missedCallPopover.vue | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/event-tracing/components/CallDialog.vue b/src/pages/event-tracing/components/CallDialog.vue index e65f6c4..b1602d3 100644 --- a/src/pages/event-tracing/components/CallDialog.vue +++ b/src/pages/event-tracing/components/CallDialog.vue @@ -75,8 +75,8 @@ diff --git a/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue index 27002aa..3bf83de 100644 --- a/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue +++ b/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue @@ -3,7 +3,7 @@
筛选
- 返回 + 返回
diff --git a/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue index 508854b..bf73643 100644 --- a/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue +++ b/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue @@ -3,7 +3,7 @@
筛选
- 返回 + 返回
diff --git a/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue index 410c78f..ac87a79 100644 --- a/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue +++ b/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue @@ -3,7 +3,7 @@
筛选
- 返回 + 返回
diff --git a/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue index 734ec50..6806442 100644 --- a/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue +++ b/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue @@ -3,7 +3,7 @@
筛选
- 返回 + 返回
diff --git a/src/pages/mediation-page/components/missedCallPopover.vue b/src/pages/mediation-page/components/missedCallPopover.vue index 72c9d33..dff4396 100644 --- a/src/pages/mediation-page/components/missedCallPopover.vue +++ b/src/pages/mediation-page/components/missedCallPopover.vue @@ -3,7 +3,7 @@
-
{{item.contact}}
+
{{item.phone}}
来电时间:{{ formatDate(item.createAt, 'YYYY-MM-DD HH:mm:ss') }}
查看相关案件 From b7c322a8e65d3c4d52a57cfb2e9f7d484b668b01 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 18:57:37 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/mediation-page/components/MediationRoom.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index 3fee3bb..8ceb5ab 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -486,9 +486,11 @@ export default { }, methods: { handleBeforeUnload(event) { + console.log(this.sessionId,'this.sessionId') // 刷新及离开挂断电话 if(this.sessionId !='') { + console.log('刷新及离开挂断电话') window.tccc.Call.hungUp({sessionId: this.sessionId}) } }, @@ -599,8 +601,12 @@ export default { // }) }, handleBack() { + this.handleBeforeUnload() + setTimeout(() => { + this.$router.push('/mediation-management') + }, 1000); // this.$route.query.sourcePage == 'mediationManagement' - this.$router.push('/mediation-management') + // this.$router.push('/mediation-management') }, // 获取调解记录 getmediate_record() { From bc7f25a718e3eb50a11d1b623e3e7da171fc5039 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 19:11:57 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/mediation-page/components/MediationRoom.vue | 2 +- src/pages/mediation-page/components/singleofficeWritPopover.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index 8ceb5ab..b780c1b 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -604,7 +604,7 @@ export default { this.handleBeforeUnload() setTimeout(() => { this.$router.push('/mediation-management') - }, 1000); + }, 500); // this.$route.query.sourcePage == 'mediationManagement' // this.$router.push('/mediation-management') }, diff --git a/src/pages/mediation-page/components/singleofficeWritPopover.vue b/src/pages/mediation-page/components/singleofficeWritPopover.vue index 2b2adf4..5307f26 100644 --- a/src/pages/mediation-page/components/singleofficeWritPopover.vue +++ b/src/pages/mediation-page/components/singleofficeWritPopover.vue @@ -14,7 +14,7 @@
- {{ item.documentType.desc }} + {{ item.documentType.desc }}
From 57ab5dd959aadad8970bd7ab49c0f9be09eb5e00 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 19:20:42 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mediation-page/components/MediationRoom.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index b780c1b..8f34323 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -601,6 +601,12 @@ export default { // }) }, handleBack() { + if(this.timerInterval) { //如果定时器还在运行 或者直接关闭，不用判断 + clearInterval(this.timerInterval); //关闭 + } + if (this.videoCallInterval) { + clearInterval(this.videoCallInterval) + } this.handleBeforeUnload() setTimeout(() => { this.$router.push('/mediation-management') @@ -830,9 +836,9 @@ export default { this.isMute = true this.$message.success('已静音') } catch (err) { - // console.log(err,'errerrerrerr') - // 静音失败 - this.$message.error('静音失败') + console.log(err,'静音失败') + // 静音失败 + this.$message.error('静音失败') } }, // 取消静音 From 3a9ee22ef1f483d6516b4297fd7f851081552b50 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 19:35:01 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E7=AD=BE=E5=AD=97=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/mediation-page/components/cassWrit.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/mediation-page/components/cassWrit.vue b/src/pages/mediation-page/components/cassWrit.vue index f1943ae..4bb34e2 100644 --- a/src/pages/mediation-page/components/cassWrit.vue +++ b/src/pages/mediation-page/components/cassWrit.vue @@ -58,11 +58,15 @@ {{item.handleBy}}  {{ $util.formatDate(item.handleTime, 'YYYY-MM-DD HH:mm:ss')}}
签字
-
+
{{item1.signName}} {{item1.signName}}
+
+ {{item1.signName}} + {{item1.signName}} +
diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index 8f34323..f91c20a 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -753,7 +753,7 @@ export default { this.startTimer() } } catch (err) { - this.$message.error('呼叫失败' + err.message) + this.$message.error('呼叫失败,请确定是否已分配坐席！') console.log('呼叫失败',err.message) this.calling = false this.callingFail() diff --git a/src/pages/mediation-page/components/singleofficeWritPopover.vue b/src/pages/mediation-page/components/singleofficeWritPopover.vue index 5307f26..c9fdf28 100644 --- a/src/pages/mediation-page/components/singleofficeWritPopover.vue +++ b/src/pages/mediation-page/components/singleofficeWritPopover.vue @@ -19,7 +19,7 @@
- +
From 4d58e2cfd7575213e8e4b58d517515eab5250601 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Thu, 27 Feb 2025 10:32:54 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=B0=83=E8=A7=A3=E9=9A=90=E8=97=8Fload?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/caseManagement.js | 4 ++-- src/services/systemManage.js | 2 +- src/services/voiceCall.js | 2 +- src/utils/clickThrottle.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/services/caseManagement.js b/src/services/caseManagement.js index 2b39fc5..245d28b 100644 --- a/src/services/caseManagement.js +++ b/src/services/caseManagement.js @@ -328,11 +328,11 @@ const caseManagementApi = { }, // 今日呼叫统计 callingTodayCount: data => { - return service.service.post(`${apiAdmin}api/trace/calling/todayCount`, data) + return service.service.post(`${apiAdmin}api/trace/calling/todayCount`, data, {hideLoading:true}) }, // 当前调解员案件列表 callingCaseList: data => { - return service.service.post(`${apiAdmin}api/trace/calling/caseList`, data) + return service.service.post(`${apiAdmin}api/trace/calling/caseList`, data, {hideLoading:true}) }, diff --git a/src/services/systemManage.js b/src/services/systemManage.js index 3d9eafa..fbd4a17 100644 --- a/src/services/systemManage.js +++ b/src/services/systemManage.js @@ -6,7 +6,7 @@ const systemLogApi = { //========================start::用户管理====================================== // 用户管理 getUserList: data => { - return service.service.post(`${apiAdmin}system/user/getUserList`, data) + return service.service.post(`${apiAdmin}system/user/getUserList`, data, {hideLoading:true}) }, // 删除用户管理 deleteUserById: data => { diff --git a/src/services/voiceCall.js b/src/services/voiceCall.js index 3538c92..624ab61 100644 --- a/src/services/voiceCall.js +++ b/src/services/voiceCall.js @@ -19,7 +19,7 @@ const api = { }, // 呼叫未接列表 notAnswerList: data => { - return service.service.post(`${apiAdmin}call/notAnswerList`, data) + return service.service.post(`${apiAdmin}call/notAnswerList`, data,{hideLoading:true}) }, } export default api; diff --git a/src/utils/clickThrottle.js b/src/utils/clickThrottle.js index 467301d..c53ff42 100644 --- a/src/utils/clickThrottle.js +++ b/src/utils/clickThrottle.js @@ -2,7 +2,7 @@ /* 防止重复点击 */ let clickTimer = 0 -function clickThrottle(interval = 1500) { +function clickThrottle(interval = 500) { let now = +new Date(); // 获取当前时间的时间戳 let timer = clickTimer; // 记录触发事件的事件戳 From 4c3078a3a15d60b62fd8e7f05b26b9b255646efa Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Thu, 27 Feb 2025 11:51:58 +0800 Subject: [PATCH 08/12] =?UTF-8?q?UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/mediation-page/components/SidebarTool.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/mediation-page/components/SidebarTool.vue b/src/pages/mediation-page/components/SidebarTool.vue index bc886f1..1b105b7 100644 --- a/src/pages/mediation-page/components/SidebarTool.vue +++ b/src/pages/mediation-page/components/SidebarTool.vue @@ -50,7 +50,7 @@
-
通话{{itemrecord.linkedDuration}}秒
+
通话{{itemrecord.linkedDuration | secondsToMinutes}}
播放录音 {{index > 0 ? index : ''}} @@ -122,9 +122,8 @@
- + {{ itemperson.name}} - {{ itemrecord.linkedWay == 1 ? itemperson.phone :''}} {{itemperson.type}}
From cfa91784c04668b83a7aca33f9d3d3ea203a50cd Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Thu, 27 Feb 2025 15:18:54 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VoiceCallDialog.vue | 10 ++++++++-- src/pages/mediation-page/components/MediationRoom.vue | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/VoiceCallDialog.vue b/src/components/VoiceCallDialog.vue index bf4a6f2..20915ef 100644 --- a/src/components/VoiceCallDialog.vue +++ b/src/components/VoiceCallDialog.vue @@ -204,8 +204,14 @@ export default { // 关联案件-详情 async handleRelevance(item) { try { - voiceCall.caseMatch({caseId: item.id, callingSessionId: this.acceptDialog.sessionId, phone: this.incomingCallPhone}).then(res => { - // console.log(res,'---关联案件') + let mainCaseId = null + if(item.jointDebt == 1){ + mainCaseId = item.mainCaseId + } + else{ + mainCaseId = item.id + } + voiceCall.caseMatch({caseId: mainCaseId, callingSessionId: this.acceptDialog.sessionId, phone: this.incomingCallPhone}).then(res => { this.$router.push(`/mediation-page?sourcePage=sourcePage&caseId=${item.id}`); }) } catch (error) { diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index f91c20a..e4c50d0 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -627,8 +627,10 @@ export default { handleChangeMediation(resultStatus){ let data={ id:this.caseId, - mediateStatus:resultStatus + mediateStatus:resultStatus, + caseStatus:this.baseInfo.caseStatus } + let resultmsg = '成功' if(resultStatus == 4){resultmsg = '失败'} this.$confirm("请确定是否将案件标记为"+resultmsg+"?", "提示", { From 8189bda00ac0931fea3c175bd79fc9cff3bf847a Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Thu, 27 Feb 2025 16:10:07 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/filters/index.js | 2 +- src/pages/case-management/detail/index.vue | 30 +++++++++++-------- .../components/LayoutContentNew.vue | 2 ++ .../components/RepaymentCertificate.vue | 7 ++++- 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/filters/index.js b/src/filters/index.js index 3bca97a..c0ba307 100644 --- a/src/filters/index.js +++ b/src/filters/index.js @@ -139,7 +139,7 @@ let formaDate = (value, fmt) => { let secondsToMinutes = (value) => { - if(value == 0 || value == ''|| value == null){return ''} + if(value == 0 || value == ''|| value == null){return '0秒'} const minutes = Math.floor(value / 60); const seconds = value % 60; if(minutes > 0) diff --git a/src/pages/case-management/detail/index.vue b/src/pages/case-management/detail/index.vue index 38fecdf..37d8d1e 100644 --- a/src/pages/case-management/detail/index.vue +++ b/src/pages/case-management/detail/index.vue @@ -466,7 +466,7 @@ export default { H: '' }], caseId: '', - baseInfo: {}, + baseInfo: {debtorEntityList:[],casePkg:{}}, fileList: [], fileType: [{label: '身份证件', value: 1}, {label: '金融许可证', value: 2}, { label: '营业执照', @@ -510,8 +510,7 @@ export default { if (this.$route.query.caseId != undefined) { this.caseId = this.$route.query.caseId; this.getCaseInfoById();//获取详情 - this.getmediate_record() - this.getCaseLogsList() + } }, methods: { @@ -588,16 +587,18 @@ export default { } else { this.caseId = res.id.toString() } - } + this.getmediate_record() + this.getCaseLogsList() + + this.getCoobligation() + this.getFileCaseList() + this.getLitigantByCaseId() + this.getplanlist() + this.getProofList() + this.getWritCaseList() + } }) - this.getCoobligation() - this.getFileCaseList() - this.getLitigantByCaseId() - this.getplanlist() - this.getProofList() - this.getWritCaseList() - }, // 共债数据 @@ -667,7 +668,12 @@ export default { // 还款凭证 getProofList() { this.ProofList = [] - api.gettraceProof_list({caseId: this.caseId}).then(res => { + let data_json = {caseId: this.caseId} + if(this.baseInfo.jointDebt == 1){ + data_json ={mainCaseId: this.baseInfo.mainCaseId} + } + + api.gettraceProof_list(data_json).then(res => { if (!res.code) { res.forEach(item =>{ if(item.status.code == 2){ this.ProofList.push(item)} diff --git a/src/pages/mediation-page/components/LayoutContentNew.vue b/src/pages/mediation-page/components/LayoutContentNew.vue index 19ccbf0..afff877 100644 --- a/src/pages/mediation-page/components/LayoutContentNew.vue +++ b/src/pages/mediation-page/components/LayoutContentNew.vue @@ -457,6 +457,8 @@ export default { this.mediaterecordpm.caseId = this.caseId this.eventDialog.caseId = this.caseId + this.eventDialog.jointDebt = this.thisCaseInfo.jointDebt + this.eventDialog.mainCaseId = this.thisCaseInfo.mainCaseId this.getCaseInfoById();//获取详情 this.getAgentList() diff --git a/src/pages/mediation-page/components/RepaymentCertificate.vue b/src/pages/mediation-page/components/RepaymentCertificate.vue index 996231f..40ffe98 100644 --- a/src/pages/mediation-page/components/RepaymentCertificate.vue +++ b/src/pages/mediation-page/components/RepaymentCertificate.vue @@ -235,7 +235,12 @@ import api from "@/services/caseManagement"; }) }, getProofList(){ - api.gettraceProof_list({caseId:this.eventDialog.caseId}).then(async res => { + let data_json = {caseId: this.eventDialog.caseId} + if(this.eventDialog.jointDebt == 1){ + data_json ={mainCaseId: this.eventDialog.mainCaseId} + } + + api.gettraceProof_list(data_json).then(async res => { if(!res.code){ await this.getpreviewfull(res) } From 83bccf73ccad7ba502a76020fe7501278b35c4a7 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Thu, 27 Feb 2025 16:19:21 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/case-management/components/CalllogDialog.vue | 2 +- src/pages/case-management/detail/index.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/case-management/components/CalllogDialog.vue b/src/pages/case-management/components/CalllogDialog.vue index 3098a43..ca8c706 100644 --- a/src/pages/case-management/components/CalllogDialog.vue +++ b/src/pages/case-management/components/CalllogDialog.vue @@ -33,7 +33,7 @@ diff --git a/src/pages/case-management/detail/index.vue b/src/pages/case-management/detail/index.vue index 37d8d1e..7ed4270 100644 --- a/src/pages/case-management/detail/index.vue +++ b/src/pages/case-management/detail/index.vue @@ -335,7 +335,7 @@ - + - + From 1e27c8732bda48029929960f98585286e56532d2 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Thu, 27 Feb 2025 16:21:51 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/mediation-page/components/MediationRoom.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index e4c50d0..095782e 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -632,7 +632,7 @@ export default { } let resultmsg = '成功' - if(resultStatus == 4){resultmsg = '失败'} + if(resultStatus == 6){resultmsg = '失败'} this.$confirm("请确定是否将案件标记为"+resultmsg+"?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消",