提交日报文件

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

@@ -6038,6 +6038,7 @@
             },
             // 按周填报里内容的填写点击确定
             setWeekProItemData() {
+                
                 //专业版模式下，任务分组和阶段必填
                 if (this.user.company.packageProject == 1 && this.user.companyId === 3917) {
                     if (!this.zhoBao.groupId || !this.zhoBao.stage) {
@@ -6048,6 +6049,14 @@
                         return;
                     }
                 }
+                // 检查任务分组
+                if(this.user.timeType.taskGroupRequired == 1 && this.zhoBao.groupId){
+                    this.$message({
+                        message: '任务分组，请检查',
+                        type: "error"
+                    });
+                    return
+                }
                 //检查子项目是否必填
                 if (this.user.timeType.subProMustFill == 1 && this.zhoBao.subProjectList && this.zhoBao.subProjectList.length > 0 && !this.zhoBao.subProjectId) {
                     this.$message({
@@ -7723,6 +7732,12 @@
                             if (this.user.companyId == this.yisibeiCompId) {
                                 formData.append('sapServiceId', this.workForm.domains[i].sapServiceId);
                             }
+                            if(this.user.timeType.taskGroupRequired == 1 && this.workForm.domains[i].groupId) {
+                                this.$message({
+                                    message: this.$t('defaultText.pleaseset') + "["+this.workForm.domains[i].projectName+"]"+this.$t('message.Projectgroupleader'),
+                                    type: "error"
+                                });
+                            }
                         }
                         this.submitingReport = true;
                         this.http.uploadFile( this.port.report.editPort, formData,