Browse Source

修改预约待办的权限展示

lm 1 tháng trước cách đây
mục cha
commit
fcea92f4f1

+ 2 - 1
src/views/appointmentAndTodo/appointmentRegister/index.vue

@@ -19,7 +19,8 @@
                     <FollowCard :cardList="[{...(item.desc)}]">
                         <template #operation="{row}">
                             <div class="table_row_option">
-                                <span v-if="item.orderStatus !== 2" class="button_delete" @click="OpenCancelAppointmentDialog(row,item)">取消预约</span>
+                                <!-- cancelStatus true 可取消  false 不可取消 -->
+                                <span v-if="item.orderStatus !== 2 && item.cancelStatus" class="button_delete" @click="OpenCancelAppointmentDialog(row,item)">取消预约</span>
                                 <span class="option_button_editor" @click="OpenAppointmentDialog(row,item)">查看详情</span>
                             </div>
                         </template>

+ 1 - 1
src/views/appointmentAndTodo/index.vue

@@ -10,7 +10,7 @@
             <!-- {{ selectedCalendarTime }} -->
              <div class="calendar_desc"> 
                 <div class="calendar_desc_title">
-                    <span class="date_desc">{{dayjs().month() + 1}}月预约</span>
+                    <span class="date_desc">{{dayjs(selectedCalendarTime || undefined).month() + 1}}月预约</span>
                     <span class="total_count">共{{currentMonthAppointment.totalCount}}条</span>
                 </div>
                 <div class="calendar_desc_content">

+ 1 - 1
src/views/appointmentAndTodo/toDoRegister/index.vue

@@ -2,7 +2,7 @@
 
 <template>
     <div>
-        <SearchBlock :searchList="blockSearchList" 
+        <SearchBlock v-if="userInfo.roles.includes('Admin')" :searchList="blockSearchList" 
             @searchChange="HandleSearchChange">
         </SearchBlock>
         <div class="page_jg_10"></div>