2022.6.30 16.16

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

@@ -1,6 +1,6 @@
 <template>
   <section id="section">
-    <div class="sidebars" ref="sidebars" :style="'width: 180px;display: block;background: #fff;height:'+hubs+ 'px'">
+    <div class="sidebars" ref="sidebars" :style="'width: 180px;display: block;overflow:hidden;background: #fff;height:'+hubs+ 'px'">
       <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>请假管理</h3>
       <el-divider ></el-divider>
       <el-col :span="12">
@@ -124,7 +124,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <!-- 选择审批人 -->
-                <el-form-item label="审批人" style="width:300px" :prop="mustApprover">
+                <el-form-item label="审批人" style="width:300px" prop="projectAuditorJson">
                     <el-select style="display:inline-block;width:250px;" multiple v-model="addForm.projectAuditorJson" placeholder="请选择">
                       <el-option
                       v-for="item in approverList"
@@ -667,7 +667,7 @@ export default {
         tel: [{required: true, validator: checkTel, trigger: 'blur'}],
         timeDays: [{required: true, validator: checks, trigger: 'blur'}],
         leaveType: [{ required: true, message: "请选择请假类型", trigger: "blur" }],
-        approver: [{ required: true, message: "请选择审批人", trigger: "blur" }]
+        projectAuditorJson: [{ required: true, message: "请选择审批人", trigger: "blur" }]
       },
       user: JSON.parse(sessionStorage.getItem("user")),
       shuz: ['事假填报', '病假填报', '年假填报', '产假填报'],
@@ -813,7 +813,6 @@ export default {
       txselnum: 0,
 
       approverList: [],
-      mustApprover: '',
       isDingding: 0,
       vacationList: [],
       leaveTypeList: [],
@@ -987,8 +986,11 @@ export default {
       },res => {
         if(res.code == 'ok'){
           this.approverList = res.data
-          if(this.approverList.length != 0){
-            this.mustApprover = 'approver'
+          if(this.approverList.length == 0){
+            this.$message({
+              message: '当前无审批人，请联系管理员配置审批人',
+              type: 'warning'
+            })
           }
           // console.log('list',res.data);
         }else {

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

@@ -2713,7 +2713,10 @@ a {
             this.getProjectBaseConfigList();
             this.getClfConfigList()
             this.yanjiuzx()
-            this.getMainProject()
+            if(this.user,timeType.mainProjectState == 1){
+                this.getMainProject()
+            }
+            
         }
     };
 </script>

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

@@ -4610,9 +4610,26 @@
 
             // 改变月份
             changeMonth() {
-                if (this.isBatch == 0 && !this.isSubstitude) {
+                if (this.isBatch == 0) {
+                    if(this.user.timeType.fillAhead == 0){
+                        let date_a = new Date(this.workForm.createDate)
+                        let date_b = new Date(sessionStorage.msg)
+                        if(date_a.getTime() > date_b.getTime()){
+                            this.workForm.createDate = sessionStorage.msg
+                        }
+                    }
                     //只有按天填报才能获取当天的日报
-                    this.getReport()
+                    if(!this.isSubstitude){
+                        this.getReport()
+                    }
+                }else {
+                    if(this.user.timeType.fillAhead == 0){
+                        let date_a = new Date(this.workForm.createDate[1])
+                        let date_b = new Date(sessionStorage.msg)
+                        if(date_a.getTime() > date_b.getTime()){
+                            this.workForm.createDate[1] = sessionStorage.msg
+                        }
+                    }
                 }
             },
             // 判断时间段