Merge branch 'main' of http://139.155.124.81:8088/cloud-mediate/mediate-manage-web

src/components/VoiceCallDialog.vue

@@ -13,7 +13,7 @@
         </div>
       </div>
       <div class="pb-32 big-middle">
-        <div class="pb-32 f24 f-weight600 text-center">{{ acceptDialog.phone }}</div>
+        <div class="pb-32 f24 f-weight600 text-center">{{ incomingCallPhone }}</div>
         <div class="flex-row justify-content-center">
           <div class="big-middle-up mr-16 text-center cursor-pointer" v-if="!answerSts" @click="handleAccept">
             <svg-icon icon-class="up-telephone" className="tabs-svg" />
@@ -66,7 +66,9 @@
           <el-scrollbar style="height: 224px;">
             <div class="p-8 mt-8 bottom-case-list border-radius-8" v-for="(item, index) in tableData" :key="index">
               <div class="flex-row justify-content-between align-items-center bor-bottom-E5E6EB pr-16">
-                <div>{{item.contact}}</div>
+                <div v-for="(itemS,indexS) in item.debtorEntityList.filter(itemX => itemX.role == 'DEBTOR' && itemX.type == '本人')" :key="indexS">
+                  {{indexS === 0 ?'':','}}{{itemS.name}}
+                </div>
                 <el-button type="text" @click="handleRelevance(item)">关联并进入案件</el-button>
               </div>
               <div class="flex-row p-8">
@@ -97,9 +99,9 @@
     </div>
     <!--  小  -->
     <div v-else class="small-layout flex-row justify-content-between align-items-center pl-32 pr-32">
-      <div class="f24 f-weight600 mr-16">{{ acceptDialog.phone }}</div>
+      <div class="f24 f-weight600 mr-16">{{ incomingCallPhone }}</div>
-      <div class="mr-16" v-if="!answerSts" @click="handleAccept"><svg-icon icon-class="up-telephone" className="tabs-svg-phone" /></div>
+      <div class="mr-16 cursor-pointer" v-if="!answerSts" @click="handleAccept"><svg-icon icon-class="up-telephone" className="tabs-svg-phone" /></div>
-      <div class="mr-16" @click="handleHungUp"><svg-icon icon-class="hang-telephone" className="tabs-svg-phone" /></div>
+      <div class="mr-16 cursor-pointer" @click="handleHungUp"><svg-icon icon-class="hang-telephone" className="tabs-svg-phone" /></div>
       <div class="big-header-btn bg-color-light flex-row align-items-center border-radius-4 cursor-pointer"
            @click="toggleZoom">
         <span class="mr-4">{{ zoomActive ? '缩小' : '放大' }}</span>
@@ -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 => {
+        voiceCall.caseMatch({caseId: item.id, callingSessionId: this.acceptDialog.sessionId}).then(res => {
-          this.$router.push(`/mediation-page?sourcePage=sourcePage&caseId=${item.caseId}`);
+          // console.log(res,'---关联案件')
+          this.$router.push(`/mediation-page?sourcePage=sourcePage&caseId=${item.id}`);
         })
       } catch (error) {
         console.error(`${error}`)

src/pages/case-management/detail/index.vue

@@ -381,19 +381,9 @@
     <div v-if="navactive == 3 " class="layout-tabs-content-box flex-row padding-0  f14">
       <div class="pt-8 border-b-solid-lighter-1 background-color-fff border-radius-4 p-32 width100">
         <el-timeline>
-          <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-timeline-item v-for="(item,index) in communicationLogRecord" :key="index" :timestamp="item.processDate" placement="top">
             <el-card>
-              <p>王小虎 提交于 2018/4/12 20:46</p>
+              <p v-for="(item,index) in item.processList" :key="index">{{ item.createAt | formaDate("hh:mm:ss") }} {{item.processContent}}</p>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="2018/4/3" placement="top">
-            <el-card>
-              <p>王小虎 提交于 2018/4/3 20:46</p>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="2018/4/2" placement="top">
-            <el-card>
-              <p>王小虎 提交于 2018/4/2 20:46</p>
             </el-card>
           </el-timeline-item>
         </el-timeline>
@@ -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
+        }
+      })
+    },
   }
 
 }

src/pages/login/index.vue

@@ -98,7 +98,7 @@ export default {
       codeBtnDisabled: false,
       ruleForm: {
         telephone: '',
-        account: '18381082759',
+        account: '17608289327',
         password: 'trydo@123456',
         smsCode: '',
       },

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

@@ -174,15 +174,9 @@
         <div class="tab-content-title f16 f-weight600 pb-8">调解日志</div>
         <el-scrollbar :style="'height:'+`${contentHeight}`+'px'">
           <el-timeline class="padding-2">
-            <el-timeline-item timestamp="2024-12-09" placement="top" type="primary">
+            <el-timeline-item v-for="(item,index) in communicationLogRecord" :key="index" :timestamp="item.processDate" placement="top" type="primary">
               <el-card shadow="never">
-                <div class="mb-8">09:36 刘二向被申请人李四发送了短信。发送状态:发送中;短信类型:还款计划通知</div>
+                <div v-for="(item,index) in item.processList" :key="index" class="mb-8">{{ item.createAt | formaDate("hh:mm:ss") }} {{item.processContent}}</div>
-                <div class="mb-8">09:33 刘二向被申请人李四发送了短信。发送状态:发送中;短信类型:调解通知</div>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2024-12-08" placement="top" type="primary">
-              <el-card shadow="never">
-                <div>09:27 刘二向被申请人李四发送了短信。发送状态:发送中;短信类型:还款计划通知</div>
               </el-card>
             </el-timeline-item>
           </el-timeline>
@@ -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
+        }
+      })
+    },
 
   }
 }

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 = ''

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})
+    },
 
 
     // 共债案件查询