Lijy 4 bulan lalu
induk
melakukan
e55713f169

+ 6 - 1
fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -152,7 +152,10 @@ const StringUtil = {
 
         // 设备管理
         equipmentInformationManagement: false,
-        equipmentCostManagement: false
+        equipmentCostManagement: false,
+
+        // 任务
+        tasksReviewTaskFile: false
         
     }
     // console.log(arr);
@@ -291,6 +294,8 @@ const StringUtil = {
         arr[i] == '设备信息管理' ? obj.equipmentInformationManagement = true : ''
         arr[i] == '设备成本管理' ? obj.equipmentCostManagement = true : ''
         arr[i] == '奖金明细' ? obj.financialBonusDetails = true : ''
+
+        arr[i] == '审核任务文件' ? obj.tasksReviewTaskFile = true : ''
     }
     return obj
   }

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

@@ -107,7 +107,7 @@
                     <p :class="idx == 0 ? 'on' : ''" @click="switchs(0)" v-if="permissions.projectView || permissions.projectManagement || permissions.projectViewAllTasks">{{ $t('alltaskss') }}</p>
                     <p :class="idx == 1 ? 'on' : ''" @click="switchs(1)">{{ $t('perform') }}</p>
                     <p :class="idx == 2 ? 'on' : ''" @click="switchs(2)">{{ $t('created') }}</p>
-                    <p :class="idx == 3 ? 'on' : ''" @click="switchs(3)" v-if="user.timeType.taskFileCharge == 1">待审核文件</p>
+                    <p :class="idx == 3 ? 'on' : ''" @click="switchs(3)" v-if="user.timeType.taskFileCharge == 1 && permissions.tasksReviewTaskFile">待审核文件</p>
                 </div>
             </div>
             <div style="max-width: 94%;min-width: 90%">
@@ -156,7 +156,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="finalChargeStatusText" label="文件审核状态" width="210" sortable v-if="user.timeType.taskFileCharge == 1 && [0, 2].includes(idx)">
+                    <el-table-column prop="finalChargeStatusText" label="文件审核状态" width="210" sortable v-if="user.timeType.taskFileCharge == 1 && [0, 1, 2].includes(idx)">
                         <template slot-scope="scope">
                             <template v-if="scope.row.finalChargeStatus != 2">
                                 <el-link :type="{'0': 'warning', '1': 'info', '2': 'danger'}[scope.row.fileChargeStatus]" :underline="false">