漏填提醒增加新的选项

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -928,6 +928,7 @@
   "instructions": "(Note: The system administrator is not limited by the filling time when filling out the daily report for the employee)",
   "missingfill": "Daily reminder missed filling on the day",
   "missingfills": "Daily reminder missed yesterday",
+  "lastDayOfWeek": "Remind on the last day of current week",
   "morningtime": "morning time",
   "owntimeframe": "Choose your own time frame",
   "personneltoset": "Don't remind people settings",

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -937,6 +937,7 @@
   "remindermethod": "请选择提醒方式",
   "missingfill": "每日提醒当天漏填",
   "missingfills": "每日提醒昨天漏填",
+  "lastDayOfWeek": "每周最后一个工作日",
   "remindertext": "提醒文本",
   "personneltoset": "不提醒人员设置",
   "addTian": "添加",

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -209,6 +209,7 @@
                         <el-select v-model="timeType.alertType" :placeholder="$t('remindermethod')">
                             <el-option :label="$t('missingfill')" :value="0"></el-option>
                             <el-option :label="$t('missingfills')" :value="1"></el-option>
+                            <el-option :label="$t('lastDayOfWeek')" :value="2"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item :label="$t('remindertext')" prop="alertMsg" style="width: 50%;margin-left:10px;">

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -250,9 +250,9 @@
 
                                                     <!--每个项目上单独审核 -->
                                                     <span style="float:right;">
-                                                        <el-button v-if="(permissions.projectReportReview || user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="primary" :loading="logining" 
+                                                        <el-button v-if="item2.state == 0 && (((permissions.projectReportReview || user.id == item2.projectAuditorId) && item2.isDeptAudit==0 && item2.projectAuditState==0) || (item2.isDeptAudit==1 && item2.auditDeptManagerid == user.id))" type="primary" :loading="logining" 
                                                         size="small" @click="approve(item1.id, item2)">{{$t('btn.through')}}</el-button>
-                                                        <el-button v-if="(permissions.projectReportReview ||user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="danger" :loading="logining" 
+                                                        <el-button v-if="item2.state == 0 && (((permissions.projectReportReview ||user.id == item2.projectAuditorId) && item2.isDeptAudit==0 && item2.projectAuditState==0) || (item2.isDeptAudit==1 && item2.auditDeptManagerid == user.id))" type="danger" :loading="logining" 
                                                         size="small" @click="showDenyDialog(item1.id,0, item2)">{{$t('btn.rejected')}}</el-button>
                                                         <el-button v-if="(permissions.projectReportReview ||user.id == item2.projectAuditorId || ((user.timeType.reportAuditType== 5 || user.timeType.reportAuditType== 6)&& (user.id == item2.projectAuditorId || (item2.isDeptAudit == 1 && user.id == item2.auditDeptManagerid)))) && item2.state == 1" type="normal" :loading="logining" size="small" 
                                                         @click="showDenyDialog(item1.id,1, item2)">{{$t('btn.undo')}}</el-button>