diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 65b83c32..137daeae 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -12,6 +12,10 @@
+
+
+
+
@@ -337,6 +341,7 @@
queryScope:'compete',//compete/branchId/''/productId
id:'',//产品编号
pmUser:null,//产品经理
+ pstatus:'',
},
xmProducts: [],//查询结果
pageInfo:{//分页数据
@@ -472,6 +477,9 @@
if(this.filters.pmUser){
params.pmUserid=this.filters.pmUser.userid
}
+ if(this.filters.pstatus){
+ params.pstatus=this.filters.pstatus
+ }
this.load.list = true;
listXmProductWithState(params).then((res) => {
var tips=res.data.tips;
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index f66697de..299aef24 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -154,34 +154,45 @@
-
-
-
-
+
+
+
+
- {{scope.row.name}}
+ {{scope.row.name}}
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+ {{scope.row.totalProgress}}%
+
+
+
+
+
+
+
+
+
+
+
- {{scope.row.totalProgress}}%
+ {{scope.row.menuCnt>0?scope.row.finishMenuCnt+' / '+scope.row.menuCnt:''}}
-
-
+
+
+
+ {{scope.row.totalTaskCnt>0?scope.row.totalCompleteTaskCnt+' / '+scope.row.totalTaskCnt:''}}
+
+
+
+
+ {{scope.row.totalBugCnt>0?scope.row.totalClosedBugCnt+' / '+scope.row.totalBugCnt:''}}
+
+
+
{{scope.row.startTime? scope.row.startTime.substr(0,10) : ""}}~{{scope.row.endTime? scope.row.endTime.substr(0,10) : ""}}
@@ -197,7 +208,7 @@
-
+
+
@@ -232,6 +243,7 @@
项目重新启动发审(审核通过后生效)
+ -->
@@ -462,6 +474,9 @@
if(this.filters.productId){
params.productId = this.filters.productId
}
+ if(this.filters.status){
+ params.status = this.filters.status
+ }
params.createTimeStart=this.dateRanger[0]
params.createTimeEnd=this.dateRanger[1]
listXmProject(params).then((res) => {
@@ -819,6 +834,11 @@
return status;
}
},
+ formatterByDicts(row,column,cellValue){
+ if(column.property=='status'){
+ return this.formatProjectStatus(cellValue);
+ }
+ },
loadTasksToXmProjectState(row){
var params={projectId:row.id}
@@ -857,7 +877,7 @@
initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
this.dicts=res.data.data;
})
- this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table1.$el);
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.showInfo = false;
this.getXmProjects(this.guiderStart);
});