diff --git a/src/router/axios.js b/src/router/axios.js
index 47ff382..c97c66d 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -47,38 +47,28 @@ axios.interceptors.request.use(config => {
 
   if (config.method === 'get') {
     config.paramsSerializer = function (params) {
-      // console.log(params,'get')
-      // console.log(Object.assign(params,{orgType:localStorage.getItem('orgType')}))
       return qs.stringify(params, { arrayFormat: 'repeat' })
     }
   }
-  // console.log(config,'config')
   return config
 }, error => {
   return Promise.reject(error)
 })
-let idx=0
 // HTTPresponse拦截
 axios.interceptors.response.use(res => {
   NProgress.done()
   const status = Number(res.status) || 200
   const message = res.data.msg || errorCode[status] || errorCode['default']
-  if (status === 401 || status === 500) {
-    idx++
-    if(idx==1){
-      Message({
-        message: '当前登录状态异常，请重新登录~',
-        type: 'error'
-      })
-    }
+  if (status === 401) {
+    Message({
+      message: '当前登录状态异常，请重新登录~',
+      type: 'error'
+    })
     store.dispatch('LogOut').then(() => {
       router.push({ path: '/login' })
     })
     return
-  }else{
-    idx=0
   }
-  // console.log(idx);
   if (status !== 200 || res.data.code === 1) {
     Message({
       message: message,
diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue
index f9e91b8..5869145 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -239,7 +239,6 @@
         <div class="div-lab">
           <div class="label">销讲执行：</div>
           <el-select v-model="searchForm.fraction" class="div-inp" clearable filterable placeholder="请选择">
-              <el-option label="全部" value=""></el-option>
               <el-option label="30%及以下" :value="1"></el-option>
               <el-option label="31%～50%" :value="2"></el-option>
               <el-option label="51%～70%" :value="3"></el-option>
@@ -249,7 +248,6 @@
         <div class="div-lab">
           <div class="label">需求挖掘：</div>
           <el-select v-model="searchForm.wordFraction" class="div-inp" clearable filterable placeholder="请选择">
-              <el-option label="全部" value=""></el-option>
               <el-option label="30%及以下" :value="1"></el-option>
               <el-option label="31%～50%" :value="2"></el-option>
               <el-option label="51%～70%" :value="3"></el-option>
@@ -386,10 +384,10 @@ import { exportMethodPost } from "@/util/util";
 export default {
   data() {
     return {
+      show: false,
       questionList: [],//挖掘话术
       marketingInvalidList: [], // 无效接待原因列表
       xiaojianglist: [], //销讲业务
-      desc: '请等待录音合并之后再重新转写！',
       dialogVisible: false,
       projectList: [],
       languageList: [],
@@ -539,6 +537,7 @@ export default {
       rec_index_text: false, // 按钮权限
       rec_index_voice: false, // 按钮权限
       rec_index_downLoad: false, // 按钮权限
+      mergeFlag: false,//重新转写
     };
   },
   computed: {
@@ -563,7 +562,6 @@ export default {
       this.time = this.$route.query.date.split(",");
       this.searchForm.staDate = this.time[0];
       this.searchForm.endDate = this.time[1];
-      console.log("时间");
     }
 
     if (this.$route.query.validInvalid) {
@@ -618,7 +616,6 @@ export default {
       this.time = this.$route.query.date.split(",");
       this.searchForm.staDate = this.time[0];
       this.searchForm.endDate = this.time[1];
-      console.log("时间");
     }
 
     if (this.$route.query.validInvalid) {
@@ -640,11 +637,7 @@ export default {
       this.searchForm.projectId = this.$route.query.houseId;
     }
 
-    if (
-      this.$route.query.endDate &&
-      this.$route.query.staDate &&
-      this.time.length == 0
-    ) {
+    if (this.$route.query.endDate && this.$route.query.staDate && this.time.length == 0) {
       this.searchForm.dateType = null;
       this.time = [this.$route.query.staDate, this.$route.query.endDate];
     }
@@ -654,11 +647,11 @@ export default {
     this.rec_index_text = this.permissions["rec_index_text"];
     this.rec_index_voice = this.permissions["rec_index_voice"];
     this.rec_index_downLoad = this.permissions["rec_index_downLoad"];
+    this.mergeFlag = this.permissions["mergeFlag"];
   },
   mounted() {
     // 获取项目列表
     this.zkhousePage();
-    this.findQuestionList()
   },
 
   methods: {
@@ -668,19 +661,17 @@ export default {
           url: `/autoSR/zk/keywords/findQuestionList`,
           method: 'get',
           params: {
-              houseId: this.searchForm.projectId
+            houseId: this.searchForm.projectId
           }
         }).then(data => {
           if (data.code == 0) {
-              this.questionList = data.data;
-              this.questionList.length = 20
+              this.questionList = data.data||[];
           }
         })
       },
     // 无效接待原因列表
     getMarketingInvalidList () {
       this.$api.api.invalidList({houseId: this.houseId}).then((res) => {
-        console.log(res);
         if(res.data&&res.data.obj){
           this.marketingInvalidList = res.data.obj
         }else{
@@ -702,7 +693,6 @@ export default {
     // 转写方式数据获取
     findTransferMethod(){
        this.$api.api.findTransferMethod().then((res) => {
-        console.log(res);
         if(res.data&&res.data.obj){
           this.projectList = res.data.data||[]
           this.languageList = res.data.data&&res.data.data[0].list||[]
@@ -712,18 +702,19 @@ export default {
     // 确定重新转写
     checkFun(){
       if(this.form.project===''||this.form.language===''){
-          this.$message.error('请先选择转写方式')
-          return;
+        this.$message.error('请先选择转写方式')
+        return;
       }
       this.$api.api.toTransferData({
         id:this.currentRow.id,
         transferMethod:this.form.project,
         transferLanguage: this.form.language
       }).then((res) => {
-        console.log(res);
+        if(res.code==0){
           this.dialogVisible = false
           this.getorgCode()
           this.$message.success('操作成功')
+        }
       });
     },
     reWriteagain(row){
@@ -846,6 +837,7 @@ export default {
     houseChange() {
       this.findbypage();
       this.findKeywords();
+      this.findQuestionList()
       // 获取置业顾问列表
       this.findUserListByHouseId();
     },
@@ -898,6 +890,7 @@ export default {
             this.searchForm.projectId = res.data[0].id;
           }
           this.houseChange();
+          this.findQuestionList()
         });
     },
     // 置业顾问列表
diff --git a/src/views/ReceivingRecords/table.js b/src/views/ReceivingRecords/table.js
index db986c4..8f0f54a 100644
--- a/src/views/ReceivingRecords/table.js
+++ b/src/views/ReceivingRecords/table.js
@@ -21,7 +21,7 @@ export default {
             {
                 sortable: true,
                 label: '接待开始时间',
-                prop: 'staTimeOfCN',
+                prop: 'createTime',
             },
             {
                 label: "顾问",