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

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

@@ -92,7 +92,7 @@
                             <el-dropdown-item v-if="user.timeType.syncFanwei==1">
                                 <el-link type="primary" :underline="false" @click="syncProjectForFanWei()">{{'同步项目信息'}}</el-link>
                             </el-dropdown-item>
-                            <el-dropdown-item>
+                            <el-dropdown-item v-if="permissions.projectClassification">
                                 <el-link type="primary" :underline="false" @click="functionalDivisionDig=true,getFunctionalList()">{{'职能分工设置'}}</el-link>
                             </el-dropdown-item>
                         </el-dropdown-menu>

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

@@ -467,7 +467,7 @@
                             <!-- <el-link type="primary" v-if="canEdit"
                                 :underline="false" style="margin-left:10px;" @click="copyProject(index)">复制</el-link> -->
                         </el-form-item>
-                        <el-form-item :label="user.companyId==781? $t('other.describe'):$t('other.projectDescription')" v-if="user.company.packageProject==0&&domain.projectId&&fillProjectList.filter(p=>p.id == domain.projectId)[0].projectDesc">
+                        <el-form-item :label="user.companyId==781? $t('other.describe'):$t('other.projectDescription')" v-if="user.company.packageProject==0&&domain.projectId&&fillProjectList.filter(p=>p.id == domain.projectId).length>0&&fillProjectList.filter(p=>p.id == domain.projectId)[0].projectDesc">
                             <span>{{fillProjectList.filter(p=>p.id == domain.projectId)[0].projectDesc}}</span>
                         </el-form-item>
                         <!--如果设置了工时成本预警的预算成本项-->
@@ -653,8 +653,8 @@
                                 <!-- <el-link type="primary" v-if="canEdit"
                                     :underline="false" style="margin-left:10px;" @click="copyProject(index)">复制</el-link> -->
                             </el-form-item>
-                            <el-form-item :label="user.companyId==781?$t('other.describe'):$t('other.projectDescription')" v-if="user.company.packageProject==0&&domain.projectId&&projectList.filter(p=>p.id == domain.projectId)[0].projectDesc">
-                                <span>{{projectList.filter(p=>p.id == domain.projectId)[0].projectDesc}}</span>
+                            <el-form-item :label="user.companyId==781?$t('other.describe'):$t('other.projectDescription')" v-if="user.company.packageProject==0&&domain.projectId&&fillProjectList.filter(p=>p.id == domain.projectId).length>0&&fillProjectList.filter(p=>p.id == domain.projectId)[0].projectDesc">
+                                <span>{{fillProjectList.filter(p=>p.id == domain.projectId)[0].projectDesc}}</span>
                             </el-form-item>
                             <!--如果设置了工时成本预警的预算成本项-->
                             <el-form-item :label="$t('lable.budgetSource')" v-if="user.company.packageProject==1&&timeBasecostList &&timeBasecostList.length>0">