浏览代码

任务状态

QuYueTing 1 月之前
父节点
当前提交
80b7700ac6

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -687,8 +687,8 @@ export default {
         taskTypeList:[{id:0,name:this.$t('other.task'), icon:"iconfont firerock-iconrenwu"},{id:1,name:this.$t('other.milestone'),icon:"iconfont firerock-iconicon-"},{id:2,name:this.$t('risk'),icon:"iconfont firerock-iconfengxian"}],
         taskTypeColor:[getThemeColor(),'#8613ad','#bf0404'],
         taskTypeIcon:['iconfont firerock-iconrenwu','iconfont firerock-iconicon-','iconfont firerock-iconfengxian'],
-        taskStatusList:[this.$t('ongoing'),this.$t('state.completed'),this.$t('state.undone'),'待第一审核人审核','待第二审核人审核','驳回'],
-        taskStatusColorList:['#20a0ff','#E6A23C','#a0a0a0','#f7863b','#262626','#FF0000'],
+        taskStatusList:[this.$t('ongoing'),this.$t('state.completed'),this.$t('state.undone'),'待第一审核人审核','待第二审核人审核','第一审核人驳回','第二审核人驳回'],
+        taskStatusColorList:['#20a0ff','#E6A23C','#a0a0a0','#f7863b','#262626','#FF0000','#FF0000'],
         
         //优先级
         taskLevelColor:['#262626','#E6A23C','#F56C6C'],

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/projectInside.vue

@@ -1360,7 +1360,7 @@
                 taskTypeList:[{id:0,name:this.$t('other.task'), icon:"iconfont firerock-iconrenwu"},{id:1,name:this.$t('other.milestone'),icon:"iconfont firerock-iconicon-"},{id:2,name:this.$t('risk'),icon:"iconfont firerock-iconfengxian"}],
                 taskTypeColor:[getThemeColor(),'#8613ad','#bf0404'],
                 taskTypeIcon:['iconfont firerock-iconrenwu','iconfont firerock-iconicon-','iconfont firerock-iconfengxian'],
-                taskStatusList:[this.$t('ongoing'),this.$t('state.completed'),this.$t('state.undone')],
+                taskStatusList:[this.$t('ongoing'),this.$t('state.completed'),this.$t('state.undone'),'待第一审核人审核','待第二审核人审核','第一审核人驳回','第二审核人驳回'],
                 //优先级
                 taskLevelColor:['#262626','#E6A23C','#F56C6C'],
                 stageListHeight:0,