diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 17ca25ab..96b8e0d3 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -31,19 +31,25 @@
- {{scope.row.seqNo}} {{scope.row.phaseName}}
+ {{scope.row.seqNo}} {{scope.row.phaseName}}
-
+
+
+
+ 去设置
+ {{scope.row.mngUsername}}
+
+
- {{formatDate(scope.row.beginDate)}}~{{formatDate(scope.row.endDate)}}
+ {{formatDate(scope.row.beginDate)}}~{{formatDate(scope.row.endDate)}}
{{item.remark}}
- {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}}
- {{ formateOption('xmPhaseStatus',scope.row.phaseStatus)}}
+ {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}}
+
@@ -74,8 +80,7 @@
已取消
-
-
+
@@ -977,7 +982,7 @@ import XmProjectPhaseBatch from './XmProjectPhaseBatch.vue';
}
},
- calcTaskStateByTime(startTime,endTime,actRate,phaseStatus){
+ calcTaskStateByTime(startTime,endTime,actRate,phaseStatus){
if(startTime==null || startTime=="" || endTime==null || endTime ==""){
return {remark:"未配置日期",status:'warning'}
}
@@ -988,8 +993,12 @@ import XmProjectPhaseBatch from './XmProjectPhaseBatch.vue';
return {remark:this.toFixed(this.getDaysBetween(start,curDate))+"天后开始",status:'primary'};
}else if( this.getDaysBetween(curDate, start) > 0 && this.getDaysBetween(curDate, end) <= 0 ){
return {remark: this.toFixed(this.getDaysBetween(end, curDate))+"天后结束",status:'primary'};
- }else if( this.getDaysBetween(curDate, end) > 0 ){
- return {remark:"逾期"+( this.toFixed(this.getDaysBetween(curDate, end)) )+"天",status:'danger'};
+ }else if( this.getDaysBetween(curDate, end) > 0 ){
+ if(actRate>=100){
+ return {remark:"已完工"+( this.toFixed(this.getDaysBetween(curDate, end)) )+"天",status:'success'};
+ }else{
+ return {remark:"逾期"+( this.toFixed(this.getDaysBetween(curDate, end)) )+"天",status:'danger'};
+ }
}
},
/**