Merge remote-tracking branch 'origin/main'

src/views/registration/index.vue

@@ -13,12 +13,23 @@
               <div class="search" style="display: flex">
                 <el-input style="height: 100%" v-model="keyword" placeholder="搜索医生姓名"
                           @keydown.enter="initDoctor" :prefix-icon="Search"></el-input>
-                <span class="default-btn" @click="allList">全部</span>
               </div>
               <div class="content_list" style="padding: 0 24px">
                 <ul class="role_list">
                   <el-scrollbar style="height: 100%">
-                    <li :class="{active:isShowNum==-1}" @click="changeRole(null,-1)">全部</li>
+                    <li :class="{active:isShowNum==-1}" @click="changeRole(null,-1)">
+                      <span style="flex: 1;min-width: 0" class="name">全部</span>
+                      <span v-if="dateName" class="btn" @click="openDialog(null,-1)"
+                            @mouseover="isShow = -2"
+                            @mouseleave="isShow = -1">
+                      <img v-if="isShow==-2" src="/static/images/registration/3-active.png"
+                           style="width: 15px;height: 14px;margin-right: 8px" alt="">
+                      <img v-else src="/static/images/registration/3.png" alt=""
+                           style="width: 15px;height: 14px;margin-right: 8px">
+
+                      {{ dateName ? dateName : '挂号' }}
+                    </span>
+                    </li>
                     <li v-for="(item, index) in roleList" :key="index"
                         :class="{active:isShowNum==index}" @click="changeRole(item,index)">
                       <span class="name">{{ item.name }}</span>
@@ -176,9 +187,16 @@ const isShow = ref(-1)
 const editRef = ref<any>('')
 const openDialog = (item: any, index: any) => {
   isShow.value = index
+  if (item) {
     nextTick(() => {
       editRef.value?.init(item.id)
     })
+  } else {
+    nextTick(() => {
+      editRef.value?.init(null)
+    })
+  }
+
 }
 const close = () => {
   id.value = null
@@ -191,8 +209,12 @@ const reset = () => {
 const doctorId = ref(null)
 const changeRole = (item: any, index: any) => {
   isShowNum.value = index
+  if(index==-1){
+    allList()
+  }else{
     doctorId.value = item.id
     getPatientList()
+  }
 }
 const allList = () => {
   selectedDate.value = [getPrevious30Days(), getToday().end]
@@ -255,6 +277,7 @@ const allList = () => {
               border-radius: 5px;
               align-items: center;
               cursor: pointer;
+              color: #999;
 
               &:hover {
                 background: rgba(#4D6DE4, 0.3);
@@ -304,6 +327,7 @@ const allList = () => {
             }
 
             .active {
+              color: #fff !important;
               background: #4D6DE4 !important;
 
               .name {