From 60a02e762f9bb309545cd83ec47542bd3cba920c Mon Sep 17 00:00:00 2001
From: tangchengming <445785772@qq.com>
Date: Mon, 20 Jan 2025 14:32:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mediation-page/components/MediationRoom.vue     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue
index 2f155fc..61de903 100644
--- a/src/pages/mediation-page/components/MediationRoom.vue
+++ b/src/pages/mediation-page/components/MediationRoom.vue
@@ -6,7 +6,7 @@
         <div class="top-wrap-title flex-row justify-content-between"></div>
         <div class="top-wrap-btn-left flex-row justify-content-between">
           <div class="flex-row justify-content-between align-items-center mr-16">
-            <el-button class="bg-F2F3F5" icon="el-icon-arrow-left" circle></el-button>
+            <el-button class="bg-F2F3F5" icon="el-icon-arrow-left" circle :disabled="queue" ></el-button>
             <div class="ml-16 mr-16 flex-row justify-content-between align-items-center">
               <div class="mr-8 f16">{{ baseInfo.debtorEntityList.find(item => item.role == 'DEBTOR').name }}</div>
               <div class="mr-8">
@@ -16,7 +16,7 @@
               <div class="f16 color-165DFF"><i class="el-icon-success"></i></div>
             </div>
             
-            <el-button class="bg-F2F3F5" icon="el-icon-arrow-right" circle></el-button>
+            <el-button class="bg-F2F3F5" icon="el-icon-arrow-right" circle :disabled="queue"></el-button>
           </div>
 
           <el-popover
@@ -344,6 +344,7 @@ export default {
       elapsedTime: 0,
       timerInterval: null,
       isRunning: false,
+      contactId: '',
     };
   },
   computed: {
@@ -429,11 +430,11 @@ export default {
         if (!res.code) {
           this.baseInfo = res
           this.phoneNumber = res.debtorEntityList.find(item => item.role == 'DEBTOR').phone
+          this.contactId = res.debtorEntityList.find(item => item.role == 'DEBTOR').id
           if(res.jointDebt == 1){
             // 有共债 mainCaseId
             this.caseId = res.mainCaseId.toString()
-          }
-          else
+          } else
           {
             this.caseId = res.id.toString()
           }
@@ -574,7 +575,7 @@ export default {
     // 呼叫成功
     async callingSuccess () {
       try { 
-        let res = await api.callingSuccess({caseId: this.caseId})
+        let res = await api.callingSuccess({caseId: this.caseId,contactId: this.contactId})
         console.log('呼叫成功请求接口==callingSuccess：', res)
         this.getmediate_record()
         this.$refs.layoutContent.openRecordDialog(res.data);
@@ -583,7 +584,7 @@ export default {
     // 呼叫失败
     async callingFail () {
       try { 
-        let res = await api.callingSuccess({caseId: this.caseId})
+        let res = await api.callingSuccess({caseId: this.caseId,contactId: this.contactId})
       } catch (err) { }
     },
     // 挂断会话

From 666f7cc4b9502e09f19436ba949c3c4ac01e444a Mon Sep 17 00:00:00 2001
From: tangchengming <445785772@qq.com>
Date: Mon, 20 Jan 2025 14:36:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mediation-page/components/MediationRoom.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue
index 3c17a9b..d2a6df0 100644
--- a/src/pages/mediation-page/components/MediationRoom.vue
+++ b/src/pages/mediation-page/components/MediationRoom.vue
@@ -367,10 +367,7 @@ export default {
       elapsedTime: 0,
       timerInterval: null,
       isRunning: false,
-<<<<<<< HEAD
       contactId: '',
-=======
-
       // 未接来电
       missedCallVisible: false,
       missedCallData: {
@@ -379,7 +376,6 @@ export default {
       // 视频提醒
       videoReminderVisible: false,
       videoReminderData: {}
->>>>>>> 5d050e83e2826b0ae129388b597928682f1bcc9a
     };
   },
   computed: {