增加设置，任务分组和工作内容是否隐藏

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

@@ -1049,8 +1049,8 @@
                     <el-input v-model="manDaySetting.projectWarningPercent" type="number" style="width:200px;">
                     </el-input>%
                 </el-form-item>
-                <el-form-item :label="$t('xiangMuGongShiBuZuShi')"  >
-                    <el-select v-model="manDaySetting.projectFronzeOnLack" :placeholder="$t('defaultText.pleaseChoose')"  >
+                <el-form-item :label="$t('xiangMuGongShiBuZuShi')" >
+                    <el-select v-model="manDaySetting.projectFronzeOnLack" :placeholder="$t('defaultText.pleaseChoose')"  :disabled="manDaySetting.projectExceedPercent>0">
                         <el-option :label="$t('jinZhiTianBao')" :value="1"></el-option>
                         <el-option :label="$t('keYiTianBaoJinTiXing')" :value="0"></el-option>
                     </el-select>
@@ -1065,6 +1065,11 @@
                         <el-option :label="$t('keYiTianBaoJinTiXing')" :value="0"></el-option>
                     </el-select>
                 </el-form-item>
+                <p style="color:#999;">| 超出限制</p>
+                <el-form-item label="不得超过预估项目工时的"  >
+                    <el-input v-model="manDaySetting.projectExceedPercent" type="number" style="width:200px;">
+                    </el-input>%
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="default" @click="projectManDaySettingDialog = false" >{{ $t('Shutdown') }}</el-button>

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -398,7 +398,7 @@
         </div>
         
         <div class="yanjiu">
-            <p style="margin-left:10px;color:#666;">{{ $t('riBaoShenHeMoShi') }}</p><el-tag style="margin-left:10px;" type="plain">{{reportAuditTypeArray[timeType.reportAuditType]}}
+            <p style="margin-left:10px;color:#666;">{{ $t('riBaoShenHeMoShi') }}</p><el-tag style="margin-left:78px;" type="plain">{{reportAuditTypeArray[timeType.reportAuditType]}}
                 <el-tooltip effect="dark" :content="$t('ruXuXiuGaiWeiQiTaShenHeMoShiQingLianXiKeFu')" placement="top-start">
                                 <i class="el-icon-question" style="color:#606266"></i>
                             </el-tooltip>
@@ -407,7 +407,7 @@
         </div>
         <div class="yanjiu" >
             <p style="margin-left:10px;color:#666;">自动审核</p>
-            <el-switch style="margin-left: 55px" v-model="timeType.autoProjectApprove" :active-color="themeColor" > </el-switch>
+            <el-switch style="margin-left: 108px" v-model="timeType.autoProjectApprove" :active-color="themeColor" > </el-switch>
             <span style="margin-left:10px;color:#999;">项目审核人是自己时自动审核通过</span>
         </div>
         <div class="yanjiu">
@@ -495,28 +495,38 @@
             </el-col>
         </el-row>
         <div class="yanjiu" v-if="user.company.packageProject==1">
-            <span style="margin:0px 0 10px 10px;color:#666;">{{ $t('tianBaoRiBaoShiFouYinCangJieDuan') }}</span>
-            <el-switch style="margin:0px 0 10px 81px;" v-model="timeType.hideStages" :active-color="themeColor"></el-switch>
+            <span style="margin:0px 0 10px 10px;color:#666;">阶段填报</span>
+            <el-switch style="margin:0px 0 10px 108px;" v-model="timeType.hideStages" :active-color="themeColor"></el-switch>
+            <span style="margin:0px 0 10px 10px;color:#999;">是否隐藏</span>
         </div>
         <div class="yanjiu" v-if="user.company.packageProject==1">
