diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
index 130ce88b..668719ae 100644
--- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
@@ -34,7 +34,7 @@
-
+
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index e24aca40..24b09182 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -1,37 +1,33 @@
-
+
-
-
-
-
-
-
-
+
+
+
- {{calcMenuLabel.label}}
+ {{calcMenuLabel.label}}名称
-
+
-
+
-
+
-
+
{{addForm.productName?addForm.productName:addForm.productId}}
-
+
无
@@ -45,8 +41,31 @@
{{addForm.pmenuName?addForm.pmenuName:addForm.pmenuId}}
-
+
+
+
+ {{addForm.mmUsername}}
+ 选跟进人
+
+
+
+
+
+
+
+
+
+ {{addForm.proposerName}}
+ 选提出人
+
+
+
+
+
+
+
+
@@ -78,63 +97,49 @@
-
-
-
- {{addForm.proposerName}}
- 选提出人
-
-
-
-
- {{addForm.mmUsername}}
- 选跟进人
-
-
-
-
-
+
+
-
-
+
+
+ 史诗下面是特性、特性下面是用户故事、故事下面是工作项（任务/bug）
+
+
下级往上级汇总
由任务汇总
手工填报
-
-
+
+
- h
+ h
- h
+ h
- h
+ h
控制规则:
下级往上汇总：指工时数据按 用户故事->特性->史诗 这样的汇总关系将数据逐级往上汇总。
由任务汇总： 指用户故事的工时数据由任务汇总。
手工填报： 指用户故事的工时数据来自手工填报，无论是否关联了任务，都不从任务汇总。
-
-
-
-
-
+
+
- 元
+ 元
- 元
+ 元
-
-
+
+
@@ -147,8 +152,14 @@
-
-
+
+
+ 关联知识库
+
+
+ 上传附件
+
+
@@ -161,7 +172,7 @@
- 取消
+ 关闭
提交
@@ -194,12 +205,7 @@
},
},
props:['xmMenu','visible','parentMenu'],
- watch: {
- 'xmMenu':function( xmMenu ) {
- this.addForm = {...xmMenu};
- this.addForm.mmUserid=this.userInfo.userid
- this.addForm.mmUsername=this.userInfo.username
- },
+ watch: {
'visible':function(visible) {
if(visible==true){
this.addForm={...this.xmMenu}
@@ -222,7 +228,7 @@
}
}else{
- this.addFOrm.dclass=this.xmMenu.dclass
+ this.addForm.dclass=this.xmMenu.dclass
}
this.addForm.mmUserid=this.userInfo.userid
@@ -369,6 +375,11 @@
}else if(this.parentMenu.dclass==='0'){
this.addForm.dclass='1'
}
+ if(this.addForm.dclass<3){
+ this.addForm.calcType="3"
+ }else{
+ this.addForm.calcType="1"
+ }
}
/**在下面写其它函数***/
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 6be003fe..9d484e31 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -1,43 +1,33 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{calcMenuLabel.label}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{editForm.productName?editForm.productName:editForm.productId}}
-
-
-
-
+
+
+
+
+
+
+
+
+ {{calcMenuLabel.label}}名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{editForm.productName?editForm.productName:editForm.productId}}
+
+
+
+
无
@@ -50,125 +40,126 @@
{{editForm.pmenuName?editForm.pmenuName:editForm.pmenuId}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{editForm.proposerName}}
- 选提出人
-
-
-
-
+
+
+
{{editForm.mmUsername}}
选跟进人
-
-
-
+
+
+
+
+
+
+
+
+ {{editForm.proposerName}}
+ 选提出人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+ 史诗下面是特性、特性下面是用户故事、故事下面是工作项（任务/bug）
+
+
下级往上级汇总
由任务汇总
手工填报
-
-
-
-
+
+
+
- h
+ h
- h
+ h
- h
+ h
控制规则:
下级往上汇总：指工时数据按 用户故事->特性->史诗 这样的汇总关系将数据逐级往上汇总。
由任务汇总： 指用户故事的工时数据由任务汇总。
手工填报： 指用户故事的工时数据来自手工填报，无论是否关联了任务，都不从任务汇总。
-
-
-
-
-
+
+
- 元
+ 元
- 元
+ 元
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关联知识库
+
+
+ 上传附件
+
+
+
@@ -182,6 +173,11 @@
+
+
+ 关闭
+ 提交
+
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index c35cb970..0a92f452 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -169,7 +169,7 @@
-
+
@@ -199,17 +199,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -349,14 +339,14 @@
-
+
-
+
-
+
-
+
@@ -519,7 +509,9 @@
addForm: {
menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',ntype:'0',childrenCnt:0,sinceVersion:''
},
-
+ addFormInit: {
+ menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',ntype:'0',childrenCnt:0,sinceVersion:''
+ },
editFormVisible: false,//编辑界面是否显示
//编辑xmMenu界面初始化数据
editForm: {
@@ -721,12 +713,20 @@
},
//显示新增界面 XmMenu xm_project_menu
showAdd: function (dclass) {
+ this.addForm={...this.addFormInit}
if(this.filters.product && this.filters.product.id){
this.parentMenu=null;
this.addForm.productId=this.filters.product.id
this.addForm.productName=this.filters.product.productName
this.addForm.dclass=dclass
this.addFormVisible = true;
+ }else if(this.filters.iteration && this.filters.iteration.id){
+ this.parentMenu=null;
+ this.addForm.productId=this.filters.iteration.productId
+ this.addForm.iterationId=this.filters.iteration.id
+ this.addForm.iterationName=this.filters.iteration.iterationName
+ this.addForm.dclass=dclass
+ this.addFormVisible = true;
}else{
this.$refs.xmProductSelect1.productVisible=true;
this.$notify({showClose: true, message: "请先选择一个产品", type: 'warning'});
@@ -735,6 +735,8 @@
//this.addForm=Object.assign({}, this.editForm);
},
showSubAdd:function(row){
+
+ this.addForm={...this.addFormInit}
this.editForm=row
this.parentMenu=row
this.expandRowKeysCpd.push(row.pmenuId);
@@ -744,6 +746,12 @@
}else{
this.addForm.productName=null;
}
+ if(this.filters.iteration && this.filters.iteration.id){
+ this.addForm.productId=this.filters.iteration.productId
+ this.addForm.iterationId=this.filters.iteration.id
+ this.addForm.iterationName=this.filters.iteration.iterationName
+ this.addFormVisible = true;
+ }
this.addFormVisible=true
},
showProdcutAdd:function(){
@@ -753,6 +761,12 @@
this.addFormVisible=false;
this.pageInfo.count=true;
//this.getXmMenus();
+ if(!row.pmenuId){
+ this.xmMenus.push(row);
+ }
+ if(this.parentMenu){
+ this.parentMenu.childrenCnt=this.parentMenu.childrenCnt?this.parentMenu.childrenCnt+1:1;
+ }
treeTool.reloadAllChildren(this.$refs.table,this.maps,[row,{...this.parentMenu}],'pmenuId',this.loadXmMenusLazy)
this.parentMenu=null;
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index f3ace78b..d913a900 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -158,10 +158,10 @@
无
-
-
+
+
无
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 126de020..3f5f24c8 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -994,14 +994,14 @@
return ""
}
if(row.handlerUsername){
- if(row.lremark){
- var lremark=row.lremark;
- lremark=lremark.replace(/<\w?>/g,"");
- lremark=lremark.replace(/<\/\w?>/g,"");
- if(lremark.length<=10){
- msg='已指派给'+row.handlerUsername+','+lremark
+ if(row.remarks){
+ var remarks=row.remarks;
+ remarks=remarks.replace(/<\w?>/g,"");
+ remarks=remarks.replace(/<\/\w?>/g,"");
+ if(remarks.length<=10){
+ msg='已指派给'+row.handlerUsername+','+remarks
}else{
- msg='已指派给'+row.handlerUsername+','+lremark.substr(0,10)+"..."
+ msg='已指派给'+row.handlerUsername+','+remarks.substr(0,10)+"..."
}
}else{