Browse Source

雷尔伟超级管理员放开当前往后日期的日报查看和删除功能

QuYueTing 6 days ago
parent
commit
9173b49294

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/attendanceCalendar/employeeCalendar.vue

@@ -3,7 +3,7 @@
     <div class="calendar-left">
       <el-calendar v-model="calendarValue">
         <div slot="dateCell" slot-scope="data" class="calendar-cell" @click="setRightRow(data.data.day)">
-          <!-- <div>{{ dayjs(data.date).format("dddd") }}</div> -->
+          <div>{{ dayjs(data.date).format("DD") }}</div>
           <div>{{ weekMap[dayjs(data.date).format("dddd")] }}</div>
           <div class="calendar-cell-text" :style="`color: ${getDateRow(data.data.day).color}`">{{ getDateRow(data.data.day).attendanceTypeName}}{{ (getDateRow(data.data.day).hasOverTime?'加班':'') }}</div>
         </div>

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/workReport/daily.vue

@@ -12,7 +12,7 @@
                         </div>
                     <div slot="header" class="clearfix" id="clearfix" style="padding-left: 255px;">
                             <span v-for="(item,index) in allDate" :id="'day'+index" class="date_item"
-                            @click="choseDate(index, item)" :key="index" :style="'padding:0 6px;display: inline-block;width: 55px;text-align: center;' + (canClick(index,item) == false && user.timeType.fillAhead == 0 ? 'color:#c0c0c0;cursor:not-allowed;' : '') ">
+                            @click="choseDate(index, item)" :key="index" :style="'padding:0 6px;display: inline-block;width: 55px;text-align: center;' + (canClick(index,item) == false && user.timeType.fillAhead == 0 && user.roleName != '超级管理员'? 'color:#c0c0c0;cursor:not-allowed;' : '') ">
                             <div :style="'display:inline-block;text-align: center;'+(item.state == null?'':'')" >
                                 <div style="text-align:center;"><span :class="statusStyle[item.state]">{{item.showDate}}</span>
                                 <br>
@@ -4140,7 +4140,7 @@
             // 选择日期
             choseDate(i, item) {
 
-                if(this.canClick(i,item) == false && this.user.timeType.fillAhead == 0){
+                if(this.canClick(i,item) == false && this.user.timeType.fillAhead == 0 && this.user.roleName != '超级管理员' ){
                     return
                 }
                 // console.log(nowDateYear,nowDateMonth,nowDateDay,'..',itemYear,itemMonth,itemDay);