diff --git a/src/components/VoiceCallDialog.vue b/src/components/VoiceCallDialog.vue index 73abe1f..7de527d 100644 --- a/src/components/VoiceCallDialog.vue +++ b/src/components/VoiceCallDialog.vue @@ -13,7 +13,7 @@
-
{{ acceptDialog.phone }}
+
{{ incomingCallPhone }}
@@ -66,7 +66,9 @@
-
{{item.contact}}
+
+ {{indexS === 0 ?'':','}}{{itemS.name}} +
关联并进入案件
@@ -97,9 +99,9 @@
-
{{ acceptDialog.phone }}
-
-
+
{{ incomingCallPhone }}
+
+
{{ zoomActive ? '缩小' : '放大' }} @@ -125,6 +127,7 @@ export default { return { zoomActive: true,// 布局状态 + incomingCallPhone: '', answerSts: false,// 接听状态 queryParam: { phone: '', @@ -142,6 +145,7 @@ export default { initLoad() { let phoneNumber = this.acceptDialog.phone; phoneNumber = phoneNumber.slice(4); + this.incomingCallPhone = phoneNumber; this.queryParam.phone = phoneNumber; this.getCaseList(); }, @@ -159,7 +163,7 @@ export default { // 呼入接听 async handleAccept() { try { - console.log({ sessionId: this.acceptDialog.sessionId }, '---主动接听') + // console.log({ sessionId: this.acceptDialog.sessionId }, '---主动接听') await window.tccc.Call.accept({ sessionId: this.acceptDialog.sessionId }) this.answerSts = true; } catch (error) { @@ -169,7 +173,7 @@ export default { // 挂断 async handleHungUp() { try { - console.log({ sessionId: this.acceptDialog.sessionId }, '---主动挂断') + // console.log({ sessionId: this.acceptDialog.sessionId }, '---主动挂断') await window.tccc.Call.hungUp({ sessionId: this.acceptDialog.sessionId }) this.$emit('update:acceptDialog', null) } catch (error) { @@ -191,8 +195,9 @@ export default { // 关联案件-详情 async handleRelevance(item) { try { - voiceCall.caseMatch({caseId: item.caseId, sessionId: this.acceptDialog.sessionId}).then(res => { - this.$router.push(`/mediation-page?sourcePage=sourcePage&caseId=${item.caseId}`); + voiceCall.caseMatch({caseId: item.id, callingSessionId: this.acceptDialog.sessionId}).then(res => { + // console.log(res,'---关联案件') + this.$router.push(`/mediation-page?sourcePage=sourcePage&caseId=${item.id}`); }) } catch (error) { console.error(`${error}`) diff --git a/src/pages/case-management/detail/index.vue b/src/pages/case-management/detail/index.vue index c7258b3..debac37 100644 --- a/src/pages/case-management/detail/index.vue +++ b/src/pages/case-management/detail/index.vue @@ -381,19 +381,9 @@
- + -

王小虎 提交于 2018/4/12 20:46

-
-
- - -

王小虎 提交于 2018/4/3 20:46

-
-
- - -

王小虎 提交于 2018/4/2 20:46

+

{{ item.createAt | formaDate("hh:mm:ss") }} {{item.processContent}}

@@ -481,6 +471,7 @@ export default { // 文书列表 OfficeList:[], communicationRecord: [], + communicationLogRecord:[] } }, computed: { @@ -497,6 +488,7 @@ export default { this.caseId = this.$route.query.caseId; this.getCaseInfoById();//获取详情 this.getmediate_record() + this.getCaseLogsList() } }, methods: { @@ -671,6 +663,14 @@ export default { } }) }, + // 获取调解日志 + getCaseLogsList() { + api.mediate_record_log({id:this.caseId}).then(res => { + if (!res.code) { + this.communicationLogRecord = res + } + }) + }, } } diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index cf76e6d..1150ad9 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -98,7 +98,7 @@ export default { codeBtnDisabled: false, ruleForm: { telephone: '', - account: '18381082759', + account: '17608289327', password: 'trydo@123456', smsCode: '', }, diff --git a/src/pages/mediation-page/components/SidebarTool.vue b/src/pages/mediation-page/components/SidebarTool.vue index 51f5f96..0012718 100644 --- a/src/pages/mediation-page/components/SidebarTool.vue +++ b/src/pages/mediation-page/components/SidebarTool.vue @@ -174,15 +174,9 @@
调解日志
- + -
09:36 刘二向被申请人李四发送了短信。发送状态:发送中;短信类型:还款计划通知
-
09:33 刘二向被申请人李四发送了短信。发送状态:发送中;短信类型:调解通知
-
-
- - -
09:27 刘二向被申请人李四发送了短信。发送状态:发送中;短信类型:还款计划通知
+
{{ item.createAt | formaDate("hh:mm:ss") }} {{item.processContent}}
@@ -319,6 +313,7 @@ export default { mediatetraceRecord:[], communicationRecord: [], communicationvideoRecord:[], + communicationLogRecord:[], smsRecord:[], WritRecord:[], } @@ -356,6 +351,10 @@ export default { { this.getWritCaseList() } + if(this.rightActive == 6) + { + this.getCaseLogsList() + } }, // 获取触达记录 getmediatetrace_record(){ @@ -430,6 +429,14 @@ export default { } }) }, + // 获取调解日志 + getCaseLogsList() { + api.mediate_record_log({id:this.caseId}).then(res => { + if (!res.code) { + this.communicationLogRecord = res + } + }) + }, } } diff --git a/src/pages/mediation-page/components/VideoReservationDialog.vue b/src/pages/mediation-page/components/VideoReservationDialog.vue index cd175e8..a63fd1d 100644 --- a/src/pages/mediation-page/components/VideoReservationDialog.vue +++ b/src/pages/mediation-page/components/VideoReservationDialog.vue @@ -264,7 +264,7 @@ export default { if (valid) { const resultArr = this.litigantsOptions .filter(item => this.repaymentObj.litigants.includes(item.identity)) - .map(({name, phone, identity}) => ({name, phone, identity})); + .map(({id, name, phone, identity}) => ({id, name, phone, identity})); this.repaymentObj.caseId = this.eventDialog.caseId; // console.log(resultArr, '---resultArr' , this.repaymentObj) let videotitle = '' diff --git a/src/services/caseManagement.js b/src/services/caseManagement.js index e9ee009..9ea3c08 100644 --- a/src/services/caseManagement.js +++ b/src/services/caseManagement.js @@ -287,6 +287,10 @@ const caseManagementApi = { traceRecord_list: data => { return service.service.post(`${apiAdmin}api/trace/traceRecord/list`, data, {hideLoading:true}) }, + // 案件日志记录 + mediate_record_log: data => { + return service.service.post(`${apiAdmin}cases/process/log`, data, {hideLoading:true}) + }, // 共债案件查询