Merge branch 'dev-20210702' of...

Merge branch 'dev-20210702' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into dev-20210702

src/components/list/table-c.vue

@@ -46,7 +46,7 @@
       >
         <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)" @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)" @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,21)" @click="witeGo(scope.row)">设为稍后跟进</el-button>

src/utils/constants.js

@@ -417,7 +417,7 @@ export const TABLE_COLUMN = [
     showtooltip: false,
   },
   {
-    prop: "operateUserID",
+    prop: "operateUserId",
     label: "运营人员ID",
     showtooltip: false,
   },

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

@@ -532,7 +532,7 @@ export default {
       this.matchVisible = true;
       this.diagnoseLogId = row.diagnoseLogId;
       this.batchFlag = false;
-      this.operateUserID = row.operateUserID;
+      this.operateUserID = row.operateUserId;
     },
     //查看详情/编辑详情
     goDetail(row,flag) {