diff --git a/src/api/xm/core/xmQuestion.js b/src/api/xm/core/xmQuestion.js index 059dee67..fab4752a 100644 --- a/src/api/xm/core/xmQuestion.js +++ b/src/api/xm/core/xmQuestion.js @@ -30,3 +30,7 @@ export const editXmQuestion = params => { return axios.post(`${base}/xm/core/xmQ export const addXmQuestion = params => { return axios.post(`${base}/xm/core/xmQuestion/add`, params); }; export const editStatus = params => { return axios.post(`${base}/xm/core/xmQuestion/editStatus`, params); }; + +export const editXmQuestionSomeFields = params => { return axios.post(`${base}/xm/core/xmQuestion/editSomeFields`, params); }; + + diff --git a/src/views/mdp/arc/tag/TagDialog.vue b/src/views/mdp/arc/tag/TagDialog.vue new file mode 100644 index 00000000..bc3a4ed2 --- /dev/null +++ b/src/views/mdp/arc/tag/TagDialog.vue @@ -0,0 +1,66 @@ + + + + + + + + + + + diff --git a/src/views/xm/core/xmGroup/XmGroupDialog.vue b/src/views/xm/core/xmGroup/XmGroupDialog.vue new file mode 100644 index 00000000..ccb739f3 --- /dev/null +++ b/src/views/xm/core/xmGroup/XmGroupDialog.vue @@ -0,0 +1,66 @@ + + + + + + + + + + + diff --git a/src/views/xm/core/xmGroup/XmGroupSelect.vue b/src/views/xm/core/xmGroup/XmGroupSelect.vue index b097fd36..0857df02 100644 --- a/src/views/xm/core/xmGroup/XmGroupSelect.vue +++ b/src/views/xm/core/xmGroup/XmGroupSelect.vue @@ -2,9 +2,9 @@ - + - + 确认选择 diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index cae66c2d..e074cc4d 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -2,11 +2,19 @@ - - - - - + + + + + {{item.name}} + + @@ -137,22 +145,13 @@ - + 取消 - 保存 - 确认 - 不是缺陷 - 直接解决 - 直接关闭 - 解决 - 关闭 - 关闭 - 重新激活 - 重新激活 + 保存 @@ -190,17 +189,19 @@ ]), calcBugStep(){ - if(this.editForm.bugStatus=='active'){ - return 1 - }else if(this.editForm.bugStatus=='confirmed'){ - return 2 - }else if(this.editForm.bugStatus=='resolved'){ - return 3 - }else if(this.editForm.bugStatus=='closed'){ - return 4 + if(this.dicts['bugStatus'] && this.editForm){ + var index=this.dicts['bugStatus'].findIndex(i=>{ + if(i.id==this.editForm.bugStatus){ + return true; + }else{ + return false; + } + }) + return index+1; }else{ - return 1; + return 0; } + } }, props:['xmQuestion','visible',"selProject"], @@ -241,7 +242,7 @@ }, //新增界面数据 xm_question editForm: { - id:'',name:'',projectId:'',projectName:'',taskId:'',taskName:'',endTime:'',askUserid:'',askUsername:'',handlerUserid:'',handlerUsername:'',priority:'',solution:'',processTime:'',receiptMessage:'',receiptTime:'',description:'',createUserid:'',createUsername:'',createTime:'',status:'',receiptMessage:'', + id:'',name:'',projectId:'',projectName:'',taskId:'',taskName:'',endTime:'',askUserid:'',askUsername:'',handlerUserid:'',handlerUsername:'',priority:'',solution:'',processTime:'',receiptMessage:'',receiptTime:'',description:'',createUserid:'',createUsername:'',createTime:'',bugStatus:'',receiptMessage:'', attachment: [],iterationId:'',iterationName:'',productId:'', }, /**begin 在下面加自定义属性,记得补上面的一个逗号**/ diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 4ac235e4..fd167333 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -17,8 +17,8 @@ - 标签 - {{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个 + 标签 + {{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个 @@ -124,28 +124,57 @@ - - {{formatterOption(scope.row,{property:'bugSeverity'},scope.row.bugSeverity)}} - {{formatterOption(scope.row,{property:'bugSeverity'},scope.row.bugSeverity)}} - {{formatterOption(scope.row,{property:'bugSeverity'},scope.row.bugSeverity)}} - {{formatterOption(scope.row,{property:'bugSeverity'},scope.row.bugSeverity)}} - {{formatterOption(scope.row,{property:'bugSeverity'},scope.row.bugSeverity)}} - {{scope.row.name}} - - + + {{scope.row.name}} + - - 创建 - 已激活 - 确认 - 已确认 - 解决 - 已解决 - 关闭 - 已关闭 - {{scope.row.bugStatus}} + + + {{item.name}} + + + + + + + + + + + + {{item.name}} + + + + + + + + + + + + {{formaterByDicts(scope.row,'solution',scope.row.solution)}} + + + + + + + + + + + + {{formaterByDicts(scope.row,'bugSeverity',scope.row.bugSeverity)}} + + + + + + @@ -156,16 +185,27 @@ - + + + + {{ scope.row.handlerUsername}} + + + 负责人 + + - - - - - 编辑 + + + {{ scope.row.tagNames}} + + + 标签 + + @@ -178,20 +218,13 @@ - - - - - + - - - - - + +