Merge branch 'main' into 'stg'

修改bug

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

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) {

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+"?", "提示", {