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

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

@@ -676,14 +676,10 @@
                         </el-form-item>
                         <!--项目管理专业版模式下，项目下的近期执行的任务 -->
                         <el-form-item :label="$t('other.task')+' / '+$t('other.milestone')" :prop="'domains.' + index + '.taskId'" v-if="user.company.packageProject==1&& (user.company.nonProjectSimple==0 || (user.company.nonProjectSimple==1&&domain.isPublic!=1))" >
-                            <template slot="label" v-if="user.companyId == 3092">
+                            <template slot="label" v-if="user.timeType.taskRequired == 1">
                                 <span style="color:#FF0000;">*</span>
                                 <span >任务</span>
                             </template>
-                            <template slot="label" v-if="user.companyId != 3092 && user.timeType.taskRequired == 1">
-                                <span style="color:#FF0000;">*</span>
-                                <span >任务/里程碑</span>
-                            </template>
                             <el-select v-model="domain.taskId" :placeholder="$t('defaultText.pleaseChoose')" style="width:75%;margin-right:7%" filterable="true" 
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" @change="onTaskSelected(domain)">
                                 <el-option v-for="item in domain.taskList" :key="item.taskId" :label="item.taskName" :value="item.taskId"></el-option>