2022.9.7 填报时间重复校验

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

@@ -31,7 +31,11 @@
                 <el-container style="padding: 0px;">
                     <el-aside :style="'overflow:auto;padding-left:10px;padding-right:5px;height:'+tableHeight+'px;width:'+groupWidth+'px;'">
                         <el-input v-model="groupSearch" size="small" placeholder="搜索分组" @input="startSearchGroup" style="margin-top:10px"/>
-                        <p ><span class="heavyTxt">任务分组</span> <i class="el-icon-plus pull-right" style="color:#666;margin-right:10px;" @click="createGroup" v-if="projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement"></i></p>
+                        <p ><span class="heavyTxt">任务分组</span>
+                            <!-- <el-button size="mini">导出</el-button> -->
+                            <i class="el-icon-plus pull-right" style="color:#666;margin-right:10px;" @click="createGroup" v-if="projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement"></i>
+                            <i class="iconfont firerock-icondaochu pull-right" style="font-size:14px"></i>
+                        </p>
                         <el-menu :default-active="defaultGroupId" ref="defaultMenu"  class="el-menu-vertical-demo" @select="groupChange" style="border-right:none;">
                             <el-menu-item :index="item.id" v-for="item in groupList" :key="item.id"  class="group_style">
                                 <div slot="title">

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

@@ -4716,21 +4716,6 @@
                         return
                     }
                 }
-                let overcorp2 = ''
-                for(let i in zhi){
-                    let addtime = zhi[i].filledTime ? parseFloat(zhi[i].he) + zhi[i].filledTime*1 : parseFloat(zhi[i].he)
-                    if(addtime > this.user.timeType.maxReportTime){
-                        overcorp2 += zhi[i].zhoDataTime + ','
-                    }
-                }
-                if(overcorp2 != ''){
-                    overcorp2 = overcorp2.substring(0,overcorp2.length - 1)
-                    this.$message({
-                        message: '日期[' + overcorp2 + ']填报工时之和不能超过每日填报上限',
-                        type: 'error'
-                    })
-                    return
-                }
                 
                     var submits = []
                     let formData = new FormData();
@@ -5270,13 +5255,6 @@
                                 return;
                             }
                         }
-                        if(totalTime > this.user.timeType.maxReportTime){
-                            this.$message({
-                                message: "填报工时之和"+(totalTime)+"h不能超过填报日报上限("+this.user.timeType.maxReportTime.toFixed(1)+"h)",
-                                type: "error"
-                            })
-                            return
-                        }
                         
                         for(var i in this.workForm.domains) {
                             if(this.workForm.domains[i].degreeId) {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -1319,7 +1319,6 @@
                 }
                 return true
             },
-
             // 提交日报
             submitReport() {
                 this.dateAr = []
@@ -1336,7 +1335,15 @@
                             }
                         }
                     }
-                    this.dateAr = alp
+                }else{
+                    for(let i in this.form.domains){
+                        let objs = {}
+                        objs.s = this.form.domains[i].startTime
+                        objs.e = this.form.domains[i].endTime
+                        alp.push(objs)
+                    }
+                }
+                this.dateAr = alp
                     if(this.dateAr.length > 0) {
                         let trus = this.fns()
                         if(!trus) {
@@ -1344,7 +1351,7 @@
                             return
                         }
                     }
-                }
+                
                 
                 // return
                 const toast = this.$toast.loading({

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -1428,16 +1428,25 @@
                                 }
                             }
                         }
+                    }else{
+                        for(let m in this.form[formIndex].domains){
+                            let slll2 = this.form[formIndex].domains[m]
+                            let objs = {}
+                            objs.s = slll2.startTime
+                            objs.e = slll2.endTime
+                            alp.push(objs)
+                        }
                         if(this.form[formIndex].reportTimes){
-                                let timearr = this.form[formIndex].reportTimes.split(',')
-                                for(let i in timearr){
-                                    let objs = {}
-                                    objs.s = timearr[i].split('-')[0]
-                                    objs.e = timearr[i].split('-')[1]
-                                    alp.push(objs)
-                                }
+                            let timearr = this.form[formIndex].reportTimes.split(',')
+                            for(let i in timearr){
+                                let objs = {}
+                                objs.s = timearr[i].split('-')[0]
+                                objs.e = timearr[i].split('-')[1]
+                                alp.push(objs)
+                            }
                         }
-                        this.dateAr = alp
+                    }
+                    this.dateAr = alp
                         if(this.dateAr.length > 0) {
                             let trus = this.fns()
                             if(!trus) {
@@ -1445,7 +1454,8 @@
                                 return
                             }
                         }
-                    }
+
+                    
 
                     if (this.reportTimeType.type == 0) {
                         var alldayNum = 0;