Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/guide.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="guide-container">
-    <img src="/src/assets/image/gsgj.jpg" alt="">
+    <!-- <img src="/src/assets/image/gsgj.jpg" alt=""> -->
+    <img src="/src/assets/image/saomiao.jpg" alt="">
     <div class="guide-container-text">请长按图片关注</div>
   </div>
 </template>

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/mapper/ProjectMapper.xml

@@ -2744,7 +2744,7 @@
         <foreach collection="userIds" close=")" open="(" separator="," index="" item="item">
             #{item}
         </foreach>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
@@ -2781,7 +2781,7 @@
         <foreach collection="userIds" close=")" open="(" separator="," index="" item="item">
             #{item}
         </foreach>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.is_task_plan=1  and project.incharger_id=#{managerId}
         AND project.`status` = 1 and task.task_plan=1 and task.task_status !=2
         <if test="targetUserId !=null and targetUserId !='' ">
@@ -2802,7 +2802,7 @@
         <foreach collection="userIds" close=")" open="(" separator="," index="" item="item">
             #{item}
         </foreach>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null  and  task.check_second_id=#{managerId}
         AND project.`status` = 1 and task.task_plan=1 and task.task_status !=2
         <if test="targetUserId !=null and targetUserId !='' ">
@@ -2835,7 +2835,7 @@
         <if test="targetProjectId !=null  ">
             and project.`id` = #{targetProjectId}
         </if>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null
         AND project.`status` = 1
         ORDER BY project.id, task.start_date
@@ -2865,7 +2865,7 @@
         <if test="targetProjectId !=null  ">
             and project.`id` = #{targetProjectId}
         </if>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.is_task_plan=1  and project.incharger_id=#{managerId} and task.task_status !=2
         AND project.`status` = 1
         ORDER BY project.id, task.start_date
@@ -2895,7 +2895,7 @@
         <if test="targetProjectId !=null  ">
             and project.`id` = #{targetProjectId}
         </if>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.task_plan=1 and  task.check_second_id=#{managerId}
         AND project.`status` = 1 and task.task_status !=2
         ORDER BY project.id, task.start_date
@@ -3004,7 +3004,7 @@
                </foreach>
             </if>
             <if test="startDate !=null and startDate!='' and endDate !=null and endDate!=''">
-                and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+                and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
             </if>
             <if test="deptId !=null">
                 and user.department_id= #{deptId}

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

