Bladeren bron

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

seyason 1 jaar geleden
bovenliggende
commit
c0d418ef8e
1 gewijzigde bestanden met toevoegingen van 6 en 2 verwijderingen
  1. 6 2
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

+ 6 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -545,7 +545,7 @@
                         </el-form-item>
                         <el-form-item v-if="user.company.packageProject == 1&& (user.company.nonProjectSimple==0 || (user.company.nonProjectSimple==1&&domain.isPublic != 1))">
                             <template slot="label">
-                                <span style="color:#FF0000;" v-if="user.timeType.reportAuditType == 1 ||user.timeType.reportAuditType == 2">*</span>
+                                <span style="color:#FF0000;" v-if="user.timeType.taskGroupRequired == 1 || user.timeType.reportAuditType == 1 || user.timeType.reportAuditType == 2">*</span>
                                 <span >{{$t('lable.taskGrouping')}}</span>
                             </template>
                             <!-- 任务分组 -->
@@ -783,7 +783,11 @@
                                     <el-option v-for="item in timeBasecostList" :label="item.name" :value="item.id" :key="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item :label="$t('lable.taskGrouping')" v-if="user.company.packageProject == 1">
+                            <el-form-item v-if="user.company.packageProject == 1">
+                                <template slot="label">
+                                    <span style="color:#FF0000;" v-if="user.timeType.taskGroupRequired == 1">*</span>
+                                    <span >{{$t('lable.taskGrouping')}}</span>
+                                </template>
                                 <!-- 任务分组 -->
                                 <el-select v-model="domain.groupId" :placeholder="$t('defaultText.pleaseSelectaTaskGroup')" style="width:200px;" clearable="true" 
                                 :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" @change="getGroupStages(domain, index)">