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

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

@@ -350,9 +350,10 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
         //设置每一列的列宽
         sheet.setColumnWidth(0,256*15);
         sheet.setColumnWidth(1,256*20);
-        sheet.setColumnWidth(2,256*50);
+        sheet.setColumnWidth(2,256*10);
+        sheet.setColumnWidth(3,256*60);
 
-        List<String> titles = Arrays.asList("模块","功能","备注");
+        List<String> titles = Arrays.asList("模块","功能","是否具有","备注");
         HSSFRow row = sheet.createRow(0);
         HSSFCellStyle style = wb.createCellStyle();
         style.setBorderBottom(BorderStyle.valueOf((short)1));
@@ -394,23 +395,28 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
                     row = sheet.createRow(startRow + j);
                     row.createCell(0).setCellValue(menuList.get(i).getName());
                     row.createCell(1).setCellValue(functionList.get(j).getName());
-                    row.createCell(2).setCellValue(functionList.get(j).getRemarks());
+                    row.createCell(2).setCellValue(functionList.get(j).isChecked()?"√":"×");
+                    row.createCell(3).setCellValue(functionList.get(j).getRemarks());
                 }
             } else if (functionList.size() == 1){
                 //该模块只有一个功能， 只要一行就行了
                 row = sheet.createRow(startRow);
                 row.createCell(0).setCellValue(menuList.get(i).getName());
                 row.createCell(1).setCellValue(functionList.get(0).getName());
-                row.createCell(2).setCellValue(functionList.get(0).getRemarks());
+                row.createCell(2).setCellValue(functionList.get(0).isChecked()?"√":"×");
+                row.createCell(3).setCellValue(functionList.get(0).getRemarks());
             } else {
                 //没有功能，取子模块展示
                 row = sheet.createRow(startRow);
                 row.createCell(0).setCellValue(menuList.get(i).getName());
+                row.createCell(2).setCellValue(menuList.get(i).isChecked()?"√":"×");
                 List<SysModule> children = menuList.get(i).getChildren();
                 if(children.size()>0){
+                    //当子模块有functionList的是否也需要做处理
                     for (int k = 0; k < children.size(); k++) {
                         row = sheet.createRow(startRow+k);
                         row.createCell(0).setCellValue(children.get(k).getName());
+                        row.createCell(2).setCellValue(children.get(k).isChecked()?"√":"×");
                     }
                 }
             }

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

@@ -3,7 +3,7 @@
     <div>
     <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff;">
       <div ref="abbisd" style="width: 100%;overflow: hidden;">
-        <div :style="'height: '+windowHeight+'px; overflow: auto;overflow-x: hidden'">
+        <div :style="'height: '+(windowHeight - 60)+'px; overflow: auto;overflow-x: hidden'">
           <el-col :span="12">
             <el-menu
               :default-active="defaultActive"