@@ -27,7 +27,7 @@ public class FinanceMonthlyWorktimeController {
     private FinanceMonthlyWorktimeService financeMonthlyWorktimeService;
 
     @RequestMapping("/send")
-    public HttpRespMsg send(@RequestParam("id")String id, @RequestParam("timesheetDate") String timesheetDate, HttpServletRequest request) {
+    public HttpRespMsg send(@RequestParam("id")Integer id, @RequestParam("timesheetDate") String timesheetDate, HttpServletRequest request) {
         return financeMonthlyWorktimeService.send(id,timesheetDate,request);
     }
 

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

@@ -1489,6 +1489,28 @@ public class ReportController {
                 }
             }
         }
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        //对于正北（苏州和广州)需校验项目开始结束日期
+        if (company.getId() == 8138 || company.getId() == 7703) {
+            for (Report report : reportList) {
+                Optional<Project> first = projectList.stream().filter(p -> p.getId().equals(report.getProjectId())).findFirst();
+                if (first.isPresent()) {
+                    Project project = first.get();
+                    if (project.getPlanStartDate() != null && report.getCreateDate().isBefore(project.getPlanStartDate())) {
+                        HttpRespMsg httpRespMsg = new HttpRespMsg();
+                        //httpRespMsg.setError("项目["+project.getProjectName()+"]的开始日期为"+project.getStartDate()+"，结束日期为"+project.getEndDate()+"，请检查日报日期是否在范围内");
+                        httpRespMsg.setError("项目["+project.getProjectName()+"]的开始日期为"+dateTimeFormatter.format(project.getPlanStartDate())+",无法填报早于该日期的工时");
+                        return httpRespMsg;
+                    }
+                    if (project.getPlanEndDate() != null && report.getCreateDate().isAfter(project.getPlanEndDate())) {
+                        HttpRespMsg httpRespMsg = new HttpRespMsg();
+                        //httpRespMsg.setError("项目["+project.getProjectName()+"]的开始日期为"+project.getStartDate()+"，结束日期为"+project.getEndDate()+"，请检查日报日期是否在范围内");
+                        httpRespMsg.setError("项目["+project.getProjectName()+"]的结束日期为"+dateTimeFormatter.format(project.getPlanStartDate())+",无法填报晚于该日期的工时");
+                        return httpRespMsg;
+                    }
+                }
+            }
+        }
 
         //如果锁定工作时长上限的话，需要校验每日的合计工作时长
         for (Report report : reportList) {
@@ -1602,7 +1624,6 @@ public class ReportController {
                                 if (errorMsg == null) {
                                     //校验工单号的状态是否关闭
                                     if (first.get().getStatus() == 4 && report.getCreateDate().isAfter(first.get().getCloseDate())) {
-                                        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                                         errorMsg = "工单号:"+report.getExtraField4()+"于"+dateTimeFormatter.format(first.get().getCloseDate())+"已关闭";
                                     }
                                 }
@@ -1998,7 +2019,6 @@ public class ReportController {
         }
         //如果开启了计划日期的限制，需要校验
         if (comTimeType.getNotAllowedExpiredProject() == 1) {
-            DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             for (Report report : reportList) {
                 Optional<Project> first = projectList.stream().filter(pl -> pl.getId().equals(report.getProjectId())).findFirst();
                 if (first.isPresent()) {

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

@@ -231,7 +231,8 @@ public class UserCorpwxTimeController {
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         List<Map> list = new ArrayList<Map>();
-        list = userCorpwxTimeMapper.getUserDataList(user.getCompanyId(), startDate, endDate, null, user.getRoleName().contains("管理员")?null:user.getId());
+        String curUserId = user.getCompanyId() == 469?user.getId():(user.getRoleName().contains("管理员")?null:user.getId());
+        list = userCorpwxTimeMapper.getUserDataList(user.getCompanyId(), startDate, endDate, null, curUserId);
         //工作日处理，排除常规周末和法定节假日
         DateTimeFormatter standFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         HashMap item = new HashMap();

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

@@ -386,11 +386,11 @@ public class UserFvTimeController {
             httpRespMsg.setError("暂无考勤记录");
             return httpRespMsg;
         }
-        if(!userFvTimeService.saveBatch(userFvTimeList)){
+        if(userFvTimeList.size() > 0 && !userFvTimeService.saveBatch(userFvTimeList)){
             httpRespMsg.setError("验证失败");
             return httpRespMsg;
         }
-        if(!userFvTimeService.updateBatchById(userFvTimeUpdateList)){
+        if(userFvTimeUpdateList.size() > 0 && !userFvTimeService.updateBatchById(userFvTimeUpdateList)){
             httpRespMsg.setError("验证失败");
             return httpRespMsg;
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/FmwDetailMapper.java

@@ -16,8 +16,5 @@ import java.util.List;
  * @since 2025-04-16
  */
 public interface FmwDetailMapper extends BaseMapper<FmwDetail> {
-
-    List<TisTimeVO> getTisTime(@Param("fmwId") String fmwId);
-
-    List<TisTimeVO> getTisTimeByFmwId(@Param("id") Integer id);
+    List<TisTimeVO> getTisTime(@Param("fmwId") Integer fmwId);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ReportMapper.java

@@ -257,8 +257,6 @@ public interface ReportMapper extends BaseMapper<Report> {
 
     List<UserRestTimeVO> getCompanyUserOverTimeHours(@Param("companyId") Integer companyId,@Param("userId") String userId);
 
-    List<TisTimeVO> getTisTimeByDate(@Param("companyId") Integer companyId,@Param("date") String dateStr);
-
     List<Report> getReportProjectGroupDetailList(@Param("companyId") Integer companyId,@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("groupNameList") List<String> groupNameList);
 
     List<Report> getReportProjectAssistTime(@Param("companyId") Integer companyId,@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("groupNameList") List<String> groupNameList);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/FinanceMonthlyWorktimeService.java

@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface FinanceMonthlyWorktimeService extends IService<FinanceMonthlyWorktime> {
 
-    HttpRespMsg send(String fmwId, String timesheetDate, HttpServletRequest request);
+    HttpRespMsg send(Integer fmwId, String timesheetDate, HttpServletRequest request);
 
     HttpRespMsg getByMonth(Integer companyId, String ymonth, Integer reGenerate, Integer isItAWorkOrder, HttpServletRequest request) throws Exception;
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceMonthlyWorktimeServiceImpl.java

@@ -88,7 +88,7 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
     private String uploadPath;
 
     @Override
-    public HttpRespMsg send(String fmwId, String timesheetDate, HttpServletRequest request) {
+    public HttpRespMsg send(Integer fmwId, String timesheetDate, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         String userId = request.getHeader("Token");
         User user = userMapper.selectById(userId);
@@ -126,15 +126,21 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                 List<TisTimeVO> resList = checkResponse.getBody();
                 List<TisTimeVO> tmpCheck = resList.stream().filter(t -> null != t.getCoId()).collect(Collectors.toList());
                 if(tmpCheck.size() != resList.size()){
-                    httpRespMsg.setError("财务尚未完成操作，无法获取cppid");
+                    //打印有问题的数据
+                    StringBuilder errorMsg = new StringBuilder("以下数据未能获取到cppid:\n");
+                    resList.forEach(t -> {
+                        if (StringUtils.isEmpty(t.getCoId())) {
+                            errorMsg.append("工单号: ").append(t.getOrderId())
+                                    .append(", 行号: ").append(t.getLine()).append("\n");
+                        }
+                    });
+                    httpRespMsg.setError("请检查工单号和行号是否正确，或联系管理员处理。"+ errorMsg.toString());
                     return httpRespMsg;
                 }
                 resList.forEach(t->t.setDateStr(timesheetDate));
+                System.out.println("准备将"+resList.size()+"条数据需要插入到TIS系统中");
                 HttpHeaders insertHeaders = new HttpHeaders();
                 insertHeaders.setContentType(MediaType.APPLICATION_JSON);
-//                Map<String, Object> insertBody = new HashMap<>();
-//                insertBody.put("tisList", resList);
-//                HttpEntity<Object> insertEntity = new HttpEntity<>(insertBody, insertHeaders);
                 HttpEntity<List<TisTimeVO>> insertEntity = new HttpEntity<>(resList, headers);
                 ResponseEntity<String> tisResponse = restTemplate.exchange(insertUrl, HttpMethod.POST, insertEntity, String.class);
                 if (tisResponse.getStatusCode() == HttpStatus.OK) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java

@@ -119,7 +119,7 @@ public class DataCollectTask {
             List<TisTimeVO> toSendList = new ArrayList<>();
             for (FinanceMonthlyWorktime financeMonthlyWorktime : financeMonthlyWorktimes) {
                 String ymd = financeMonthlyWorktime.getTimesheetDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-                List<TisTimeVO> timeVOList = fmwDetailMapper.getTisTimeByFmwId(financeMonthlyWorktime.getId());
+                List<TisTimeVO> timeVOList = fmwDetailMapper.getTisTime(financeMonthlyWorktime.getId());
                 if(!CollectionUtils.isEmpty(timeVOList)){
                     timeVOList.forEach(t->t.setDateStr(ymd));
                     toSendList.addAll(timeVOList);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -673,8 +673,12 @@ public class TimingTask {
                     }
                 }
             }
-            userFvTimeService.saveBatch(userFvTimeList);
-            userFvTimeService.updateBatchById(userFvTimeUpdateList);
+            if (userFvTimeList.size() > 0) {
+                userFvTimeService.saveBatch(userFvTimeList);
+            }
+            if (userFvTimeUpdateList.size() > 0) {
+                userFvTimeService.updateBatchById(userFvTimeUpdateList);
+            }
         }
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/FmwDetailMapper.xml

@@ -31,13 +31,7 @@
         select extra_field4 as orderId,extra_field5 as line
              ,sum(compose_time+repair_time+debug_time+waiting_time+public_time) as workTime
         from fmw_detail
-        where fmw_id = #{fmwId}
+        where fmw_id = #{fmwId} and extra_field4 is not null and extra_field4 <> ''
         group by extra_field4,extra_field5
     </select>
-    <select id="getTisTimeByFmwId" resultType="com.management.platform.entity.vo.TisTimeVO">
-        select extra_field4 as orderId,extra_field5 as line
-             ,sum(compose_time+repair_time+debug_time+waiting_time+public_time) as workTime
-        from fmw_detail
-        where fmw_id = #{fmwId}
-    </select>
 </mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -756,7 +756,7 @@
         <if test="justWaitForMe !=null  ">
             and (task.check_first_id=#{creatorId} or task.check_second_id=#{creatorId})  and (task.task_status=3 or task.task_status=4)
         </if>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.is_task_plan =0
         AND project.`status` = 1
         ORDER BY user.id, task.start_date
@@ -787,7 +787,7 @@
         <if test="justWaitForMe !=null  ">
             and (task.check_first_id=#{creatorId} or task.check_second_id=#{creatorId})  and (task.task_status=3 or task.task_status=4)
         </if>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.task_plan =0
         AND project.`status` = 1
         ORDER BY project.id, task.start_date
@@ -2746,7 +2746,7 @@
         <foreach collection="userIds" close=")" open="(" separator="," index="" item="item">
             #{item}
         </foreach>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
@@ -2766,7 +2766,7 @@
         LEFT JOIN task_executor ON user.id = task_executor.`executor_id`
         left join task on task.id = task_executor.task_id
         WHERE
-        ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.task_plan_type=3 and task.task_plan=1
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
@@ -2786,7 +2786,7 @@
         <foreach collection="userIds" close=")" open="(" separator="," index="" item="item">
             #{item}
         </foreach>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.is_task_plan=1  and task.check_first_id=#{managerId}
         AND project.`status` = 1 and task.task_plan=1 and task.task_status !=2
         <if test="targetUserId !=null and targetUserId !='' ">
@@ -2810,7 +2810,7 @@
         <foreach collection="userIds" close=")" open="(" separator="," index="" item="item">
             #{item}
         </foreach>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null  and  task.check_second_id=#{managerId}
         AND project.`status` = 1 and task.task_plan=1 and task.task_status !=2
         <if test="targetUserId !=null and targetUserId !='' ">
@@ -2849,7 +2849,7 @@
         <if test="justWaitForMe !=null">
             and (task.check_first_id=#{creatorId} or task.check_second_id=#{creatorId}) and (task.task_status=3 or task.task_status=4)
         </if>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null
         AND project.`status` = 1
         ORDER BY project.id, task.start_date
@@ -2882,7 +2882,7 @@
         <if test="justWaitForMe !=null">
             and task.task_status=3
         </if>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.is_task_plan=1  and task.check_first_id=#{managerId} and task.task_status !=2
         AND project.`status` = 1
         ORDER BY project.id, task.start_date
@@ -2915,7 +2915,7 @@
         <if test="justWaitForMe !=null">
             and task.task_status=4
         </if>
-        and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
+        and ((IFNULL(task.start_date , task.end_date) &lt;= #{endDate}) and (task.end_date &gt;= #{startDate}))
         and task.end_date is not null and task.task_plan=1 and  task.check_second_id=#{managerId}
         AND project.`status` = 1 and task.task_status !=2
         ORDER BY project.id, task.start_date

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -1559,12 +1559,6 @@
         group by report.creator_id
         ) tmp2 on tmp1.id = tmp2.userId
     </select>
-    <select id="getTisTimeByDate" resultType="com.management.platform.entity.vo.TisTimeVO">
-        select extra_field4 as orderId,extra_field5 as line,sum(working_time) as workTime
-        from report
-        where company_id = #{companyId} and create_date = #{date}
-        group by extra_field4,extra_field5
-    </select>
 
     <update id="batchUpdateReportStageToNull">
         update report set stage=null where id in

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

@@ -113,7 +113,7 @@
                     <!-- <router-link to="/projectGantt"> -->
                         <el-link type="primary" :underline="false" @click="isganttshow = true">{{ $t('resourceallocation') }}</el-link>
                     <!-- </router-link> -->
-                    <el-dialog v-if="isganttshow" :visible.sync="isganttshow" width="90vw" top="3vh" style="height:96%" class="ganttdialog">
+                    <el-dialog v-if="isganttshow" :visible.sync="isganttshow" fullscreen width="100%" style="height:100%" class="ganttdialog">
                         <projectgantt ref="projectganttRef"></projectgantt>
                     </el-dialog>
                 </el-form-item>

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

@@ -8,7 +8,7 @@
             <el-radio-button :label="$t('an-xiang-mu-cha-kan')" value="xiangmu"></el-radio-button>
             <el-radio-button :label="$t('zi-yuan-xu-qiu')" value="demand"></el-radio-button>
           </el-radio-group>
-          <el-checkbox v-if="radio1 != $t('zi-yuan-xu-qiu') && user.companyId == 876" v-model="justWaitForMe" style="margin-left: 14px;" @change="selChange()">待我审核</el-checkbox>
+          <!-- <el-checkbox v-if="radio1 != $t('zi-yuan-xu-qiu') && user.companyId == 876" v-model="justWaitForMe" style="margin-left: 14px;" @change="selChange()">待我审核</el-checkbox> -->
         </div>
       </div>
       <!-- 时间段筛选  -->
@@ -85,7 +85,7 @@
     :key="updatakey1" :tasks="tasks"></vueGantt>
 
   <div class="demand-container" v-if="!isDataLoaded">
-    <el-table height="55vh" :loading="demandListLoading" :data="demandList">
+    <el-table height="75vh" :loading="demandListLoading" :data="demandList">
       <el-table-column :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" prop="projectCode" width="160"></el-table-column>
       <el-table-column :label="$t('headerTop.projectName')" prop="projectName" min-width="240"></el-table-column>
       <el-table-column :label="$t('jin-qi-ri-huo-yue-ren-yuan')" prop="activeUsers" min-width="240">
@@ -650,7 +650,7 @@ export default {
   .left-container {
     overflow: hidden;
     position: relative;
-    height: 60vh;
+    height: 80vh;
   }
   .demand-container{
     overflow: hidden;

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-     <el-table :data="treeDataList" height="490px" row-key="id" :key="'1'" show-overflow-tooltip :cell-style="TableCellStyle" size="mini" :span-method="arraySpanMethod" style="width: 100%;margin-bottom: 20px;" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+     <el-table :data="treeDataList" height="80vh" row-key="id" :key="'1'" show-overflow-tooltip :cell-style="TableCellStyle" size="mini" :span-method="arraySpanMethod" style="width: 100%;margin-bottom: 20px;" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
         <el-table-column prop="text" :label="$t('lable.name')" width="240" fixed="left" v-if="stafforpro != $t('an-xiang-mu-cha-kan')">
           <template slot-scope="scope">
               <!-- user.userNameNeedTranslate == 1 -->

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -2009,8 +2009,9 @@ export default {
                 for(let userIndex in this.addForm.executorListFront) {
                     const executeList = this.addForm.executorListFront[userIndex].dailyAllocateList
                     const list = executeList.map(item => {
-                        const { startTime, endTime, workHour, overWorkHour, allocateDate } = item
+                        const { startTime, endTime, workHour, overWorkHour, allocateDate, id } = item
                         return {
+                            id: id || '',
                             startTime, endTime, workHour, overWorkHour, allocateDate,
                             taskId: this.addForm.id,
                             userId: this.addForm.executorListFront[userIndex].executorId