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

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

@@ -1151,6 +1151,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id").in("dept_id", allMyManagedDeptIds));
                     deptRelatedProjectIds = projectList.stream().map(Project::getId).collect(Collectors.toList());
                 }
+                if(functionDpartList.size()>0){
+                    if(functionTimeList.size()>0||functionCostList.size()>0){
+                        deptIds.addAll(allMyManagedDeptIds);
+                    }
+                }
                 //没有查看全公司的权限 只能先判断当前部门/父级别是否在负责部门才能获取数据
                 if(deptId!=null){
                     Optional<Department> first = allDepartmentList.stream().filter(ad -> ad.getDepartmentId().equals(deptId)).findFirst();

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

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2022-10-12
+ * @since 2022-10-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -384,7 +384,7 @@ public class TimeType extends Model<TimeType> {
     private Integer stageHasEvtime;
 
     /**
-     * 考勤为0不可填报
+     * 无考勤记录无法填报
      */
     @TableField("no_work_to_report")
     private Integer noWorkToReport;

fhKeeper/formulahousekeeper/timesheet_h5/babel.config.js

@@ -6,7 +6,8 @@ module.exports = {
                 libraryName: "vant",
                 libraryDirectory: "es",
                 // 指定样式路径
-                style: name => `${name}/style/less`
+                // style: name => `${name}/style/less`
+                style: true
             },
             "vant"
         ],

fhKeeper/formulahousekeeper/timesheet_h5/package.json

@@ -17,6 +17,7 @@
     "css-loader": "^3.6.0",
     "dingtalk-jsapi": "^2.13.42",
     "echarts": "^4.9.0",
+    "jquery": "^3.6.1",
     "style-loader": "^1.3.0",
     "vue": "^2.6.12",
     "vuex-persistedstate": "^2.7.1",

fhKeeper/formulahousekeeper/timesheet_h5/src/App.vue

@@ -8,9 +8,36 @@
 </template>
 
 <script>
+import $ from 'jquery'
 export default {
     name: "app",
-    created() { }
+    created() { },
+    mounted() {
+      let width=$("body").width();
+      console.log(width)
+      if(width>=1200){
+        let fontsize=width/1920*40;//fontsize为当前屏幕的基数字体，相对于设计稿计算得到的。
+        $("html").css("font-size",`${fontsize}px`)
+      }
+      if(width<=750){
+        let fontsize=width/400*40;
+        $("html").css("font-size",`${fontsize}px`)
+      }
+      //当加载页面的时候设置生效
+      window.onresize = () => {
+        return (() => {
+          let width=$("body").width();
+          if(width>=1200){
+            let fontsize=width/1920*40;
+            $("html").css("font-size",`${fontsize}px`)
+          }
+          if(width<=750){
+            let fontsize=width/400*40;
+            $("html").css("font-size",`${fontsize}px`)
+          }
+        })()
+      }
+    }
 };
 </script>