Browse Source

调整报表点击人员在点击部门加载过慢的问题

Lijy 2 năm trước cách đây
mục cha
commit
e57caa3193

+ 4 - 2
fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -42,7 +42,8 @@ const StringUtil = {
         setFinanceAuditor: false, //设置财务审核人
 
         // 项目报表服务 // 
-        reportProject: false, // 全部项目报表 //
+        reportAllProject: false, // 全部项目报表 //
+        reportProject: false, // 负责项目报表 //
         reportAllTask : false, // 全部项目任务报表 //
         reportTask : false, // 负责项目任务报表 //
         reportAllCostOf : false, // 全部项目成本报表 // 
@@ -165,7 +166,8 @@ const StringUtil = {
         arr[i] == '日报待审核统计' ? obj.reportAuditRate = true : ''
         arr[i] == '查看工时统计' ? obj.countHours = true : ''
         arr[i] == '查看成本统计' ? obj.countCost = true : ''
-        arr[i] == '全部项目报表' ? obj.reportProject = true : ''
+        arr[i] == '全部项目报表' ? obj.reportAllProject = true : ''
+        arr[i] == '负责项目报表' ? obj.reportProject = true : ''
         arr[i] == '批量填报' ? obj.reportBatch = true : ''
         arr[i] == '项目阶段管理' ? obj.projectPhase = true : ''
         arr[i] == '全公司工时统计' ? obj.reportPersonnel = true : ''

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -19,7 +19,7 @@
                   <i class="iconfont firerock-iconbaobiao"></i>
                   <span>项目报表服务</span>
                 </template>
-                  <el-menu-item index="1-1" v-if="permissions.reportProject"><p @click="ssl(0)">项目报表</p></el-menu-item>
+                  <el-menu-item index="1-1" v-if="permissions.reportProject || permissions.reportAllProject"><p @click="ssl(0)">项目报表</p></el-menu-item>
                   <el-menu-item index="1-2" v-if="permissions.reportTask || permissions.reportAllTask"><p @click="ssl(1)">项目任务报表</p></el-menu-item>
                   <el-menu-item index="1-3" v-if="permissions.reportCostOf || permissions.reportAllCostOf"><p @click="ssl(2)">项目成本报表</p></el-menu-item>
                   <el-menu-item index="1-9" v-if="permissions.reportAllTimeDivide || permissions.reportTimeDivide"><p @click="ssl(8)">人员工时分配表</p></el-menu-item>
@@ -744,7 +744,7 @@ export default {
   },
   methods: {
     authorityToJudge() {
-      if(this.permissions.reportProject) {this.ssl(0);this.defaultActive = '1-1';return} else
+      if(this.permissions.reportProject || this.permissions.reportAllProject) {this.ssl(0);this.defaultActive = '1-1';return} else
       if(this.permissions.reportTask || this.permissions.reportAllTask) {this.ssl(1);this.defaultActive = '1-2';return} else
       if(this.permissions.reportCostOf || this.permissions.reportAllCostOf) {this.ssl(2);this.defaultActive = '1-3';return} else
       if(this.permissions.reportTimeDivide || this.permissions.reportAllTimeDivide) {this.ssl(8);this.defaultActive = '1-9';return} else

+ 4 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -370,7 +370,10 @@
                 </el-form-item>
                 <!--专业项目协作版本功能 -->
                 <el-form-item label="级别" v-if="user.company.packageProject==1">
-                    <el-select v-model="addForm.level"  placeholder="请选择级别" style="width:32%;" >
+                    <el-select v-model="addForm.level"  placeholder="请选择级别" style="width:32%;" v-if="user.timeType.projectLevelState == 1">
+                        <el-option v-for="item in levelList" :key="item.id" :label="item.projectLevelName" :value="item.id"></el-option>
+                    </el-select>
+                    <el-select v-model="addForm.level"  placeholder="请选择级别" style="width:32%;" v-else>
                         <el-option v-for="item in importanceList" :key="item.id" :label="item.label" :value="item.id"></el-option>
                     </el-select>
                 <!-- 增加合同金额字段 -->