Sfoglia il codice sorgente

补充调休前端,调休逻辑适配转义

zhouyy 5 mesi fa
parent
commit
77fa378978

+ 1 - 0
fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -770,6 +770,7 @@
   "annualleavemanagement": "Annual leave management",
   "for": "leave statistics",
   "leaveApprovalProcess": "Leave approval process",
+  "restTime":"Rest time list",
   "myleaveform": "my leave form",
   "scheduleofremainingLeave": "Holiday Remaining Table",
   "singlelistofleave": "List of leave requests",

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -773,7 +773,7 @@
   "myleaveform": "我的请假单",
   "for": "请假统计",
   "leaveApprovalProcess": "请假审批流程",
-  "restTime":"调休统计",
+  "restTime":"调休额度列表",
   "annualleavemanagement": "年假管理",
   "scheduleofremainingLeave": "假期剩余表",
   "aketimeoffto": "请假填报",

+ 7 - 8
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -49,6 +49,13 @@
               </template>
           </el-menu-item>
 
+          <el-menu-item index="9" v-if="permissions.leaveStatistical">
+              <template slot="title">
+                <i class="iconfont firerock-icongongshitongji"></i>
+                <span slot="title">{{ $t('restTime') }}</span>
+              </template>
+          </el-menu-item>
+
           <el-menu-item index="5" v-if="permissions.leaveProcess">
               <template slot="title">
                 <i class="iconfont firerock-iconliucheng"></i>
@@ -80,14 +87,6 @@
             </el-menu-item>
           </template>
 
-          <el-menu-item index="9" v-if="permissions.leaveStatistical">
-              <template slot="title">
-                <i class="iconfont firerock-icongongshitongji"></i>
-                <span slot="title">{{ $t('restTime') }}</span>
-              </template>
-          </el-menu-item>
-
-
           </el-menu>
       </el-col>
     </div>