Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

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

@@ -413,7 +413,7 @@ public class WxCorpInfoController {
                         report.setCreatorId(user.get().getId());
                         report.setCreateTime(LocalDateTime.now());
                         BigDecimal bigDecimal = new BigDecimal(workTime);
-                        bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum()));
+                        bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum()),1,RoundingMode.HALF_UP);
                         report.setWorkingTime(bigDecimal.doubleValue()*60);
                         bigDecimal=bigDecimal.multiply(price);
                         report.setCost(bigDecimal);

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

@@ -553,7 +553,7 @@ public class TimingTask {
                         report.setCreatorId(user.get().getId());
                         report.setCreateTime(LocalDateTime.now());
                         BigDecimal bigDecimal = new BigDecimal(workTime);
-                        bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum()));
+                        bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum()),1,RoundingMode.HALF_UP);
                         report.setWorkingTime(bigDecimal.doubleValue()*60);
                         bigDecimal=bigDecimal.multiply(price);
                         report.setCost(bigDecimal);

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -279,7 +279,7 @@
                 <el-button size="small" type="primary" @click="handJue">{{ $t('modifyingRoles') }}</el-button>
                 <el-button size="small" type="primary" @click="workingHoursDialogClick()">{{ $t('xiuZhengGongShiSuoShuBuMen') }}</el-button>
                 <el-button size="small" type="primary" @click="handleSelectionUser()">{{ $t('piLiangQiYongYuanGong') }}</el-button>
-                <el-button size="small" type="primary" @click="showUserGroupVisable()">批量修改分组</el-button>
+                <el-button size="small" type="primary" v-if="permissions.userGroupManage" @click="showUserGroupVisable()">批量修改分组</el-button>