Merge remote-tracking branch 'origin/dev-20210702' into dev-20210702

src/components/list/table-c.vue

@@ -46,15 +46,15 @@
       >
         <template slot-scope="scope">
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,25)" @click="witeDiagnose(scope.row)">设为待问诊</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22,23,24,25,26,3,2)" @click="changeRun(scope.row)">更换运营</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22,23,24,25,26,3,2) && menuType !==2" @click="changeRun(scope.row)">更换运营</el-button>
           <el-button type="primary" size="small" class="btn"  @click="goDetail(scope.row,false)">查看详情</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,21,22,23,24,25,26,3)" @click="cancelRefund(scope.row)">取消/退款</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,21,22,23,24,25,26,3) && menuType !==2" @click="cancelRefund(scope.row)">取消/退款</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="witeGo(scope.row)">设为稍后跟进</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,22)" @click="waitMatchDot(scope.row)">设为待匹配医生</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4,5,6,21,22,23,24,25,26)" @click="sendMessage(scope.row)">发送消息</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3)" @click="joinDiagnose(scope.row)">加入问诊</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4)" @click="joinDiagnose(scope.row)">加入问诊</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2)" @click="matchRun(scope.row)">匹配运营</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,3,4,6,21,22,23,24,25,26)" @click="goDetail(scope.row,true)" >编辑</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,3,4,6,21,22,23,24,25,26,5,6)" @click="goDetail(scope.row,true)" >编辑</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="waitDiagnose(scope.row)">设为待分诊</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23)" @click="waitHzeDot(scope.row)">设为待协调医生</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23,24)" @click="waitMatchTime(scope.row)">设为待确认时间</el-button>
@@ -73,7 +73,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="pageNo"
-        :page-sizes="[15, 30, 50, 100, 150, 200]"
+        :page-sizes="[15, 30, 50, 100]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="totalRows"
@@ -89,6 +89,10 @@ import { TABLE_COLUMN } from "@/utils/constants";
     //21 已匹配， 22 待分诊， 23 待匹配接诊医生， 24 待协调医生  25 待设置问诊时间， 26 待问诊
 export default {
   props: {
+    menuType: {
+      type: Number,
+      default: 1,
+    },
     tData: {
       type: Array,
       default: [],

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -26,7 +26,7 @@
               <el-input
                 v-model.trim="searchParam.operateName"
                 clearable
-                placeholder="请输入姓名"
+                placeholder="请输入运营/分诊运营/接诊运营姓名查询"
                 style="width: 220px"
               ></el-input>
             </el-form-item>
@@ -174,9 +174,8 @@
         </el-row>
         <el-row :gutter="5" type="flex" justify="center" align="center">
           <el-col :span="24" class="btn-wrap">
-            <el-button type="success" class="submit-btn big-btn" @click="batchSetOperator"
-              >批量设置运营</el-button
-            >
+            <el-button type="success" class="submit-btn big-btn" @click="batchSetOperator" v-if="searchParam.menuType !== 2"
+              >批量设置运营</el-button>
             <el-button type="info" class="submit-btn" @click="download"
               >全部导出</el-button
             >
@@ -192,6 +191,7 @@
           :key="item.active"
         >
           <table-component
+            :menuType="searchParam.menuType"
             :tData="tableData"
             :pageNo="searchParam.pageNo"
             :pageSize="searchParam.pageSize"

src/views/IM/diagnosis-admin/diagnosis-live.vue

@@ -110,13 +110,11 @@ export default {
                 })
                 .then(() => {
                     closeLoading(this)
-                    this.$router.push({path: '/diagnosis-list', query: {liveBack: true}})
-                    //this.$router.go(-1)
+                    this.$router.go(-1)
                 })
                 .catch((err) => {
                     closeLoading(this)
-                    this.$router.push({path: '/diagnosis-list', query: {liveBack: true}})
-                    //this.$router.go(-1)
+                    this.$router.go(-1)
                 })
             })
             }
@@ -377,8 +375,7 @@ export default {
         leave() {
             this.rtc.leave()
             this.clearSession()
-            this.$router.push({path: '/diagnosis-list', query: {liveBack: true}})
-            //this.$router.go(-1)
+            this.$router.go(-1)
         },
         // 结束会话
         overFn() {
@@ -430,12 +427,10 @@ export default {
                     title:  `获取信息失败，请稍后重试`
                 })
                 .then(() => {
-                    this.$router.push({path: '/diagnosis-list', query: {liveBack: true}})
-                    //this.$router.go(-1)
+                    this.$router.go(-1)
                 })
                 .catch((err) => {
-                    this.$router.push({path: '/diagnosis-list', query: {liveBack: true}})
-                    //this.$router.go(-1)
+                    this.$router.go(-1)
                 })
             })
         },