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

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

@@ -2773,6 +2773,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             inputStream.close();
             outputStream.close();
             if(fileName.endsWith(".xlsx")){
+                if(!fileName.endsWith(".xlsx")){
+                    msg.setError("文件格式错误，请使用’.xlsx’格式");
+                    return msg;
+                }
                 //然后解析表格
                 XSSFWorkbook workbook = new XSSFWorkbook(file);
                 //我们只需要第一个sheet
@@ -3000,6 +3004,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 operationRecord.setContent("导入了"+importCount+"条项目数据");
                 operationRecordService.save(operationRecord);
             }else if(fileName.endsWith(".xls")){
+                if(!fileName.endsWith(".xls")){
+                    msg.setError("文件格式错误，请使用’.xlsx’格式");
+                    return msg;
+                }
                 //然后解析表格
                 HSSFWorkbook workbook = new HSSFWorkbook(new FileInputStream(file));
                 //我们只需要第一个sheet
@@ -3523,13 +3531,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 ProjectKeyNodesSetting projectKeyNodesSetting = projectKeyNodesSettingList.get(x);
                                 Optional<ProjectKeyNodes> first = nodes.stream().filter(ns -> ns.getNodesId().equals(projectKeyNodesSetting.getId())).findFirst();
                                 ProjectKeyNodes projectKeyNodes=new ProjectKeyNodes();
+                                boolean flagNodes=false;
                                 switch (x){
                                     case 0:
                                         if(plate1!=null&&plate1.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate1.getDateCellValue())){
                                             projectKeyNodes.setPlanCompleteDate(sdf.format(plate1.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate2!=null&&plate2.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate2.getDateCellValue())){
                                             projectKeyNodes.setActualCompleteDate(sdf.format(plate2.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate3!=null&&!StringUtils.isEmpty(plate3.getStringCellValue())){
                                             switch (plate3.getStringCellValue()){
@@ -3540,14 +3551,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                                 case "完成":projectKeyNodes.setStates("2");
                                                     break;
                                             }
+                                            flagNodes=true;
                                         }
                                         break;
                                     case 1:
                                         if(plate4!=null&&plate4.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate4.getDateCellValue())){
                                             projectKeyNodes.setPlanCompleteDate(sdf.format(plate4.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate5!=null&&plate5.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate5.getDateCellValue())){
                                             projectKeyNodes.setActualCompleteDate(sdf.format(plate5.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate6!=null&&!StringUtils.isEmpty(plate6.getStringCellValue())){
                                             switch (plate6.getStringCellValue()){
@@ -3558,14 +3572,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                                 case "完成":projectKeyNodes.setStates("2");
                                                     break;
                                             }
+                                            flagNodes=true;
                                         }
                                         break;
                                     case 2:
                                         if(plate7!=null&&plate7.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate7.getDateCellValue())){
                                             projectKeyNodes.setPlanCompleteDate(sdf.format(plate7.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate8!=null&&plate8.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate8.getDateCellValue())){
                                             projectKeyNodes.setActualCompleteDate(sdf.format(plate8.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate9!=null&&!StringUtils.isEmpty(plate9.getStringCellValue())){
                                             switch (plate9.getStringCellValue()){
@@ -3576,14 +3593,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                                 case "完成":projectKeyNodes.setStates("2");
                                                     break;
                                             }
+                                            flagNodes=true;
                                         }
                                         break;
                                     case 3:
                                         if(plate10!=null&&plate10.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate10.getDateCellValue())){
                                             projectKeyNodes.setPlanCompleteDate(sdf.format(plate10.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate11!=null&&plate11.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate11.getDateCellValue())){
                                             projectKeyNodes.setActualCompleteDate(sdf.format(plate11.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate12!=null&&!StringUtils.isEmpty(plate12.getStringCellValue())){
                                             switch (plate12.getStringCellValue()){
@@ -3594,14 +3614,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                                 case "完成":projectKeyNodes.setStates("2");
                                                     break;
                                             }
+                                            flagNodes=true;
                                         }
                                         break;
                                     case 4:
                                         if(plate13!=null&&plate13.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate13.getDateCellValue())){
                                             projectKeyNodes.setPlanCompleteDate(sdf.format(plate13.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate14!=null&&plate14.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate14.getDateCellValue())){
                                             projectKeyNodes.setActualCompleteDate(sdf.format(plate14.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate15!=null&&!StringUtils.isEmpty(plate15.getStringCellValue())){
                                             switch (plate15.getStringCellValue()){
@@ -3612,14 +3635,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                                 case "完成":projectKeyNodes.setStates("2");
                                                     break;
                                             }
+                                            flagNodes=true;
                                         }
                                         break;
                                     case 5:
                                         if(plate16!=null&&plate16.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate16.getDateCellValue())){
                                             projectKeyNodes.setPlanCompleteDate(sdf.format(plate16.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate17!=null&&plate17.getCellTypeEnum() == CellType.NUMERIC  && !StringUtils.isEmpty(plate17.getDateCellValue())){
                                             projectKeyNodes.setActualCompleteDate(sdf.format(plate17.getDateCellValue()));
+                                            flagNodes=true;
                                         }
                                         if(plate18!=null&&!StringUtils.isEmpty(plate18.getStringCellValue())){
                                             switch (plate18.getStringCellValue()){
@@ -3630,12 +3656,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                                 case "完成":projectKeyNodes.setStates("2");
                                                     break;
                                             }
+                                            flagNodes=true;
                                         }
                                         break;
                                 }
                                 if(first.isPresent()){
-                                     projectKeyNodes.setId(first.get().getId());
-                                    projectKeyNodesMapper.updateById(projectKeyNodes);
+                                    if(flagNodes){
+                                        projectKeyNodes.setId(first.get().getId());
+                                        projectKeyNodesMapper.updateById(projectKeyNodes);
+                                    }
                                 }else {
                                     projectKeyNodes.setProjectId(id);
                                     projectKeyNodes.setNodesId(projectKeyNodesSetting.getId());
@@ -3804,7 +3833,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                     p.setProjectId(project.getId());
                                     participationMapper.insert(p);
                                 } else {
-                                    projectMapper.deleteById(project.getId());
                                     throw new Exception("参与人["+str+"]不存在");
                                 }
                             }

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

@@ -3196,6 +3196,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             sheet.createFreezePane(0,1);
             List<String> titles = new ArrayList<String>();
             titles.add("序号");
+            titles.add("工号");
             titles.add("员工");
             titles.add("所在部门");
             titles.add("项目名称");
@@ -3381,18 +3382,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             for (Map<String, Object> map : allReportByDate) {
                 HSSFRow row = sheet.createRow(rowNum);
                 row.createCell(0).setCellValue(rowNum);
-                row.createCell(1).setCellValue((String) map.get("name"));
-                row.createCell(2).setCellValue((String) map.get("departmentName"));
-                row.createCell(3).setCellValue((String) map.get("project"));
-                row.createCell(4).setCellValue((String) map.get("categoryName"));
+                row.createCell(1).setCellValue((String) map.get("jobNumber"));
+                row.createCell(2).setCellValue((String) map.get("name"));
+                row.createCell(3).setCellValue((String) map.get("departmentName"));
+                row.createCell(4).setCellValue((String) map.get("project"));
+                row.createCell(5).setCellValue((String) map.get("categoryName"));
                 if(timeType.getMainProjectState()==1){
-                    row.createCell(5).setCellValue((String) map.get("projectMainName"));
+                    row.createCell(6).setCellValue((String) map.get("projectMainName"));
                 }else {
-                    row.createCell(5).setCellValue((String) map.get("subProjectName"));
+                    row.createCell(6).setCellValue((String) map.get("subProjectName"));
                 }
-                int index = 6;
+                int index = 7;
                 if (company.getPackageProject() == 1) {
-                    row.createCell(6).setCellValue((String) map.get("taskName"));
+                    row.createCell(7).setCellValue((String) map.get("taskName"));
                     index++;
                 }
                 HSSFCell cell = row.createCell(index);

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

@@ -57,7 +57,7 @@
 
     <!--根据日期获取全部报告信息-->
     <select id="getAllReportByDate" resultType="java.util.Map">
-        SELECT a.id, c.name,c.corpwx_userid as corpwxUserId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
+        SELECT a.id, c.name,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType,a.start_time as startTime,u.job_number as jobNumber,
         a.end_time  as endTime, d.name as subProjectName,d.code as subProjectCode,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime
@@ -125,7 +125,7 @@
     </select>
 
     <select id="getProjectMembReportByDate" resultType="java.util.Map">
-        SELECT a.id, c.name,c.corpwx_userid as corpwxUserId, b.project_name AS project, b.category_name as categoryName,a.working_time AS duration,
+        SELECT a.id, c.name,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId, b.project_name AS project, b.category_name as categoryName,a.working_time AS duration,
         a.content, a.create_time AS time, a.create_date as createDate,
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType, a.start_time as startTime,
         a.end_time as endTime, d.name as subProjectName,a.task_id as taskId, task.name as taskName, a.is_overtime as
@@ -171,7 +171,7 @@
     </select>
 
     <select id="getDeptMembReportByDate" resultType="java.util.Map">
-        SELECT a.id, c.name,c.corpwx_userid as corpwxUserId, b.project_name AS project, a.working_time AS duration, a.content, a.create_time AS time,a.create_date as createDate,
+        SELECT a.id, c.name,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId, b.project_name AS project, a.working_time AS duration, a.content, a.create_time AS time,a.create_date as createDate,
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType, a.start_time as startTime,
         a.end_time as endTime, d.name as subProjectName,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState,a.stage, a.pic_str as picStr, multi_worktime as multiWorktime

fhKeeper/formulahousekeeper/octopus/src/main.js

@@ -103,91 +103,13 @@ router.beforeEach((to, from, next) => {
                 } else {
                     var getRoutes = null;
                     var filterRouter = allRouters;
-                    // if (user.company.packageExpense == 0) {
-                    //     filterRouter = filterRouter.filter(r=>{return r.name != '费用报销' && r.name != '项目报表服务'});
-                    // }
-                    // if (user.company.packageCustomer == 0) {
-                    //     //没有客户管理功能的，需要去掉
-                    //     filterRouter = filterRouter.filter(r=>{return r.name != '客户管理'});
-                    // }
-                    // if (user.company.packageEngineering == 0) {
-                    //     //非工程类的，去掉专业管理
-                    //     filterRouter = filterRouter.filter(r=>{return r.name != '工程专业管理' && r.name != '专业审核' && r.name != '部门审核'});
-                    // }
-                    // if (user.company.packageProject == 0) {
-                    //     filterRouter = filterRouter.filter(r=>{return r.name != '待办任务' && r.name != '请假管理'});
-                    // }
-                    // if (user.timeType.needDeptAudit == 0) {
-                    //     //没有开启导入日报审核，则不需要
-                    //     filterRouter = filterRouter.filter(r=>{return r.name != '导入日报审核'});
-                    // }
-                    // if (user.timeType.customDataActive == 0) {
-                    //     //没有开启自定义数值统计
-                    //     filterRouter = filterRouter.filter(r=>{return r.name != '自定义数值统计'});
-                    // } else {
-                    //     var customMenu = filterRouter.filter(r=>{return r.name == '自定义数值统计'});
-                    //     if (customMenu.length > 0) {    
-                    //         console.log(customMenu,'111');
-                    //         customMenu[0].children[0].name = user.timeType.customDataName + '统计';
-                    //     }
-                        
-                    // }
-                    
-                    // if (user.role == 1 || user.role == 2) {
-                    //     getRoutes = filterRouter;
-                    // } else {
-                    //     var modules = userModules.filter(u=>u.role == user.role)[0].modules;
-                    //     if (user.leader) {
-                    //         modules.push(2, "项目报告审核");
-                    //     } else if (user.hasAuditDept) {
-                    //         modules.push(2, "项目报告审核");
-                    //     }
-                    //     if (user.role == 6 && user.timeType.needDeptAudit == 1) {
-                    //         //公司领导可以进行导入日报的审核
-                    //         modules.push(2, "导入日报审核");
-                    //     }
-                    //     getRoutes = filterRouter.filter(r=>{
-                    //         return modules.filter(m=>m == r.name).length > 0;
-                    //     });
-                    // }
 
                     // 更据当前登录的权限来显示模块
-                    console.log("user",user)
-                    console.log(filterRouter)
-                    var arr = []
-                    // for(var p in filterRouter){
-                    //     if(filterRouter[p].name == "出差管理"){
-                    //         arr.push(filterRouter[p])
-                    //     }
-                    // }
-                    for(var i in user.moduleList) {
-                        for(var s in filterRouter) {
-                            if(user.moduleList[i].children.length > 0) {
-                                if(user.moduleList[i].name == filterRouter[s].name) {
-                                    console.log(user.moduleList[i].name)
-                                    var arrList = user.moduleList[i].children
-                                    var ddList = filterRouter[s].children
-                                    var list = []
-                                    for(var j in arrList) {
-                                        for(var d in ddList) {
-                                            if(arrList[j].name == ddList[d].name) {
-                                                list.push(ddList[d])
-                                            }
-                                        }
-                                    }
-                                    filterRouter[s].children = list
-                                    arr.push(filterRouter[s])
-                                }
-                            } else {
-                                if(user.moduleList[i].name == filterRouter[s].name) {
-                                    arr.push(filterRouter[s])
-                                }
-                            }
-                            
-                        } 
-                    }
-                    console.log(arr, 'arr')
-                    getRoutes = arr;
+                    // console.log("user",user)
+                    // console.log(filterRouter)
+                    // var arr = []
+                    // console.log(arr, 'arr')
+                    getRoutes = filterRouter;
 
                     //同步企业微信考勤打卡的情况下，根据深圳赛元微电子的要求，屏蔽项目报告审核模块
                     // if (user.timeType.syncCorpwxTime == 1) {

fhKeeper/formulahousekeeper/octopus/src/routes.js

@@ -101,53 +101,21 @@ export const fixedRouter = [
     },
     
 ];
-export const allRouters = [//组织架构
-    //工时报告
+export const allRouters = [
     {
         path: '/',
         component: Home,
-        name: '工时报告',
+        name: '企业跟踪',
         iconCls: 'iconfont firerock-icontianbao1',
         leaf: true,
         children: [
             { path: '/daily', component: daily, name: '企业跟踪' },
         ]
     },
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '自动计时',
-    //     iconCls: 'iconfont firerock-iconmiaobiao',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/timer', component: timer, name: '自动计时' },
-    //     ]
-    // },
-    //工时审核
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '专业审核',
-    //     iconCls: 'iconfont firerock-iconshenhe',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/reviewProfession', component: reviewProfession, name: '专业审核' },
-    //     ]
-    // },
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '部门审核',
-    //     iconCls: 'iconfont firerock-iconshenhe',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/reviewDepartment', component: reviewDepartment, name: '部门审核' },
-    //     ]
-    // },
     {
-        path: '/',
+        path: '/reviewImport',
         component: Home,
-        name: '项目报告审核',
+        name: '操作记录',
         iconCls: 'iconfont firerock-iconshenhe',
         leaf: true,
         children: [
@@ -155,9 +123,9 @@ export const allRouters = [//组织架构
         ]
     },
     {
-        path: '/',
+        path: '/review',
         component: Home,
-        name: '导入日报审核',
+        name: '客户操作日志',
         iconCls: 'iconfont firerock-iconshenhe',
         leaf: true,
         children: [
@@ -165,191 +133,25 @@ export const allRouters = [//组织架构
         ]
     },
     {
-        path: '/',
+        path: '/migrateData',
         component: Home,
-        name: '待办任务',
+        name: '数据迁移',
         iconCls: 'iconfont firerock-iconshenhe',
         leaf: true,
         children: [
             { path: '/migrateData', component: migrateData, name: '数据迁移' },
         ]
     },
-    //成本统计
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '工时成本统计',
-    //     iconCls: 'iconfont firerock-icontongji',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/cost', component: cost, name: '工时成本统计' },
-    //         { path: '/cost/:id/:name', component: proDetail, name: '成本详情', hidden: true },
-    //         { path: '/costDep/:id/:name', component: depDetail, name: '成本详情', hidden: true },
-    //     ]
-    // },
-    //自定义数值统计
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '自定义数值统计',
-    //     iconCls: 'iconfont firerock-icontongji',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/customData', component: customData, name: '自定义数值统计' }
-    //     ]
-    // },
-    
-    //每月财务成本
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '财务核算成本',
-    //     iconCls: 'iconfont firerock-iconcaiwu',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/finance', component: finance, name: '财务核算成本' },
-    //     ]
-    // },
-    // 任务管理
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '待办任务',
-    //     iconCls: 'iconfont firerock-icondaibanshixiang',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/task', component: tasks, name: '待办任务' },
-    //     ]
-    // },
-    //项目管理
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '项目管理',
-    //     iconCls: 'iconfont firerock-iconxiangmu',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/list', component: list, name: '功能维护' },
-    //     ]
-    // },
-    
-    
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '项目报表服务',
-    //     iconCls: 'iconfont firerock-iconbaobiao',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/corpreport', component: corpReport, name: '项目报表服务' }
-    //     ]
-    // },
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '请假管理',
-    //     iconCls: 'iconfont firerock-iconwj-qjd',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/leave', component: leave, name: '请假管理' }
-    //     ]
-    // },
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '出差管理',
-    //     iconCls: 'iconfont firerock-iconwj-qjd',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/awayOffice', component: awayOffice, name: '出差管理' }
-    //     ]
-    // },
     {
-        path: '/',
+        path: '/customer',
         component: Home,
-        name: '项目管理',
+        name: '企业管理',
         iconCls: 'iconfont firerock-iconkehu',
         leaf: true,
         children: [
             { path: '/customer', component: customer, name: '企业管理' }
         ]
     },
-    {
-        path: '/',
-        component: Home,
-        name: '工程专业管理',
-        iconCls: 'iconfont firerock-iconjianzhugongchenglei',
-        leaf: true,
-        children: [
-            { path: '/profession', component: profession, name: '工程专业管理' }
-        ]
-    },
-    // 费用报销模块
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '费用报销',
-    //     iconCls: 'iconfont firerock-iconbaoxiao',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/expense', component: expense, name: '费用报销' }
-    //     ]
-    // },
-    {
-        path: '/',
-        component: Home,
-        name: '组织架构',
-        iconCls: 'iconfont firerock-iconzuzhijiagou1',
-        leaf: true,//只有一个节点
-        children: [
-            { path: '/team', component: team, name: '组织架构' },
-        ]
-    },
-    // {
-        
-    //     path: '/',
-    //     component: Home,
-    //     name: '审批流设置',
-    //     iconCls: 'iconfont firerock-iconliucheng',
-    //     leaf: true,//只有一个节点
-    //     children: [
-    //         { path: '/workflow', component: workflow, name: '审批流设置' },
-    //     ]
-    // },
-    //设置时间类型
-    // {
-        
-    //     path: '/',
-    //     component: Home,
-    //     name: '',
-    //     iconCls: 'iconfont firerock-iconsetting',
-    //     leaf: true,//只有一个节点
-    //     children: [
-    //         { path: '/timetype', component: timetype, name: '系统基础设置' },
-    //     ]
-    // },
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '基础数据管理',
-    //     iconCls: 'iconfont firerock-iconsetting',
-    //     leaf: false,//只有一个节点
-    //     children: [
-    //         { path: '/timetype', component: infrastructure, name: '系统基础设置', iconCls: 'iconfont firerock-iconsetting' },
-    //         { path: '/quanx', component: quanx, name: '角色权限管理', iconCls: 'iconfont firerock-iconsetting' }
-    //     ]
-    // },
-    {
-        path: '/',
-        component: Home,
-        name: '基础数据管理',
-        iconCls: 'iconfont firerock-iconsetting',
-        leaf: false,//只有一个节点
-        children: [
-            { path: '/timetype', component: timetype, name: '系统基础设置', iconCls: 'iconfont firerock-iconxitong-'},
-            { path: '/role', component: quanx, name: '角色权限管理', iconCls: 'iconfont firerock-iconquanxian1' }
-        ]
-    },
     {
         path: '/404',
         component: NotFound,

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

@@ -35,7 +35,7 @@
                         
                     </el-row>
                     <el-row :gutter="10">
-                        <el-col :span="5" ><span class="gray_label">项目级别: </span></el-col><el-col :span="7" ><span >{{levelTxt[project.level]}}</span></el-col>
+                        <el-col :span="5" ><span class="gray_label">项目级别: </span></el-col><el-col :span="7" ><span >{{levelTextShow(project.level)}}</span></el-col>
                         <el-col :span="5" ><span class="gray_label">创建日期:</span></el-col><el-col :span="7" ><span>{{project.createDate}}</span></el-col>
                     </el-row>
                     <el-row :gutter="10">
@@ -711,7 +711,7 @@
         },
         filters: {
             numberToCurrency(value) {
-                console.log('info numberToCurrency='+value);
+                // console.log('info numberToCurrency='+value);
                 if (!value || value=='-') return '0.00'
                 value = value.toFixed(2)
                 const intPart = Math.trunc(value)
@@ -726,6 +726,13 @@
             }
         },
         methods: {
+            levelTextShow(lev){
+                if(this.user.timeType.projectLevelState == 1){
+                    return this.levelList.filter(item => item.id == lev)[0].projectLevelName
+                }else{
+                    return this.levelTxt[lev]
+                }
+            },
             // 提交关键节点
             submitKeyNodeaddForm() {
                 this.http.post('/project-key-nodes/edit',{
@@ -881,7 +888,7 @@
                 res => {
                     if (res.code == "ok") {
                         this.yonghuUser = res.data
-                        console.log(this.yonghuUser)
+                        // console.log(this.yonghuUser)
                     } 
                 },
                 error => {
@@ -1359,7 +1366,7 @@
                 this.addLoading = true;
                 let formData = new FormData();
                 formData.append("id", this.curProjectId);
-                console.log(this.addMembForm.userId, '要传过去的数据')
+                // console.log(this.addMembForm.userId, '要传过去的数据')
                 if(this.addMembForm.userId.length != 0) {
                     for(var j in this.addMembForm.userId) {
                         formData.append("userId", this.addMembForm.userId[j]);
@@ -1428,7 +1435,7 @@
             //选择参与人
             changeParticipator() {
                 //检查是否在参与人中，如果没有需要加入到参与人中
-                console.log(this.addForm.userId);
+                // console.log(this.addForm.userId);
                 var find = false;
                 this.project.participationList = [];
                 this.addForm.userId.forEach(u=>{
@@ -1436,7 +1443,7 @@
                     // var findUser = this.users.filter(au=>au.id == u);
                     this.project.participationList.push(findUser);
                 })
-                console.log(this.project.participationList, '看看')
+                // console.log(this.project.participationList, '看看')
             },
             getUsers() {
                 // this.http.post(this.port.manage.list, {
@@ -1560,7 +1567,7 @@
                         }
                         listId.toString()
                         listName.toString()
-                        console.log(listId, listName)
+                        // console.log(listId, listName)
                         formData.append("associateDegrees", listId)
                         formData.append("associateDegreeNames", listName)
                         // 判断公司id是否等于 936
@@ -1623,7 +1630,7 @@
                 this.$set(this.addForm,'outputValue',this.addForm.outputValue ? this.addForm.outputValue : null)
                 this.addForm.userId = arr
                 this.addFormVisible = true;
-                console.log(this.addForm, 123)
+                // console.log(this.addForm, 123)
                 var arr = []
                 // if(this.addForm.associateDegrees != null) {
                     if(this.addForm.associateDegrees.length > 0) {
@@ -1656,8 +1663,8 @@
                     array.push(parseInt(arrList[i]));
                 }
                 this.$set(this.addForm,'deptId', array.reverse())
-                console.log(this.auseList, '看看是个什么值')
-                console.log(this.addForm, '看看是个什么值')
+                // console.log(this.auseList, '看看是个什么值')
+                // console.log(this.addForm, '看看是个什么值')
             },
             showEditPar() {
                 this.addForm = JSON.parse(JSON.stringify(this.project));
@@ -1669,13 +1676,13 @@
                     arr.push(list[j].id)
                 }
                 this.addForm.userId = arr;
-                console.log(this.addForm.userId );
+                // console.log(this.addForm.userId );
 
                 this.pVisible = true;
                 
             },
             showEditParKeyNode() {
-                console.log('出发了')
+                // console.log('出发了')
                 this.keyNodeIsShow = true
                 this.projectKeyNodesData = JSON.parse(JSON.stringify(this.keyNodesList))
             },
@@ -1709,14 +1716,14 @@
                 this.http.post('/pdf-file/getProjectFile', {fileId: row.id},
                 res => {
                     if (res.code == "ok") {
-                        console.log(res.data+'----'+row.documentName);
+                        // console.log(res.data+'----'+row.documentName);
                         let routeUrl = this.$router.resolve({
                             path: "/viewonline",
                             params: {serverFname:res.data, fileName:row.documentName}
                         });
                         sessionStorage.setItem("serverFname",res.data);
                         sessionStorage.setItem("fileName",row.documentName);
-                        console.log(routeUrl.href);
+                        // console.log(routeUrl.href);
                         window.open(routeUrl.href, '_blank');
                     } else {
                         this.$message({
@@ -1749,7 +1756,7 @@
                 },
                 res => {
                     if (res.code == "ok") { 
-                        console.log(res.data, '里程碑数据')
+                        // console.log(res.data, '里程碑数据')
                         for(var i in res.data) {
                             // if(res.data[i].taskStatus == 1) {
                             //     res.data[i].taskTex = '完成于 ' + res.data[i].finishDate
@@ -1853,8 +1860,8 @@
                         } else {
                             this.project = res.data;
                         }
-                        console.log('看看值')
-                        console.log('test123',this.project);
+                        // console.log('看看值')
+                        // console.log('test123',this.project);
                         this.participator = this.project.participationList;
                     } else {
                         this.$message({
@@ -1940,7 +1947,7 @@
             }
         },
         created() {
-            console.log('created===');
+            // console.log('created===');
             let height = window.innerHeight;
             this.tableHeight = height - 160;
             const that = this;
@@ -1949,7 +1956,7 @@
             };
         },
         mounted() {
-            console.log('mounted===');
+            // console.log('mounted===');
             this.curProjectId = parseInt(this.$route.params.id);
             this.getDepartment();
             this.getUsers();
@@ -1963,9 +1970,9 @@
             this.userssHu()
             this.yanjiuzx()
             this.getProjectLevel()
-            if(this.user.timeType.projectWithDept) {
-                this.getProjectLevel()
-            }
+            // if(this.user.timeType.projectWithDept) {
+            //     this.getProjectLevel()
+            // }
             if(this.user.companyId == '936') {
                 this.getKeyNodes()
             }

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

@@ -1487,7 +1487,7 @@ a {
                 column.index=columnIndex;
             },
             clickCell(row,column) {
-                console.log('can can need',row,column)
+                // console.log('can can need',row,column)
                 this.currentCell = row.index + ',' + column.index;
                 this.phaseProjectValie = row.currentStageId  ? row.currentStageId : ''
                 if(this.permissions.projectManagement || this.user.id==row.inchargerId || this.user.id==row.creatorId) {
@@ -1542,7 +1542,7 @@ a {
                     }
                 }
                 categoryId == '' ?  '' : this.addForm.category = categoryId
-                console.log(this.addForm)
+                // console.log(this.addForm)
             },
             tableSort({column, prop, order}){
                 if(prop == 'inchargerName' || prop == 'customerName' || prop == 'projectCode' || prop == 'categoryName' || prop == 'projectName' || prop == 'status' || prop == 'currentStage' || prop == 'departmentName' || prop == 'associateDegreeNames'){
@@ -1630,7 +1630,7 @@ a {
             },
             // 批量修改自定义维度
             checkedWudulist(e){
-                console.log(e);
+                // console.log(e);
                 this.checkedProjectArr = e
             },
             batchSetWudulistBtn1(){
@@ -1741,7 +1741,7 @@ a {
                 }
             },
             test(row){
-                console.log(row);
+                // console.log(row);
             },
             // 批量添加分组参与人员
             addGroupPerson(){
@@ -1758,7 +1758,7 @@ a {
                     projectIdArray: JSON.stringify(proArr)
                 },res => {
                     if(res.code == 'ok'){
-                        console.log('分组',res.data);
+                        // console.log('分组',res.data);
                         this.addGroupList = res.data
                         this.addGroupPersonBtnLoading = false
                         this.addGroupPersonDialog = true
@@ -1784,7 +1784,7 @@ a {
                 var chosenList = this.$refs.chooseMembTree2.getCheckedNodes();
                 var list = chosenList.filter(item=>item.isUser == 1);
                 this.chosenMembCount = list.length;
-                console.log(list);
+                // console.log(list);
             },
             addPersonSure(){
                 this.addGroupPersonPdialog = false
@@ -2097,7 +2097,7 @@ a {
                 res => {
                     if (res.code == "ok") {
                         this.yonghuUser = res.data
-                        console.log(this.yonghuUser)
+                        // console.log(this.yonghuUser)
                     } 
                 },
                 error => {
@@ -2112,7 +2112,7 @@ a {
                 this.http.post('/report-extra-degree/getAll ',{},
                 res => {
                     if (res.code == "ok") {
-                        console.log(res, '过来的数据')
+                        // console.log(res, '过来的数据')
                         this.ause = res.data
                     } else {
                         this.$message({
@@ -2524,7 +2524,7 @@ a {
                     res => {
                         if (res.code == "ok") {
                            this.baseClfList = res.data;
-                           console.log("获取分类条目",res.data);
+                        //    console.log("获取分类条目",res.data);
                            this.$forceUpdate();
                         } else {
                             this.$message({
@@ -2863,7 +2863,7 @@ a {
                     );
             },
             submitkeyNodes() {
-                console.log(this.addForm, '提交的参数')
+                // console.log(this.addForm, '提交的参数')
                 // return
                 this.http.post('/project-key-nodes-setting/addOrMod',this.addFormkeyNodes,
                 res => {
@@ -3261,7 +3261,7 @@ a {
                         userNames:'',
                         code:'',
                         inchargerId:null,
-                        level:1,
+                        level: this.user.timeType.projectLevelState == 1 ? this.levelList[0].id : 1,
                         customerId:null,
                         notifyUserNames:'',
                         chosenLeaders:[],
@@ -3298,7 +3298,7 @@ a {
                         for (var m=0;m<this.keyNodesList.length; m++) {
                             this.projectKeyNodesData.push({nodesId: this.keyNodesList[m].id, nodesName:this.keyNodesList[m].name, planCompleteDate: null, actualCompleteDate: null, states: '0'});
                         }
-                        console.log(this.projectKeyNodesData, '节点值')
+                        // console.log(this.projectKeyNodesData, '节点值')
                     }
                 } else {
                     this.title = "修改项目";
@@ -3399,7 +3399,7 @@ a {
                                 arr.push(+zhhi[i] + 0)
                             }
                             this.$set(this.addForm, 'supplierId', arr)
-                            console.log( this.addForm.supplierId)
+                            // console.log( this.addForm.supplierId)
                         } else {
                             this.$set(this.addForm, 'supplierId', [])
                         }
@@ -3737,7 +3737,7 @@ a {
                 // console.log(e)
                 // console.log(this.addForm)
                 // if(e.length )
-                console.log(e)
+                // console.log(e)
             },
             // 删除
             deletePro(i, item) {

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

@@ -59,8 +59,8 @@
                 <el-form-item >
                     <div style="margin-left: 80px">
                         <el-select v-model="dateType" style="width:120px;" size="small" slot="prepend" placeholder="请选择">
-                            <el-option label="开始时间" :value="0" @click.native="hiddens()"></el-option>
-                            <el-option label="截止时间" :value="1" @click.native="hiddens()"></el-option>
+                            <el-option label="开始时间" :value="0" @click.native="hiddens(1)"></el-option>
+                            <el-option label="截止时间" :value="1" @click.native="hiddens(1)"></el-option>
                         </el-select>
                     </div>
                 </el-form-item>
@@ -1203,7 +1203,10 @@ import { error } from 'dingtalk-jsapi';
                 this.getList()
             },
             // 下拉框选择
-            hiddens() {
+            hiddens(e) {
+                if(e == 1 && this.dateSelect == null || this.dateSelect.length == 0){
+                    return
+                }
                 // console.log(this.searchField)
                 this.page = 1
                 this.getList()