1

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

@@ -4,10 +4,7 @@ package com.management.platform.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.*;
-import com.management.platform.mapper.ProjectMapper;
-import com.management.platform.mapper.TaskGroupMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.mapper.WxCorpInfoMapper;
+import com.management.platform.mapper.*;
 import com.management.platform.service.ExcelExportService;
 import com.management.platform.service.GroupBudgetReviewService;
 import com.management.platform.service.TaskService;
@@ -61,6 +58,8 @@ public class GroupBudgetReviewController {
     private ExcelExportService excelExportService;
     @Resource
     private WxCorpInfoService wxCorpInfoService;
+    @Resource
+    private TimeTypeMapper timeTypeMapper;
 
     @RequestMapping("/add")
     public HttpRespMsg add(Integer groupId,Integer oldManDay,Integer changeManDay,Integer nowManDay,String remark){
@@ -113,14 +112,14 @@ public class GroupBudgetReviewController {
             //审核通过计算到任务分组的项目人天
             Integer groupId = groupBudgetReview.getGroupId();
             TaskGroup taskGroup = taskGroupMapper.selectById(groupId);
-            Integer manDay = taskGroup.getManDay();
+            Double manDay = taskGroup.getManDay();
             BigDecimal bigDecimal = new BigDecimal(manDay==null?0:manDay);
             bigDecimal=bigDecimal.add(new BigDecimal(groupBudgetReview.getChangeManDay()==null?0:groupBudgetReview.getChangeManDay()));
-            taskGroup.setManDay(bigDecimal.intValue());
+            taskGroup.setManDay(bigDecimal.doubleValue());
             taskGroupMapper.updateById(taskGroup);
             //项目人天按照分组工时增加
             Project project = projectMapper.selectById(taskGroup.getProjectId());
-            Integer day = project.getManDay();
+            double day = project.getManDay();
             day=day+groupBudgetReview.getChangeManDay();
             project.setManDay(day);
             projectMapper.updateById(project);
@@ -150,6 +149,7 @@ public class GroupBudgetReviewController {
     public HttpRespMsg list(String startDate,String endDate,Integer projectId,Integer status,String submitUserId){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+
         LambdaQueryWrapper<GroupBudgetReview> queryWrapper = new LambdaQueryWrapper<GroupBudgetReview>().eq(GroupBudgetReview::getCompanyId, companyId).orderByDesc(GroupBudgetReview::getCreateTime);
         if(startDate!=null && endDate!=null){
             queryWrapper.between(GroupBudgetReview::getCreateTime,startDate,endDate);
@@ -164,6 +164,27 @@ public class GroupBudgetReviewController {
             queryWrapper.eq(GroupBudgetReview::getCreatorId,submitUserId);
         }
         List<GroupBudgetReview> list = groupBudgetReviewService.list(queryWrapper);
+        TimeType timeType = timeTypeMapper.selectById(companyId);
+        list.forEach(l->{
+            if(l.getOldManDay()!=null){
+                BigDecimal bigDecimal=new BigDecimal(l.getOldManDay());
+                bigDecimal=bigDecimal.multiply(new BigDecimal(timeType.getAllday()));
+                String format = String.format("%.1f", bigDecimal.doubleValue());
+                l.setOldEstimatedWorkTime(format);
+            }
+            if(l.getChangeManDay()!=null){
+                BigDecimal bigDecimal=new BigDecimal(l.getChangeManDay());
+                bigDecimal=bigDecimal.multiply(new BigDecimal(timeType.getAllday()));
+                String format = String.format("%.1f", bigDecimal.doubleValue());
+                l.setChangeEstimatedWorkTime(format);
+            }
+            if(l.getNowManDay()!=null){
+                BigDecimal bigDecimal=new BigDecimal(l.getNowManDay());
+                bigDecimal=bigDecimal.multiply(new BigDecimal(timeType.getAllday()));
+                String format = String.format("%.1f", bigDecimal.doubleValue());
+                l.setNowEstimatedWorkTime(format);
+            }
+        });
         httpRespMsg.setData(list);
         return httpRespMsg;
     }

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

@@ -172,7 +172,7 @@ public class ProjectController {
                                    Double outputValue,
                                    Integer deptId,
                                    @RequestParam(defaultValue = "false") boolean onlyChangeParticipate,
-                                   String buId,Integer manDay,String  manDayStartDate,String plate1,
+                                   String buId,Double manDay,String  manDayStartDate,String plate1,
                                    String plate2,
                                    String plate3,
                                    String plate4,

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -174,6 +175,8 @@ public class TaskGroupController {
     @RequestMapping("saveManDay")
     public HttpRespMsg saveManDay(String data) {
         HttpRespMsg msg = new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        TimeType timeType = timeTypeMapper.selectById(companyId);
         List<TaskGroup> groupList = JSON.parseArray(data, TaskGroup.class);
         List<TaskGroup> addList = new ArrayList<>();
         int totalManDay = 0;
@@ -197,7 +200,7 @@ public class TaskGroupController {
             }
             item.setId(taskGroup.getId());
             if (taskGroup.getManDay() == null) {
-                item.setManDay(0);
+                item.setManDay(0.0);
             } else {
                 item.setManDay(taskGroup.getManDay());
                 totalManDay += taskGroup.getManDay();
@@ -218,8 +221,17 @@ public class TaskGroupController {
         if (addList.size() > 0) {
             taskGroupService.updateBatchById(addList);
         }
-
-        msg.data = taskGroupService.list(new QueryWrapper<TaskGroup>().eq("project_id", groupList.get(0).getProjectId()));
+        List<TaskGroup> list = taskGroupService.list(new QueryWrapper<TaskGroup>().eq("project_id", groupList.get(0).getProjectId()));
+        list.forEach(l->{
+            //todo：计算项目预算工时
+            if(l.getManDay()!=null){
+                BigDecimal bigDecimal=new BigDecimal(l.getManDay());
+                bigDecimal=bigDecimal.multiply(new BigDecimal(timeType.getAllday()));
+                String format = String.format("%.1f", bigDecimal.doubleValue());
+                l.setEstimatedWorkTime(format);
+            }
+        });
+        msg.data = list;
         return msg;
     }
 
@@ -332,6 +344,8 @@ public class TaskGroupController {
     @RequestMapping("/list")
     public HttpRespMsg list(TaskGroup item) {
         HttpRespMsg msg = new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        TimeType timeType = timeTypeMapper.selectById(companyId);
         QueryWrapper<TaskGroup> queryWrapper = new QueryWrapper<TaskGroup>();
         queryWrapper.eq("project_id", item.getProjectId());
         if (taskGroupService.count(queryWrapper) == 0) {
@@ -410,7 +424,17 @@ public class TaskGroupController {
                 }
             }
         }
-        msg.data = taskGroupService.list(queryWrapper);
+        List<TaskGroup> list = taskGroupService.list(queryWrapper);
+        list.forEach(l->{
+            //todo：计算项目预算工时
+            if(l.getManDay()!=null){
+                BigDecimal bigDecimal=new BigDecimal(l.getManDay());
+                bigDecimal=bigDecimal.multiply(new BigDecimal(timeType.getAllday()));
+                String format = String.format("%.1f", bigDecimal.doubleValue());
+                l.setEstimatedWorkTime(format);
+            }
+        });
+        msg.data = list;
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/GroupBudgetReview.java

@@ -108,6 +108,26 @@ public class GroupBudgetReview extends Model<GroupBudgetReview> {
     @TableField("reject_reason")
     private String rejectReason;
 
+    /**
+     * 变更前预估工时
+     * */
+    @TableField(exist = false)
+    private String oldEstimatedWorkTime;
+
+    /**
+     * 预估工时变更
+     * */
+    @TableField(exist = false)
+    private String changeEstimatedWorkTime;
+
+    /**
+     * 变更后预估工时
+     * */
+    @TableField(exist = false)
+    private String nowEstimatedWorkTime;
+
+
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Project.java

@@ -355,7 +355,7 @@ public class Project extends Model<Project> {
      * 项目人天
      */
     @TableField("man_day")
-    private Integer manDay;
+    private Double manDay;
 
     /**
      * 项目人天管控开始日期

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TaskGroup.java

@@ -62,7 +62,7 @@ public class TaskGroup extends Model<TaskGroup> {
      * 预估工时：人天
      */
     @TableField("man_day")
-    private Integer manDay;
+    private Double manDay;
 
     @TableField(exist = false)
     private String uuid;
@@ -70,6 +70,12 @@ public class TaskGroup extends Model<TaskGroup> {
     @TableField(exist = false)
     private String projectIds;
 
+    /**
+     * 预估工时
+     * */
+    @TableField(exist = false)
+    private String estimatedWorkTime;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -49,7 +49,7 @@ public interface ProjectService extends IService<Project> {
                             String providerIds,
                             String providerNames,
                             HttpServletRequest request,
-                            ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Integer manDay,String manDayStartDate,String plate1,
+                            ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Double manDay,String manDayStartDate,String plate1,
                             String plate2,
                             String plate3,
                             String plate4,

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

@@ -315,7 +315,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     .mapToDouble(r->r.getWorkingTime()).sum();
             String rWorkTime=reallWorkTime==null ? "0":df.format(reallWorkTime);
             project.setReallyWorkTime(rWorkTime);
-            String pEstimatedWork=project.getManDay()==null ? 0*allday+"": project.getManDay()*allday+"";
+            String pEstimatedWork=Integer.valueOf(String.valueOf(project.getManDay()))==null ? 0*allday+"": project.getManDay()*allday+"";
             project.setEstimatedWorkTime(pEstimatedWork);
             List<TaskGroup> taskGroupCollect = taskGroups.stream().filter(t -> t.getProjectId().equals(project.getId())).collect(Collectors.toList());
 
@@ -699,7 +699,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                    String providerIds,
                                    String providerNames,
                                    HttpServletRequest request,
-                                   ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Integer manDay,String  manDayStartDate,String plate1,
+                                   ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Double manDay,String  manDayStartDate,String plate1,
                                    String plate2,
                                    String plate3,
                                    String plate4,
@@ -2231,6 +2231,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     public HttpRespMsg detail(Integer id, HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("token"));
         Integer companyId = user.getCompanyId();
+        TimeType timeType = timeTypeMapper.selectById(companyId);
         Project project = projectMapper.selectById(id);
         List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
         if (project.getInchargerId() != null) {
@@ -2257,6 +2258,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         } else {
             participator = participationMapper.getParticipator(id);
         }
+        //todo：计算项目预算工时
+        if(project.getManDay()!=null){
+            BigDecimal bigDecimal=new BigDecimal(project.getManDay());
+            bigDecimal=bigDecimal.multiply(new BigDecimal(timeType.getAllday()));
+            String format = String.format("%.1f", bigDecimal.doubleValue());
+            project.setEstimatedWorkTime(format);
+        }
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId).eq("is_active", 1));
         project.setParticipationList(participator);
         //项目日报审核人

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

@@ -99,7 +99,7 @@
                 <template slot-scope="scope">
                     <div>
                         <span>
-                            {{ scope.row.oldManDay }}
+                            {{ scope.row.oldManDay }}人天 / {{ scope.row.oldEstimatedWorkTime }}小时
                         </span>
                     </div>
                 </template>
@@ -109,7 +109,7 @@
                 <template slot-scope="scope">
                     <div>
                         <span>
-                            {{ scope.row.changeManDay }}
+                            {{ scope.row.changeManDay }}人天 / {{ scope.row.changeEstimatedWorkTime }}小时
                         </span>
                     </div>
                 </template>
@@ -119,7 +119,7 @@
                 <template slot-scope="scope">
                     <div>
                         <span>
-                            {{ scope.row.nowManDay }}
+                            {{ scope.row.nowManDay }}人天 / {{ scope.row.nowEstimatedWorkTime }}小时
                         </span>
                     </div>
                 </template>

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

@@ -634,7 +634,8 @@
                     <!-- 增加项目人天字段 绎维固定字段 -->
                     <el-form-item  v-if="user.timeType.projectManDay == 1 && (user.company.nonProjectSimple == 0 || (user.company.nonProjectSimple == 1 && addForm.isPublic == 0))">
                         <template slot="label"><span v-if="manDaySetting.projectManDayFillMode == 2 || (manDaySetting.projectManDayFillMode == 1 && addForm.fromOutside == 0)" style="padding:5px;color:red;">*</span>项目人天</template>
-                        <el-input v-model.number="addForm.manDay" :placeholder="$t('peaseenterthe')" @input="jisuanEstimatedWorkTime(addForm.manDay)"  style="width: 100px"></el-input><span style="margin-left:10px;position:absolute;">人天(预估工时：{{this.estimatedWorkTime}}h)</span>
+                        <el-input v-model.number="addForm.manDay" :placeholder="$t('peaseenterthe')" @input="jisuanEstimatedWorkTime(addForm.manDay)"  style="width: 100px"></el-input>
+                        <span style="margin-left:10px;position:absolute;">人天(预估工时：<el-input size="small" v-model.number="addForm.estimatedWorkTime" :placeholder="$t('peaseenterthe')" @input="jisuanManDay(addForm.estimatedWorkTime)"  style="width: 100px"></el-input>h)</span>
                         <el-tooltip effect="dark" :content="$t('根据系统基础设置每日正常工作时长计算,1人天为一个每日正常工作时长')" placement="top-start" style="margin-left:180px">
                                         <i class="el-icon-question" style="color:#606266"></i>
                         </el-tooltip>
@@ -4996,6 +4997,7 @@ a {
                     if (res.code == "ok") {
                         this.chulishuju(res.data)
                         this.estimatedWorkTime=res.data.estimatedWorkTime==null?0:res.data.estimatedWorkTime
+                        this.addForm.estimatedWorkTime=res.data.estimatedWorkTime==null?0:res.data.estimatedWorkTime
                     }
                     });
                     //编辑时，非 （管理全部项目，项目创建人，项目经理），有编辑项目参与人权限的人，可以进行参与人的修改
@@ -5770,7 +5772,11 @@ a {
 
             //计算预估工时
             jisuanEstimatedWorkTime(manDay){
-                this.estimatedWorkTime=manDay*this.user.timeType.allday
+                this.addForm.estimatedWorkTime=manDay*this.user.timeType.allday
+            },
+            //计算预估工时
+            jisuanManDay(estimatedWorkTime){
+                this.addForm.manDay=estimatedWorkTime/this.user.timeType.allday
             },
             getProjectList(){
                 this.http.post(this.port.project.list,{

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

@@ -1146,18 +1146,24 @@
             </div>
         </el-dialog>
         
-        <el-dialog title="设置分组预估工时" v-if="modGroupManDayDialog" :visible.sync="modGroupManDayDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog title="设置分组预估工时" v-if="modGroupManDayDialog" :visible.sync="modGroupManDayDialog" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-table :data="groupList" :key="modGroupManDayKey" size="small" :height="'400px'" show-summary="true">
                 <el-table-column prop="name" label="分组名称">
                 </el-table-column>
-                <el-table-column prop="manDay" width="200" label="预估工时" >
+                <el-table-column prop="manDay" width="200" label="预估工时(人天)" >
                     <template slot-scope="scope">
-                        <el-input v-model="scope.row.manDay" type="number" :placeholder="$t('peaseenterthe')" maxlength="10" :max="99999" style="width:120px;" :disabled="scope.row.disabled"></el-input>&nbsp;人天&nbsp;
+                        <el-input v-model="scope.row.manDay" type="number" @input="jisuanEstimatedWorkTime(scope.row.manDay,scope.row.id)" :placeholder="$t('peaseenterthe')" maxlength="10" :max="99999" style="width:120px;" :disabled="scope.row.disabled"></el-input>&nbsp;人天&nbsp;
+                        <!-- <i v-if="user.companyId=3092 && scope.row.disabled"  @click="changeBudget(scope.row)"  class="el-icon-circle-plus-outline"></i> -->
+                    </template>
+                </el-table-column>
+                <el-table-column prop="estimatedWorkTime" width="200" label="预估工时(小时)" >
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.estimatedWorkTime" type="number"  @input="jisuanManDay(scope.row.estimatedWorkTime,scope.row.id)" :placeholder="$t('peaseenterthe')" maxlength="10" :max="99999" style="width:120px;" :disabled="scope.row.disabled"></el-input>&nbsp;小时&nbsp;
                         <i v-if="user.companyId=3092 && scope.row.disabled"  @click="changeBudget(scope.row)"  class="el-icon-circle-plus-outline"></i>
                     </template>
                 </el-table-column>
             </el-table>
-            <p style="text-align:center;">当前项目预估工时为：{{ currentProject.manDay == null? 0:currentProject.manDay }}人天</p>
+            <p style="text-align:center;">当前项目预估工时为：{{ currentProject.manDay == null? 0:currentProject.manDay }}人天 {{ currentProject.estimatedWorkTime == null? 0:currentProject.estimatedWorkTime }}小时</p>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="setManDayData()" style="width:100%;" >{{ $t('save') }}</el-button>
             </div>
@@ -1165,11 +1171,12 @@
 
         <el-dialog title="预估工时变更" v-if="changeBudgetDig" :visible.sync="changeBudgetDig" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-form :model="groupBudgetData" label-width="120px">
-                <el-form-item :label="'原预估工时'"><span>{{groupBudgetData.manDay}}{{ '人天' }}</span></el-form-item>
+                <el-form-item :label="'原预估工时'"><span>{{groupBudgetData.manDay}}{{ '人天' }} / {{groupBudgetData.estimatedWorkTime}}{{ '小时' }}</span></el-form-item>
                 <el-form-item :label="'预估工时修改'" prop="changeManDay">
-                   <el-input v-model="groupBudgetData.changeManDay" type="number" @change="changeNowManDay(groupBudgetData)" :placeholder="$t('peaseenterthe')" maxlength="10" :max="99999" style="width:120px;"></el-input>&nbsp;人天
+                   <el-input v-model="groupBudgetData.changeManDay"  type="number"  @input="changeNowManDay(groupBudgetData)" :placeholder="$t('peaseenterthe')" maxlength="10" :max="99999" style="width:120px;"></el-input>&nbsp;人天
+                   <el-input v-model="groupBudgetData.changeEstimatedWorkTime"  type="number" @input="changeEstimatedWorkTime(groupBudgetData)" :placeholder="$t('peaseenterthe')" maxlength="10" :max="99999" style="width:120px;"></el-input>&nbsp;小时
                 </el-form-item>
-                <el-form-item :label="'变更后预估工时'"><span>{{nowManDay}}{{'人天'}}</span></el-form-item>
+                <el-form-item :label="'变更后预估工时'"><span>{{nowManDay}}{{'人天'}} / {{nowEstimatedWorkTime}}{{'小时'}}</span></el-form-item>
                 <el-form-item :label="'变更理由'">
                     <el-input
                         type="textarea"
@@ -1525,6 +1532,7 @@
                 changeBudgetDig:false,
                 groupBudgetData:{},
                 nowManDay:0,
+                nowEstimatedWorkTime:0,
 
                 modGroupManDayKey: 1
             };
@@ -2702,7 +2710,28 @@
                             });
                         });
             },
-                  
+            //计算预估工时
+            jisuanEstimatedWorkTime(manDay,groupId){
+                if(groupId){
+                    this.groupList.forEach(item=>{
+                        if(item.id==groupId){
+                            item.estimatedWorkTime=manDay*this.user.timeType.allday
+                        }
+                    })
+                }
+                
+            },
+            //计算预估工时
+            jisuanManDay(estimatedWorkTime,groupId){
+                if(groupId){
+                    this.groupList.forEach(item=>{
+                        if(item.id==groupId){
+                            item.manDay=estimatedWorkTime/this.user.timeType.allday
+                        }
+                    })
+                }
+            
+            },    
             toggleGroup() {
                 if (this.groupWidth == 0) {
                     this.groupWidth = 260;
@@ -2934,11 +2963,20 @@
                 this.changeBudgetDig=true,
                 this.groupBudgetData=task,
                 this.nowManDay=(this.groupBudgetData.changeManDay==null?0:parseInt(this.groupBudgetData.changeManDay))+(this.groupBudgetData.manDay==null?0:parseInt(this.groupBudgetData.manDay))
+                this.nowEstimatedWorkTime=(this.groupBudgetData.changeEstimatedWorkTime==null?0:parseInt(this.groupBudgetData.changeEstimatedWorkTime))+(this.groupBudgetData.estimatedWorkTime==null?0:parseInt(this.groupBudgetData.estimatedWorkTime))
             },
             //预估工时变更
             changeNowManDay(task){
-                console.log(task)
-                this.nowManDay=(this.groupBudgetData.changeManDay==null?0:parseInt(this.groupBudgetData.changeManDay))+(this.groupBudgetData.manDay==null?0:parseInt(this.groupBudgetData.manDay))
+                this.nowManDay=(this.groupBudgetData.changeManDay==null||this.groupBudgetData.changeManDay==''?0:parseInt(this.groupBudgetData.changeManDay))+(this.groupBudgetData.manDay==null||this.groupBudgetData.manDay==''?0:parseInt(this.groupBudgetData.manDay))
+                this.groupBudgetData.changeEstimatedWorkTime=(this.groupBudgetData.changeManDay==null||this.groupBudgetData.changeManDay==''?0:this.groupBudgetData.changeManDay)*this.user.timeType.allday
+                this.nowEstimatedWorkTime=this.nowManDay*this.user.timeType.allday
+                
+            },
+            //预估工时变更
+            changeEstimatedWorkTime(task){
+                this.nowEstimatedWorkTime=(this.groupBudgetData.changeEstimatedWorkTime==null||this.groupBudgetData.changeEstimatedWorkTime==''?0:parseInt(this.groupBudgetData.changeEstimatedWorkTime))+(this.groupBudgetData.estimatedWorkTime==null||this.groupBudgetData.estimatedWorkTime==''?0:parseInt(this.groupBudgetData.estimatedWorkTime))
+                this.groupBudgetData.changeManDay=(this.groupBudgetData.changeEstimatedWorkTime==null||this.groupBudgetData.changeEstimatedWorkTime==''?0:this.groupBudgetData.changeEstimatedWorkTime)/this.user.timeType.allday
+                this.nowManDay=this.nowEstimatedWorkTime/this.user.timeType.allday
             },
             changeBudgetTrue(groupBudgetData){
                 let param;