Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -537,8 +537,8 @@ public class ProjectController {
     }
 
     @RequestMapping("/exportUserWorkingTimeList")
-    public HttpRespMsg exportUserWorkingTimeList(String userId,Integer projectId,String startDate, String endDate){
-        return projectService.exportUserWorkingTimeList(userId,projectId,startDate,endDate,request);
+    public HttpRespMsg exportUserWorkingTimeList(String userId,Integer projectId,String startDate, String endDate,Integer departmentId){
+        return projectService.exportUserWorkingTimeList(userId,projectId,startDate,endDate,request,departmentId);
     }
 
     /**

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

@@ -25,5 +25,5 @@ public interface LeaveSheetMapper extends BaseMapper<LeaveSheet> {
 
     List<LeaveSheet> selectLeave(Integer companyId, String startDate, String endDate);
 
-    List<Map<String,Object>> selectLeaveAll(Integer companyId, String startDate, String endDate);
+    List<Map<String,Object>> selectLeaveAll(Integer companyId, String startDate, String endDate,List<Integer> branchDepartment,List<Integer> deptIds);
 }

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

@@ -148,7 +148,7 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg getUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate, Integer pageIndex, Integer pageSize,HttpServletRequest request,Integer departmentId);
 
-    HttpRespMsg exportUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate,HttpServletRequest request);
+    HttpRespMsg exportUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate,HttpServletRequest request,Integer departmentId);
 
     HttpRespMsg getUserReportTimelinessRate(HttpServletRequest request, String startDate, String endDate, Integer departmentId, String userId,Integer pageIndex,Integer pageSize);
 

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

@@ -5814,8 +5814,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Override
     public HttpRespMsg getUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate, Integer pageIndex, Integer pageSize,HttpServletRequest request,Integer departmentId) {
         //1.获取分页结果
-        Integer size=pageSize;//查询条数
-        Integer start =(pageIndex-1)*size;//limit开始
+        if (pageSize!=null && pageIndex!=null){
+            Integer size=pageSize;//查询条数
+            Integer start =(pageIndex-1)*size;//limit开始
+        }
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
@@ -5908,7 +5910,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             li.put("proportion",nf.format(divide));
         });
         //全月请假人员
-        List<Map<String, Object>> maps = leaveSheetMapper.selectLeaveAll(companyId, startDate, endDate);
+        List<Map<String, Object>> maps = leaveSheetMapper.selectLeaveAll(companyId, startDate, endDate,branchDepartment,deptIds);
         TimeType timetype = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", user.getCompanyId()));
         List<Map<String, Object>> leaveStaff = new ArrayList<>();
         //去重
@@ -5938,10 +5940,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             if (!stringObjectHashMap.containsKey("deptName")){
                 stringObjectHashMap.put("deptName","未分配");
             }
-            stringObjectHashMap.put("isPublic",0);
+            stringObjectHashMap.put("isPublic",0.0);
             stringObjectHashMap.put("jobNumber",map.get("jobNumber"));
-            Double leaveHours = 0.0;
-            int days = WorkDayCalculateUtils.getWorkDaysListInRange(map.get("startDate").toString(),map.get("endDate").toString(), 0).size();
+            double leaveHours = 0.0;
+            //int days = WorkDayCalculateUtils.getWorkDaysListInRange(map.get("startDate").toString(),map.get("endDate").toString(), 0).size();
             for (Map<String, Object> stringObjectMap : collectMap) {
                 if (map.get("id").toString().equals(stringObjectMap.get("id"))){
                     LocalDate leaveStart = LocalDate.parse(map.get("startDate").toString(), dateTimeFormatter);
@@ -5974,7 +5976,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             leaveHours = new BigDecimal(leaveHours).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
             stringObjectHashMap.put("leaveSum",leaveHours+"h");
             stringObjectHashMap.put("proportion","0%");
-            stringObjectHashMap.put("unPublic",0);
+            stringObjectHashMap.put("unPublic",0.0);
             stringObjectHashMap.put("userId",map.get("id"));
             if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1){
                 stringObjectHashMap.put("username",map.get("wxOpenId"));
@@ -6023,44 +6025,21 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg exportUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate,HttpServletRequest request) {
+    public HttpRespMsg exportUserWorkingTimeList(String userId, Integer projectId, String startDate, String endDate,HttpServletRequest request,Integer departmentId) {
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-        List<SysRichFunction> functionAllList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "全公司工时分配");
-        List<SysRichFunction> functionDeptList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "负责部门工时分配");
-        List<Integer> deptIds=null;
-        List<Department> allDepartmentList=departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",user.getCompanyId()));
-        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()).eq("company_id",user.getCompanyId()));
-        List<DepartmentOtherManager> departmentOtherManagerList = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("other_manager_id", user.getId()));
-        //判断查看权限
-        if(functionAllList.size()==0){
-            deptIds=new ArrayList<>();
-            deptIds.add(-1);
-            if(functionDeptList.size()>0){
-                List<Integer> collect = departmentList.stream().distinct().map(dm -> dm.getDepartmentId()).collect(Collectors.toList());
-                List<Integer> otherCollect = departmentOtherManagerList.stream().distinct().map(dom -> dom.getDepartmentId()).collect(Collectors.toList());
-                collect.addAll(otherCollect);
-                for (Integer integer : collect) {
-                    List<Integer> branchDepartment = getBranchDepartment(integer, allDepartmentList);
-                    deptIds.addAll(branchDepartment);
-                }
-            }
-        }
-        List<Map<String, Object>> list = projectMapper.getUserWorkingTimeList(userId, user.getCompanyId(), startDate, endDate, projectId,null,null,null,deptIds);
+        HttpRespMsg userWorkingTimeList = getUserWorkingTimeList(userId,projectId,startDate, endDate, null,null,request,departmentId);
+        HashMap result = (HashMap) userWorkingTimeList.data;
+        List<Map<String, Object>> resultList = (List<Map<String, Object>>) result.get("result");
         //String[] string={"人员","部门","工号","普通项目工时","公共项目工时","请假时长","总工时","公共项目工时占比"};
         String[] string={MessageUtils.message("entry.personnel"),MessageUtils.message("excel.department"),MessageUtils.message("entry.No"),MessageUtils.message("entry.GenProHours"),MessageUtils.message("entry.PubProHours"),MessageUtils.message("leave.duration"),MessageUtils.message("entry.totalManHours"),MessageUtils.message("entry.PubProHoursProp")};
         List<List<String>> dataList=new ArrayList<>();
         dataList.add(Arrays.asList(string));
         Integer companyId = user.getCompanyId();
-        List<LeaveSheet> leaveSheet = leaveSheetMapper.selectLeave(companyId,startDate,endDate);
         List<Department> deptName = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
-        TimeType allDay = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", companyId));
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate localStartDate = LocalDate.parse(startDate, dateTimeFormatter);
-        LocalDate localEndDate = LocalDate.parse(endDate, dateTimeFormatter);
-        for(Map<String,Object> item:list){
+        for(Map<String,Object> item:resultList){
             //取部门名
             for (Department department : deptName) {
                 if (item.get("deptId").toString().equals(department.getDepartmentId().toString())){
@@ -6069,47 +6048,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }else {
                         item.put("deptName",getSupDepartment(department));
                     }
-                    continue;
+                    break;
                 }
             }
             if (!item.containsKey("deptName")){
                 item.put("deptName","未分配");
             }
-            //计算请假时间
-            Float leaveSum = 0F;
-            for (LeaveSheet sheet : leaveSheet) {
-                if (sheet.getOwnerId().equals(item.get("userId"))){
-//                    System.err.println(sheet.getOwnerName());
-//                    System.err.println(sheet.getStartDate());
-//                    System.err.println(sheet.getEndDate());
-                    Float timeHours = sheet.getTimeHours();
-                    //若请假开始时间不在筛选时间内
-                    if (sheet.getStartDate().isBefore(localStartDate)) {
-                        long day = localStartDate.toEpochDay() - sheet.getStartDate().toEpochDay();
-                        timeHours -= day * allDay.getAllday();
-//                        System.err.println("请假开始时间不在筛选时间内,应减去" + day * allDay.getAllday()+"小时");
-                    }
-                    //若请假结束时间不在筛选时间内
-                    if (sheet.getEndDate().isAfter(localEndDate)) {
-                        long day = sheet.getEndDate().toEpochDay() - localEndDate.toEpochDay();
-                        timeHours -= day * allDay.getAllday();
-//                        System.err.println("请假结束时间不在筛选时间内,应减去"+day * allDay.getAllday()+"小时");
-                    }
-//                    System.err.println("计算完的时间为：" + timeHours);
-                    leaveSum += timeHours;
-                }
-            }
-//            System.err.println("总时间为："+leaveSum);
-            item.put("leaveSum",leaveSum + "h");
-            double workTimeDouble = Double.parseDouble(item.get("workingTime").toString()) + leaveSum;
-            BigDecimal workTimeBig = new BigDecimal(workTimeDouble);
-            item.put("workingTime",workTimeBig.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
             List<String> subList=new ArrayList<>();
-            double isPublic = (double) item.get("isPublic");
-            double workingTime = (double) item.get("workingTime");
-            BigDecimal bdIsPublic=new BigDecimal(isPublic);
-            BigDecimal divide = bdIsPublic.divide(BigDecimal.valueOf(workingTime),2,BigDecimal.ROUND_HALF_UP);
-            NumberFormat nf = NumberFormat.getPercentInstance();
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 subList.add("$userName="+(item.get("corpwxUserId")==null?"":item.get("corpwxUserId"))+"$");
             }else {
@@ -6121,7 +6066,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             subList.add(String.valueOf(item.get("isPublic")));
             subList.add(String.valueOf(item.get("leaveSum")));
             subList.add(String.valueOf(item.get("workingTime")));
-            subList.add(String.valueOf(nf.format(divide)));
+            subList.add(String.valueOf(item.get("proportion")));
             dataList.add(subList);
         }
         //生成excel文件导出

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

@@ -646,7 +646,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             requestMap.put("query_word", keyword);
             requestMap.put("query_type", 1);
             requestMap.put("query_range", 1);
-            requestMap.put("limit", 20);
+            requestMap.put("limit", 200);
             requestMap.put("cursor", cursor);
             HttpEntity<JSONObject> entity = new HttpEntity<>(requestMap, headers);
             ResponseEntity<String> ResponseEntity = restTemplate.postForEntity(url, entity, String.class);
@@ -692,7 +692,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", WXCompanyId));
         HashMap<String, Object> data = new HashMap<>();
         httpRespMsg.data=data;
-        data.put("total",0);
         //当企业开启了微信通讯录的情况下
         if (org.apache.commons.lang3.StringUtils.isNotBlank(keyword) && wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1 && departmentId == -1){
             System.out.println("====================开始查询通讯录名单======================");
@@ -700,8 +699,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             List users = result.get("user");
             if (users.size()!=0){
                 List<User> realUser = userMapper.selectList(new QueryWrapper<User>().in("corpwx_userid", users));
+                long total = realUser.size();
                 data.put("records",realUser);
                 data.put("nextCursor",result.get("nextCursor").get(0));
+                data.put("total",total);
                 return httpRespMsg;
             }else {
                 System.err.println("======================user列表没有查询到数据===========================");
@@ -709,6 +710,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 ArrayList<Object> records = new ArrayList<>();
                 data.put("records",records);
                 data.put("nextCursor","");
+                data.put("total",0);
                 return httpRespMsg;
             }
         }else {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -400,7 +400,7 @@ entry.mainProject=主项目
 entry.projectId=项目编号
 entry.contractNo=合同编号
 entry.projectType=项目分类
-entry.publicProject=是否为公共项目
+entry.publicProject=是否为非项目
 entry.projectName=项目名称
 entry.groupName=分组名称
 entry.groupCharge=分组负责人
@@ -474,10 +474,10 @@ entry.totalLaborCostIncurred=已发生总工时成本
 entry.costBudget=成本预算
 entry.repCost=已填报成本
 entry.proFilledIn=已填报占比
-entry.GenProHours=普通项目工时
-entry.PubProHours=公共项目工时
+entry.GenProHours=正式项目工时
+entry.PubProHours=非项目工时
 entry.totalManHours=总工时
-entry.PubProHoursProp=公共项目工时占比
+entry.PubProHoursProp=非项目工时占比
 entry.timely=及时
 entry.NoTimely=不及时
 entry.SubTime=提交时间
@@ -535,7 +535,7 @@ fileName.monthWork=月度工时表
 fileName.deptJoinPro=部门参与项目情况表
 fileName.leaveRemaining = 假期剩余表
 #excel
-excel.publicProject=是否为公共项目
+excel.publicProject=是否为非项目
 excel.projectName=项目名称必填
 excel.manyPeople=多个参与人(姓名/工号)使用中文逗号(，)隔开
 excel.manyPeoplePlus=多个参与人(工号)使用中文逗号(，)隔开
@@ -544,8 +544,8 @@ excel.projectManagerPlus=项目经理(姓名/工号)需存在于参与人中
 excel.projectCharge=负责人需存在于参与人中
 excel.dateFormat=日期格式:yyyy-MM-dd
 excel.forExample=例如: 2021-01-01
-excel.yesPublic=是：公共项目
-excel.noPublic=否：普通项目
+excel.yesPublic=是：非项目
+excel.noPublic=否：正式项目
 excel.yes=是
 excel.no=否
 excel.normal=正常

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -400,7 +400,7 @@ entry.mainProject=Main project
 entry.projectId=project No
 entry.contractNo=Contract No
 entry.projectType=Project classification
-entry.publicProject=Whether it is a public project
+entry.publicProject=Whether it is a non project
 entry.projectName=project name
 entry.groupName=Group Name
 entry.groupCharge=Group leader
@@ -474,10 +474,10 @@ entry.totalLaborCostIncurred=Total labor cost incurred
 entry.costBudget=Cost Budget
 entry.repCost=Reported cost
 entry.proFilledIn=Proportion filled in
-entry.GenProHours=General Project Hours
-entry.PubProHours=Public Project Hours
+entry.GenProHours=Formal project man hours
+entry.PubProHours=Non Project Work
 entry.totalManHours=Total man hours
-entry.PubProHoursProp=Proportion of public project man hours
+entry.PubProHoursProp=Proportion of non project man hours
 entry.timely=timely
 entry.NoTimely=Not timely
 entry.SubTime=Submission time
@@ -535,7 +535,7 @@ fileName.monthWork=Monthly man hour Table
 fileName.deptJoinPro=Department Participation in Projects
 fileName.leaveRemaining = Leave Remaining Table
 #excel
-excel.publicProject=Whether it is a public project
+excel.publicProject=Whether it is a non project
 excel.projectName=Project name is required
 excel.manyPeople=Multiple participants (name/jobNumber) are separated by commas (,)
 excel.manyPeoplePlus=Multiple participants (jobNumber) are separated by commas (,)
@@ -544,8 +544,8 @@ excel.projectManagerPlus=The project manager (jobNumber) must exist in the parti
 excel.projectCharge=The person in charge must exist in the participants
 excel.dateFormat=Date Format:yyyy-MM-dd
 excel.forExample=for example: 2021-01-01
-excel.yesPublic=yes：public project
-excel.noPublic=no：average project
+excel.yesPublic=Yes: Non project
+excel.noPublic=No: formal project
 excel.yes=yes
 excel.no=no
 excel.normal=normal

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

@@ -63,5 +63,17 @@
         on user.id = leave_sheet.owner_id
         where user.company_id = #{companyId} and leave_sheet.status=0
         and leave_sheet.start_date <=#{endDate} and leave_sheet.end_date >=#{startDate}
+        <if test="branchDepartment!=null and branchDepartment.size()>0">
+            and user.department_id in
+            <foreach collection="branchDepartment" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="deptIds!=null and deptIds.size()>0">
+            and user.department_id in
+            <foreach collection="deptIds" open="(" item="item" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
 </mapper>

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

@@ -28,7 +28,7 @@
             type="month" 
             ></el-date-picker>
 
-            <el-radio-group v-model="radio" @change="getEchart" style="margin-left:10px;"  size="small">
+            <el-radio-group v-model="radio" @change="getEchart" style="margin-left:10px;"  size="small" :disabled="radioLoading">
                 <el-radio-button :label="$t('other.project')"></el-radio-button>
                 <el-radio-button :label="$t('zhu-xiang-mu')" v-if="user.timeType.mainProjectState"></el-radio-button>
                 <el-radio-button :label="$t('projectclassification')"></el-radio-button>
@@ -42,14 +42,15 @@
                 <el-option v-for="item in customList" :key="item.id" :label="item.name" :value="item.name"></el-option>
             </el-select> -->
 
-            <el-select v-model="personnelValue" filterable clearable :placeholder="$t('pleaseselectpersonnel')"  size="small" style="margin-top: 10px;width: 350px" v-if="radio == $t('ren-yuan') && user.userNameNeedTranslate != '1'" @change="personnel()">
+            <el-select v-model="personnelValue" filterable clearable :placeholder="hasReportUserList.length == 0 ? $t('nodata') : $t('pleaseselectpersonnel')"  size="small" style="margin-top: 10px;width: 350px" v-if="radio == $t('ren-yuan') && user.userNameNeedTranslate != '1'" @change="personnel()"
+            :disabled="hasReportUserList.length == 0 ? true : false">
                 <el-option v-for="item in hasReportUserList" :key="item.id" :label="item.name" :value="item.name">
                     <span style="float: left">{{ item.name }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px" v-if="item.jobNumber">{{ item.jobNumber }}</span>
                 </el-option>
             </el-select>
             <span style="text-align: left">
-            <selectCat v-if="radio == $t('ren-yuan') && user.userNameNeedTranslate == '1'" :size="'small'" :widthStr="'350'" :distinction="'2'" :subject="hasReportUserList" :clearable="true" @selectCal="selectCal"></selectCat>
+            <selectCat v-if="radio == $t('ren-yuan') && user.userNameNeedTranslate == '1'" :size="'small'" :widthStr="'350'" :distinction="'2'" :subject="hasReportUserList" :clearable="true" @selectCal="selectCal" :disabled="hasReportUserList.length == 0 ? true : false"></selectCat>
             </span>
 
         </el-col>
@@ -61,7 +62,7 @@
         <!-- <div id="clearfix" :style="'width:'+widthHtval+'px;position: relative; height:'+containerHeight+'px;'">
              <div id="container" :style="'height:'+containerHeight+'px;width:100%'"></div>
         </div> -->
-        <div id="clearfix" :class="radio == $t('ren-yuan') ? 'ryuans' : ''" :style="'overflow-x: auto;width:100%;padding-bottom: 100px; position: relative; height:'+containerHeight+'px;'">
+        <div id="clearfix" :class="radio == $t('ren-yuan') ? 'ryuans' : ''" :style="'overflow-x: auto;width:100%;padding-bottom: 100px; position: relative; height:'+containerHeight+'px;'" v-loading="radioLoading">
             <div id="container" :style="'height:'+(containerHeight - 20)+'px;width:100%'"></div>
             <div class="poss">
                 <el-pagination
@@ -227,7 +228,8 @@
                 customId: '',
                 customName: '',
                 customList: [],
-                departmentList: []
+                departmentList: [],
+                radioLoading: false
             };
         },
         methods: {
@@ -270,13 +272,6 @@
                 });
             },
             getUsers() {
-                // console.log(this.port.manage.list)
-                // this.http.post(this.port.manage.list, {
-                //         departmentId: -1,
-                //         pageIndex: 1,
-                //         // pageSize: 99999
-                //         pageSize: -1
-                //     },
                 this.http.post('/user/getSimpleActiveUserList', {},
                     res => {
                         if (res.code == "ok") {
@@ -399,7 +394,6 @@
                 }
                 this.http.post(url, param,
                     res => {
-                        this.listLoading = false;
                         if (res.code == "ok") {
                             this.exportDialog = false;
                             var aTag = document.createElement('a');
@@ -414,7 +408,6 @@
                         }
                     },
                     error => {
-                        this.listLoading = false;
                         this.$message({
                             message: error,
                             type: "error"
@@ -428,7 +421,7 @@
                     var arrlist = JSON.parse(JSON.stringify(this.personnelAllPlly))
                     var arr = []
                     for(var i in arrlist.list) {
-                        console.log(arrlist.list[i].name, this.personnelValue)
+                        // console.log(arrlist.list[i].name, this.personnelValue)
                         if(arrlist.list[i].name == this.personnelValue) {
                             arr.push(arrlist.list[i])
                         }
@@ -461,7 +454,6 @@
             },
             //获取人员成本统计列表
             getUserCostList() {
-                this.listLoading = true;
                 // console.log(this.port.project.userCost, '获取人员成本统计列表')
                 // console.log(this.user.timeType.fixMonthcost)
                 // console.log(Boolean(this.dateRange))
@@ -479,7 +471,7 @@
                     endDate: endDateNum
                 },
                 res => {
-                    this.listLoading = false;
+                    this.radioLoading = false
                     var _this = this;
                     this.hasReportUserList = [];
                     if (res.code == "ok") {
@@ -510,7 +502,7 @@
                         } else {
                             this.personnelAll = res.data
                             this.allListData = res.data
-                            console.log('人员返回', this.allListData);
+                            // console.log('人员返回', this.allListData);
                             this.gtff()
                         }
                     } else {
@@ -521,7 +513,7 @@
                     }
                 },
                 error => {
-                    this.listLoading = false;
+                    this.radioLoading = false
                     this.$message({
                         message: error + '外面',
                         type: "error"
@@ -790,7 +782,7 @@
             // 脱离出来的方法
             jieliu() {
                 sessionStorage.radio = this.radio;
-                
+                this.radioLoading = true
                 var param = {};
                 if (this.dateRange != null) {
                     param = {
@@ -824,9 +816,11 @@
                     param.fieldName = this.theCustomListPlant
                     // console.log(param, '要传的数据')
                 }
+                
                 this.http.post(url, param,
                 res => {
                     if (res.code == "ok") {
+                        this.radioLoading = false
                         let alltime = 0
                         if(this.radio==this.$t('other.project') || this.radio == this.$t('zhu-xiang-mu') || this.radio==this.$t('projectclassification')){
                             for(let i in res.data.costList){
@@ -856,10 +850,8 @@
                             }
                         }
                         this.allListData = res.data
-                        console.log(this.allListData, '部门数据')
                         this.page = 1
                         if(this.user.userNameNeedTranslate == '1' && this.radio == this.$t('lable.department')) {
-                            console.log('进入我处理的方法')
                             let arr = []
                             for(var i in this.allListData.costList) {
                                 let obj = {}
@@ -872,6 +864,7 @@
                             this.jieliu_echarts()
                         }
                     } else {
+                        this.radioLoading = false
                         this.$message({
                             message: res.msg,
                             type: "error"
@@ -879,6 +872,7 @@
                     }
                 },
                 error => {
+                    this.radioLoading = false
                     this.$message({
                         message: error,
                         type: "error"
@@ -893,9 +887,6 @@
                         const result = await new Promise((resolve, reject) => {
                             if(WWOpenData.prefetch) {
                                  WWOpenData.prefetch({ items }, (err, data) => {
-                                    console.log(items)
-                                    console.log(err)
-                                    console.log(data)
                                     if (err) { return reject(err) }
                                     resolve(data)
                                 })
@@ -911,7 +902,6 @@
                     myFunOne()
             },
             dealWithTranslationPlone(items, dataList) {
-                    console.log(items, '过来道德值')
                     if (WWOpenData.initCanvas) {
                         WWOpenData.initCanvas()
                     }
@@ -924,7 +914,6 @@
                                 })
                             }
                         })
-                        console.log('取到的值', result)
                         for(var i in this.allListData.list) {
                             if(result.items[i]) {  
                                 this.allListData.list[i].name = result.items[i].data
@@ -1019,12 +1008,10 @@
                         else if(this.theCustomListFlg) {
                             // this.allListData = res.data.list ? res.data.list : []
                             this.total = this.allListData.list ? this.allListData.list.length : 0
-                            console.log('jieliu_echarts',this.allListData);
                             list = this.total ? this.allListData.list.slice(0+50*(this.page-1),49+50*(this.page-1)) : []
                             // list = res.data.list
                             
                             for(var i in list) {
-                                // console.log(list[i].name, list[i].costMoney, list[i].cost)
                                 xList.push(list[i].name);
                                 let item = {
                                     "value": this.yAxisValue==0?list[i].costMoney:list[i].cost,
@@ -1046,7 +1033,6 @@
                         else {
                             //自定义列表：data:{cost:3, costMoney:222}
                             this.total = this.allListData ? this.allListData.length : 0
-                            console.log('slice',this.allListData);
                             // if(this.total){
                                 list = this.allListData.slice(0+50*(this.page-1),49+50*(this.page-1))
                             // }else{
@@ -1079,8 +1065,6 @@
                             width: this.widthHtval
                         })
                         _this.myChart = myChart;
-                        // console.log(totalMoneyCost.toFixed(2), '看看', totalMoneyCost)
-                        // var chengbentongji = totalMoneyCost.toFixed(2) || totalMoneyCost
                         if(totalMoneyCost) {
                             this.zhishin = totalMoneyCost.toFixed(2)
                         } 
@@ -1192,7 +1176,6 @@
                         myChart.getZr().on('click', params => {
                             const pointInPixel = [params.offsetX, params.offsetY];
                             if (myChart.containPixel('grid', pointInPixel)) {
-                                // console.log(_this.params)
                                 if(_this.radio==this.$t('other.project')) {
                                     if (_this.dateRange != null) {
                                         if (this.user.timeType.fixMonthcost == 0) {
@@ -1251,7 +1234,6 @@
             getZDY() {
                 this.http.post('/user-custom/getUserCustomTitle',{},res => {
                     if(res.code == 'ok'){
-                        // console.log(res, '数据来源')
                         this.theCustomList = res.data.result
                         this.theCustomListPlantLIst = res.data.field
                     }else {
@@ -1306,7 +1288,6 @@
             },
             // 自定义事件
             selectCal(obj) {
-                console.log(obj)
                 if(obj.distinction == 1) {
                     let arr = []
                     for(var i in obj.arrUserList) {
@@ -1314,14 +1295,12 @@
                     }
                     this.exportParam.userIds = arr
                 } else if(obj.distinction == 2) {
-                    console.log(obj)
                     this.personnelValue = obj.name
                     this.personnel()
                 }
             },
             vueCasader(obj) {
                 if(obj.distinction == 1) {
-                    console.log(obj, '数据')
                     let arr = []
                     arr.push(obj.id)
                     this.exportParam.deptId = arr

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

@@ -1131,7 +1131,7 @@
                 <el-tree :data="deptMembData" show-checkbox :props="defaultProps" node-key="id"
                     ref="chooseMembTree" @check-change="onTreeItemChange" :default-checked-keys="workForm.userId"
                     highlight-current :filter-node-method="filterNode">
-                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                    <span class="custom-tree-node" slot-scope="{ node }">
                         <span v-if="user.userNameNeedTranslate == '1'">
                             <span v-if="node.data.children">
                                 <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>