-            <span style="margin:0px 0 10px 10px;color:#666;">{{ $t('tianBaoRiBaoShiFouYinCangRenWu') }}</span>
-            <el-switch style="margin:0px 0 10px 81px;" v-model="timeType.hideTask" :active-color="themeColor" @change="onHideTask()"></el-switch>
-        </div>
-        <div class="yanjiu" v-if="user.company.packageProject==1 && !timeType.hideTask">
-            <span style="margin:0px 0 10px 10px;color:#666;">{{ $t('renWuShiFouBiTian') }}</span>
-            <el-switch style="margin:0px 0 10px 81px;" v-model="timeType.taskRequired" :active-color="themeColor"></el-switch>
-            <span style="margin:0px 0 10px 10px;color:#999;">{{ $t('parametermandatory') }}</span>
+            <span style="margin:0px 0 10px 10px;color:#666;">任务填报</span>
+            <el-switch style="margin:0px 0 10px 108px;" v-model="timeType.hideTask" :active-color="themeColor" @change="onHideTask()"></el-switch>
+            <span style="margin:0px 0 10px 10px;color:#999;">是否隐藏</span>
+            <template v-if="!timeType.hideTask">
+                <el-switch style="margin-left:40px;" v-model="timeType.taskRequired" :active-color="themeColor"></el-switch>
+                <span style="margin:0px 0 10px 10px;color:#999;">{{ $t('parametermandatory') }}</span>
+            </template>
         </div>
         <div class="yanjiu">
             <span style="margin:0px 0 10px 10px;color:#666;">{{ $t('lable.taskGrouping') }}</span>
-            <el-switch style="margin-left:108px;" v-model="timeType.taskGroupRequired" :active-color="themeColor"></el-switch>
-            <span style="margin:0px 0 10px 10px;color:#999;">{{ $t('parametermandatory') }}</span>
+            <el-switch style="margin-left:108px;" v-model="timeType.hideGroup" :active-color="themeColor"></el-switch>
+            <span style="margin:0px 0 10px 10px;color:#999;">是否隐藏</span>
+            <template v-if="!timeType.hideGroup">
+                <el-switch style="margin-left:40px;" v-model="timeType.taskGroupRequired" :active-color="themeColor"></el-switch>
+                <span style="margin:0px 0 10px 10px;color:#999;">{{ $t('parametermandatory') }}</span>
+            </template>
         </div>
         <div class="yanjiu">
-            <span style="margin-left:10px;color:#666;">{{user.companyId==781?$t('other.specificcontentandresults'):$t('other.workMatters')}}</span>
-            <el-switch :style="user.companyId==781?'margin-left:66px;':'margin-left:108px;'" v-model="timeType.workContentState" :active-color="themeColor" > </el-switch>
-            <span style="margin-left:10px;color:#999;">{{ $t('parametermandatory') }}</span>
+            <span style="margin-left:10px;color:#666;">{{ $t('other.workMatters') }}</span>
+            <el-switch style="margin-left:108px;" v-model="timeType.hideContent" :active-color="themeColor" > </el-switch>
+            <span style="margin-left:10px;color:#999;">是否隐藏</span>
+            <template v-if="!timeType.hideContent">
+                <el-switch style="margin-left:40px;" v-model="timeType.workContentState" :active-color="themeColor"> </el-switch>
+                <span style="margin-left:10px;color:#999;">{{ $t('parametermandatory') }}</span>
+            </template>
         </div>
+        
         <!-- 是否开启导入审核 -->
         <div class="yanjiu" v-if="timeType.importReportAuditNormal == 0">
             <p style="margin-left:10px;color:#666;">{{ $t('importauditing') }}</p>
@@ -1076,6 +1086,8 @@
                     maxReportTime: 8,
                     hideStages: false,
                     hideTask: false,
+                    hideGroup: false,
+                    hideContent: false,
                 },
                 syncDateMonth:null,
                 syncingMainDb: false,
@@ -2208,6 +2220,7 @@
                         param.hideTask = param.hideTask ? 1 : 0
                         param.taskRequired = param.taskRequired ? 1 : 0
                         param.taskGroupRequired = param.taskGroupRequired ? 1 : 0
+                        // hideGroup 和 hideContent 保持为 boolean 类型，不转换为 0/1
 
                         var oneseet = 0
                         var twoset = 0
@@ -2279,6 +2292,8 @@
                             this.timeType.hideTask = this.timeType.hideTask? true: false;
                             this.timeType.taskRequired = this.timeType.taskRequired? true: false;
                             this.timeType.taskGroupRequired = this.timeType.taskGroupRequired? true: false;
+                            this.timeType.hideGroup = this.timeType.hideGroup? true: false;
+                            this.timeType.hideContent = this.timeType.hideContent? true: false;
                             // this.timeType.alertNonWorkday = this.timeType.alertNonWorkday ? true : false
 
                             if(this.timeType.alertNonWorkday) {