Merge branch 'main' into 'stg'

Main

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

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

@@ -335,7 +335,7 @@
             <el-table :data="fileList" :height="300">
               <el-table-column type="index" label="序号" width="55"></el-table-column>
               <el-table-column prop="materialType" label="材料类型" show-overflow-tooltip></el-table-column>
-              <!-- <el-table-column prop="name" label="文件名称" show-overflow-tooltip></el-table-column> -->
+              <el-table-column prop="name" label="文件名称" show-overflow-tooltip></el-table-column>
               <el-table-column prop="createBy" label="上传人" show-overflow-tooltip></el-table-column>
               <el-table-column label="上传时间" show-overflow-tooltip>
                 <template slot-scope="scope">

src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue

@@ -57,7 +57,7 @@
                     <el-table-column prop="signName" label="签字当事人" show-overflow-tooltip ></el-table-column>
                     <el-table-column prop="signed" label="已签字当事人" show-overflow-tooltip ></el-table-column>
                     <el-table-column prop="unsign" label="未签字当事人" show-overflow-tooltip ></el-table-column>
-                    <el-table-column prop="updateByName" label="发起人" show-overflow-tooltip ></el-table-column>
+                    <el-table-column prop="createByName" label="发起人" show-overflow-tooltip ></el-table-column>
                     <el-table-column label="状态" show-overflow-tooltip >
                         <template slot-scope="scope">
                             <span v-if="scope.row.status.code != 3 && scope.row.status.code != 4 && scope.row.status.code != 5">{{ scope.row.signStatus.desc }}</span>

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

@@ -481,16 +481,15 @@ export default {
     if (this.videoCallInterval) {
       clearInterval(this.videoCallInterval)
     }
+    if(this.calling){ 
+      window.tccc.Call.hungUp({sessionId: this.sessionId})
+    }
     window.removeEventListener('beforeunload', this.handleBeforeUnload);
-
   },
   methods: {
     handleBeforeUnload(event) {
-      console.log(this.sessionId,'this.sessionId')
       // 刷新及离开挂断电话
-      if(this.sessionId !='')
+      if(this.calling){ 
-      { 
-        console.log('刷新及离开挂断电话')
         window.tccc.Call.hungUp({sessionId: this.sessionId})
       }
     },
@@ -600,17 +599,22 @@ export default {
       //   }
       // })
     },
-    handleBack() {
+    async handleBack() {
-      if(this.timerInterval) { //如果定时器还在运行 或者直接关闭，不用判断
+      try {
-        clearInterval(this.timerInterval); //关闭
+        if(this.timerInterval) { //如果定时器还在运行 或者直接关闭，不用判断
-      }
+          clearInterval(this.timerInterval); //关闭
-      if (this.videoCallInterval) {
+        }
-        clearInterval(this.videoCallInterval)
+        if (this.videoCallInterval) {
-      }
+          clearInterval(this.videoCallInterval)
-      this.handleBeforeUnload()
+        }
-      setTimeout(() => {
+        if(this.calling){ 
-        this.$router.push('/mediation-management')
+          let res = await window.tccc.Call.hungUp({sessionId: this.sessionId})
-      }, 500);
+          console.log('挂断电话', res)
+          this.$router.push('/mediation-management')
+        } else {
+          this.$router.push('/mediation-management')
+        }
+      } catch (err) {}
       // this.$route.query.sourcePage == 'mediationManagement'
       // this.$router.push('/mediation-management')
     },
@@ -725,7 +729,7 @@ export default {
         for (let i=0; i < this.queueList.length; i++) {
           if (this.queueList[i].status.code === 1) {
             this.index = i
-            this.startOutboundCall({phone:this.queueList[i].phone,contactId:this.queueList[i].contactId})
+            this.startOutboundCall({phone:this.queueList[i].phone,contactId:this.queueList[i].contactId,queueName:this.queueList[i].queueName})
             return
           }
         }
@@ -751,21 +755,21 @@ export default {
             
             this.calling = true
             if (res.status === 'success') {
-              this.callingSuccess()
+              this.callingSuccess(params.queueName)
               this.startTimer()
             }
         } catch (err) {
-            this.$message.error('呼叫失败,请确定是否已分配坐席！')
+            this.$message.error('呼叫失败,' + err.msg)
-            console.log('呼叫失败',err.message)
+            console.log('呼叫失败',err.msg)
             this.calling = false
             this.callingFail()
             // 呼叫失败
         } finally {}
     },
     // 呼叫成功
-    async callingSuccess () {
+    async callingSuccess (queueName) {
       try { 
-        let res = await api.callingSuccess({caseId: this.caseId,contactId: this.contactId,callingSessionId:this.sessionId})
+        let res = await api.callingSuccess({caseId: this.caseId,contactId: this.contactId,callingSessionId:this.sessionId,queueName:queueName})
         console.log('呼叫成功请求接口==callingSuccess：', res)
         // this.getmediate_record()
         this.$refs.layoutContent.getmediate_record();