增加补填的时间限制：7天内

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -238,8 +238,15 @@ public class ReportController {
             if (fillMonths > 0) {
                 //有限制的情况
                 LocalDate curMonth = LocalDate.now();
-                LocalDate doorMonth = curMonth.minusMonths(fillMonths-1);
-                doorMonth = doorMonth.withDayOfMonth(1);//修改日期为1号
+                LocalDate targetDate = null;
+                if (fillMonths <=3) {
+                    targetDate = curMonth.minusMonths(fillMonths-1);
+                    targetDate = targetDate.withDayOfMonth(1);//修改日期为1号
+                } else if (fillMonths == 4) {
+                    //7天内
+                    targetDate = curMonth.minusDays(7);
+                }
+
                 DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                 //检查填报日期，是否早于限制的日期
                 boolean isForbidden = false;
@@ -250,19 +257,19 @@ public class ReportController {
                         String[] dateArray = createDateOne.split("@");
                         String startDate = dateArray[0];
                         LocalDate localStartDate = LocalDate.parse(startDate, dateTimeFormatter);
-                        if (localStartDate.isBefore(doorMonth)) {
+                        if (localStartDate.isBefore(targetDate)) {
                             isForbidden = true;
                         }
                     } else {
                         //单日填报，检查日期是否早于限制时间
-                        if (LocalDate.parse(createDateOne, dateTimeFormatter).isBefore(doorMonth)) {
+                        if (LocalDate.parse(createDateOne, dateTimeFormatter).isBefore(targetDate)) {
                             isForbidden = true;
                         }
                     }
                 }
                 if (isForbidden) {
                     HttpRespMsg msg = new HttpRespMsg();
-                    msg.setError("补填日报不可早于"+dateTimeFormatter.format(doorMonth)+"，请联系系统管理员代填。");
+                    msg.setError("补填日报不可早于"+dateTimeFormatter.format(targetDate)+"，请联系系统管理员代填。");
                     return msg;
                 }
             }

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -28,7 +28,7 @@
                         </el-select>
                 </el-form-item>
                 <!-- 项目成本基线条目 -->
-                <el-form-item style="float:right;" v-if="user.role == 1||user.role == 2||user.role == 5">
+                <el-form-item style="float:right;"  v-if="user.company.packageProject == 1 && (user.role == 1||user.role == 2||user.role == 5)">
                     <el-link type="primary" :underline="false" @click="showBaseCostItemDialog">基线成本项</el-link>
                 </el-form-item> 
                 <el-form-item style="float:right;" v-if="user.role == 1||user.role == 2||user.role == 5">
@@ -201,9 +201,9 @@
                 </el-form-item>
                 
                 <!-- 项目基线 -->
-                <div style="margin: 10px 0 30px 0;min-height:200px;" >
+                <div style="margin: 10px 0 30px 0;min-height:200px;" v-if="user.company.packageProject == 1">
                     <el-tabs v-model="activeName" @tab-click="handleClick">
-                    <el-tab-pane label="成本基线" name="baseCostPanel" >
+                    <el-tab-pane label="成本基线" name="baseCostPanel"  >
                         <div style="padding-top:10px;">
                             <!--新版 -->
                             <span class="rg_span" v-for="(item, index) in projectBaseCostData" :key="item.id">

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

@@ -250,7 +250,7 @@
     export default {
         data() {
             return {
-                monthTimeList:[{id:0, name:'不限制'},{id:1, name:'仅可补填当月'},{id:2, name:'可补填到上个月'},{id:3, name:'可补填到上上月'}],
+                monthTimeList:[{id:0, name:'不限制'},{id:1, name:'仅可补填当月'},{id:2, name:'可补填到上个月'},{id:3, name:'可补填到上上月'},{id:4, name:'可补填7天内日报'},],
                 progress:30,
                 startTime:null,
                 endTime:null,