Merge branch 'dev-20210621' into 'release'

Dev 20210621,code review:bo.dang

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!18

src/components/list/table-component.vue

@@ -75,7 +75,7 @@
             <template slot-scope="scope">
                 <!-- 1 初始状态  2待咨询 3 咨询中  4已结束 -->
                 <div v-if="scope.row.operateUserID">
-                    <el-button v-if="scope.row.status != 4" type="primary" size="small" @click="timeHandle(scope.row)" style="margin-top: 10px;">修改时间</el-button>
+                    <el-button v-if="scope.row.status != 4 && scope.row.status != 5" type="primary" size="small" @click="timeHandle(scope.row)" style="margin-top: 10px;">修改时间</el-button>
                     <el-button v-if="scope.row.status == 3" type="primary" size="small" @click="endDiagnosis(scope.row)" style="margin-top: 10px;">结束</el-button>
                 </div>
                 <div v-if="scope.row.operateUserID">
@@ -85,10 +85,11 @@
                     <el-button type="primary" size="small" @click="sendMessage(scope.row)" style="margin-top: 10px;" v-if="!((scope.row.status==2 || scope.row.status==4) && scope.row.createType == 2)">发送消息</el-button>
                 </div>
                 <div v-if="!scope.row.operateUserID">
-                    <el-button type="primary" size="small" @click="selectBtn(scope.row)">匹配</el-button>
+                    <el-button v-if="scope.row.status != 5" type="primary" size="small" @click="selectBtn(scope.row)">匹配</el-button>
                 </div>
+                <el-button v-if="scope.row.status == 2 || scope.row.status == 3" type="primary" size="small" style="margin-top: 10px;" @click="cancelBtn(scope.row)">取消预约</el-button>
                 <div>
-                    <el-button  type="primary" size="small"  style="margin-top: 10px;" @click="goEditor(scope.row,1)">编辑</el-button>
+                    <el-button  v-if="scope.row.status != 5" type="primary" size="small"  style="margin-top: 10px;" @click="goEditor(scope.row,1)">编辑</el-button>
                     <el-button  type="primary" size="small" style="margin-top: 10px;" @click="goEditor(scope.row,2)">预约详情</el-button>
                 </div>
             </template>
@@ -163,6 +164,9 @@ export default {
         selectBtn(row) {
             this.$emit('selectBtn',row)
         },
+        cancelBtn(row) {
+          this.$emit('cancelBtn',row)
+        },
         goEditor(row,flag) {
             this.$emit('goEditor',row,flag)
         },

src/utils/constants.js

@@ -39,7 +39,7 @@ export const PAY_LIST = [
   }
 ]
 
-// 订单来源 
+// 订单来源
 export const SOURCE_LIST = [
   {
     label: '全部',
@@ -84,6 +84,10 @@ export const STATUS_LIST = [
   {
     label: '已问诊',
     value: 4
+  },
+  {
+    label: '已取消',
+    value: 5
   }
 ]
 
@@ -222,4 +226,4 @@ export const FOLLW_LIST = [
     label: '长期跟进',
     value: 4
   },
-]
\ No newline at end of file
+]