diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index e62414e5..a727c803 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -11,13 +11,13 @@
{{calcMenuLabel.label}}
-
+
-
+
@@ -53,7 +53,7 @@
-
+
@@ -64,8 +64,8 @@
-
-
+
+
@@ -82,8 +82,8 @@
-
-
+
+
@@ -91,45 +91,40 @@
-
+
-
+
-
+
-
+
-
- 关闭
- 提交
-
- 关闭
- 提交
+ 提交
@@ -158,6 +153,10 @@
由任务汇总： 指用户故事的工时数据由任务汇总。
手工填报： 指用户故事的工时数据来自手工填报，无论是否关联了任务，都不从任务汇总。
+
+
+ 提交
+
@@ -167,6 +166,9 @@
元
+
+ 提交
+
@@ -181,6 +183,10 @@
+
+
+ 提交
+
关联知识库
@@ -308,7 +314,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
//新增界面数据 项目需求表
editForm: {
menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:'',
- proposerId:'',proposerName:'',dlvl:'',dtype:'',priority:'',source:'',calcType:'1',mactWorkload:0,mactAmount:0,mactRate:0
+ proposerId:'',proposerName:'',dlvl:'',dtype:'',priority:'',source:'',calcType:'1',mactWorkload:0,mactAmount:0,mactRate:0,ctime:'',
},
proposerSelectVisible:false,
mmUserSelectVisible:false,
@@ -377,6 +383,8 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
this.editForm.proposerId=users[0].userid
this.editForm.proposerName=users[0].username
}
+ this.editXmMenuSomeFields(this.editForm,'proposerId',{proposerId:this.editForm.proposerId,proposerName:this.editForm.proposerName})
+
this.proposerSelectVisible=false
},
clearProposer:function(){
@@ -388,6 +396,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
this.editForm.mmUserid=users[0].userid
this.editForm.mmUsername=users[0].username
}
+ this.editXmMenuSomeFields(this.editForm,'mmUserid',users)
this.mmUserSelectVisible=false
},
clearMmUser:function(){
@@ -438,15 +447,22 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
}else if(fieldName==='mmUserid'){
params.mmUserid=$event[0].userid
params.mmUsername=$event[0].username
+ }else if(fieldName==='startTime'){
+ params.startTime=$event[0]
+ params.endTime=$event[1]
}else{
- params[fieldName]=$event
+ if(typeof $event ==='string'){
+ params[fieldName]=$event
+ }else{
+ params={...params,...$event}
+ }
}
editXmMenuSomeFields(params).then(res=>{
var tips = res.data.tips;
if(tips.isOk){
Object.assign(row,params)
- if(fieldName==='remark'){
+ if(fieldName==='remark'||fieldName==='link'){
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
}
}else{
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 0a92f452..764a49b2 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -275,7 +275,7 @@
{{scope.row.iterationName}}
-
+