diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue
index ba64d8e..ca14a87 100644
--- a/src/layout/components/ivr/ivrBar.vue
+++ b/src/layout/components/ivr/ivrBar.vue
@@ -7,10 +7,9 @@
     <ivr-btn :show="true" :disabled="btnStatus.btnDialIn" icon="hujiao" @click="dialIn">内呼</ivr-btn>
     <ivr-btn :show="true" :disabled="btnStatus.btnDialOut" icon="duiwaihujiao" @click="dialOut">外呼</ivr-btn>
     <ivr-btn :disabled="btnStatus.btnHangUp" icon="guaji" @click="hangup">挂机</ivr-btn>
-    <ivr-btn :disabled="btnStatus.btnHangUp" icon="hy" @click="hangup">会议</ivr-btn>
+    <ivr-btn :disabled="btnStatus.btnMeeting" icon="hy" @click="meeting">会议</ivr-btn>
     <ivr-btn :show="!btnStatus.btnIdle" :disabled="btnStatus.btnIdle" icon="xiaoxiu" @click="onidle">退出示忙</ivr-btn>
     <ivr-btn :show="btnStatus.btnIdle" :disabled="btnStatus.btnBusy" icon="shimang" @click="onbusy">示忙</ivr-btn>
-
     <!--<el-button v-show="!btnStatus.btnLogin" :disabled="btnStatus.btnLogin" @click="login">-->
     <!--<svg-icon icon-class="qianru" class="ivr-icon"/>-->
     <!--<div>签入</div>-->
@@ -53,6 +52,7 @@
     </div>
     <!--软键盘-->
     <keyboard ref="keyboard" @call="dial"/>
+    <choose-seats ref="chooseseats" :seat-list="seatsList" @call="dial"/>
     <!--外呼状态栏-->
     <el-dialog
       :title="statusText"
@@ -82,9 +82,10 @@
 import IvrBtn from './ivrBtn'
 import CreateCase from '@/views/caseManage/createCase'
 import { getToday } from '@/utils/dateutils'
+import ChooseSeats from './chooseSeats'
 export default {
   name: 'IvrBar',
-  components: { CreateCase, IvrBtn, Keyboard },
+  components: { ChooseSeats, CreateCase, IvrBtn, Keyboard },
   data() {
     return {
       debug: true, // 是否开启debug模式
@@ -125,7 +126,7 @@
         btnDialIn: true, // 内呼
         btnAgentList: true,
         btnBusy: true, // 示忙
-        btnIdle: false, // 示闲
+        btnIdle: true, // 示闲
         btnMeeting: true, // 会议
         btnPickUp: true,
         btnExtenPickUp: true,
@@ -304,11 +305,23 @@
     // 内呼
     dialIn() {
       if (this.judgeStatus()) {
-        this.$refs.keyboard.initDialog('in')
+        this.getExtentionList()
+        this.$refs.chooseseats.initDialog('in')
       }
     },
+    // 获取坐席列表
+    getExtentionList() {
+      const params = {
+        type: 'agent'
+      }
+      const strSend = this.createCommand('getExtensionList', params)
+      this.webSocket.send(strSend)
+    },
     // 拨号
     dial(type, tel) {
+      if (type === 'meeting') {
+        this.goMeeting(tel)
+      }
       if (type === 'out') {
         tel = '9' + tel
       }
@@ -345,15 +358,17 @@
     },
     // 挂机
     hangup() {
-      if (this.judgeStatus()) {
-        const strSend = this.createCommand('hangup')
-        this.webSocket.send(strSend)
+      if (this.judgeStatus()) { // 判断坐席状态
+        if (this.judgeCallStatus()) { // 判断通话状态
+          const strSend = this.createCommand('hangup')
+          this.webSocket.send(strSend)
+        }
       }
     },
     // 保持
     hold() {
-      if (this.judgeStatus()) { // 判断坐席状态，判断通话状态
-        if (this.judgeCallStatus()) {
+      if (this.judgeStatus()) { // 判断坐席状态
+        if (this.judgeCallStatus()) { // 判断通话状态
           const strSend = this.createCommand('hold')
           this.webSocket.send(strSend)
         }
@@ -366,16 +381,6 @@
         this.webSocket.send(strSend)
       }
     },
-    // 三方通话
-    threeWay() {
-      if (this.judgeStatus()) {
-        const sendObj = {
-          dialString: this.threeWayPhone
-        }
-        const strSend = this.createCommand('threeWay', sendObj)
-        this.webSocket.send(strSend)
-      }
-    },
     // 处理接通来电事宜
     incommingAnswerd(object) {
       this.notify.close() // 关闭来电提醒
@@ -414,6 +419,18 @@
     quitWorkState() {
       // TODO:通知后台退出工作态
     },
+    // 点击会议，打开会议弹窗
+    meeting() {
+      this.$refs.chooseseats.initDialog('meeting')
+    },
+    // 开启三方通话
+    goMeeting(tel) {
+      const params = {
+        dialString: tel
+      }
+      const strSend = this.createCommand('threeWay', params)
+      this.webSocket.send(strSend)
+    },
     // 初始化
     initSapoOcx() {
       const { ip, port } = this
@@ -486,19 +503,24 @@
               this.statusDetailText = '通话结束'
               this.statusShow = false
               // 结束计时器
-              clearInterval(this.timeInterval)
-              this.timeInterval = null
-              this.time = 0
+              if (this.timeInterval) {
+                this.$message.info('通话结束')
+                clearInterval(this.timeInterval)
+                this.timeInterval = null
+                this.time = 0
+              }
               // TODO:向后台添加通话记录
             }
-          } else if (object.call === '外呼通话') {
+          } else if (object.call === '外呼通话' || object.call === '呼入通话' || object.call === '自动外呼接入') {
             this.call = '通话中'
             this.isInCall = true
             this.statusDetailText = object.call
             // 开始通话后3s弹窗消失
-            setTimeout(function() {
-              that.statusShow = false
-            }, 3000)
+            if (this.statusShow) {
+              setTimeout(function() {
+                that.statusShow = false
+              }, 3000)
+            }
             this.time = 0
             this.timeInterval = setInterval(function() {
               that.time += 1
@@ -737,6 +759,7 @@
   .state-show{
     display: inline-block;
     width:180px;
+    margin-left: 20px;
     border:1px solid #409EFF;
     color:#ffffff;
     font-size:12px;