From 78a7cab08855278e26e582fcfff6220c61ff98cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 21 Jul 2022 22:37:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/xmQuestion/XmQuestionEdit.vue | 360 +++++++++--------- .../xm/core/xmTestCase/XmTestCaseEdit.vue | 34 +- 2 files changed, 209 insertions(+), 185 deletions(-) diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index c3f503b0..51a55fc0 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -2,192 +2,188 @@
- - - {{editForm.createUsername}} 于 {{editForm.createTime}} 创建 - - {{editForm.tagNames?editForm.tagNames:''}} - 标签 - - 拷贝链接(快速分享) - - - - - {{editForm.projectId}} - - - - - -
- -
{{editForm.menuName?editForm.menuName:"未关联需求"}}
-
-
- - - {{editForm.handlerUsername}} - - - 提出人
- 创建人
- 其它人
-
- 指派给 -
-
-
-
- - - - - {{i.name}} - - - - - - - {{i.name}} - - - - - - - - - - - + + + + + 用例编号:  {{editForm.caseId}}   模块:{{editForm.funcName}} 选择模块 + + + {{editForm.createUsername}} 于 {{editForm.createTime}} 创建 + + {{editForm.tagNames?editForm.tagNames:''}} + 标签 + + 拷贝链接(快速分享) + + + + {{editForm.handlerUsername}} + + + 提出人
+ 创建人
+ 其它人
+
+ 指派给 +
+
+
+ + + + + {{i.name}} + + + + + + + {{i.name}} + + + + + + + + +
+ + + + + + + + + {{editForm.askUsername?editForm.askUsername:'未关联提出人'}} + + + + + + {{i.name}} + + + + + + + + + + + + + - - {{editForm.askUsername?editForm.askUsername:'未关联提出人'}} - - + + + {{i.name}} + + +
- - - {{i.name}} + + + {{i.name}} - - - - - - - - -
- - - - - - {{i.name}} - - - - - - - {{i.name}} - - - - - - - - {{i.name}} - - - - - - - {{i.name}} + + + + + + {{i.name}} - - -
- - - - - - - 取消 - 保存 - - - - - - - - - - - 取消 - 保存 - - - - - - - - - - - 取消 - 保存 - - - - - - - {{flowInfoVisible?'去隐藏':'去显示'}}流转记录 - - + + + + {{i.name}} + + + + + + + + + + + + + 取消 + 保存 + + + + + + - - - - 取消 - 保存 + 保存 - - - - - -
- - - - - - + + + + + + {{flowInfoVisible?'去隐藏':'去显示'}}流转记录 + + + + + + + + + + + 取消 + 保存 + + + + + + + + + + + + + + + + + + + {{editForm.projectId}} + - + + +
+ +
{{editForm.menuName?editForm.menuName:"未关联需求"}}
+
+
+ @@ -204,6 +200,10 @@ + + + +
@@ -225,6 +225,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect'; import XmMyDoFocus from '@/views/myWork/my/components/DoFocus'; + import XmFuncSelect from '../xmFunc/XmFuncSelect' export default { computed: { ...mapGetters([ @@ -333,6 +334,7 @@ opStepEditorVisible:false, xmProductVersions:[{id:"1.0.0" ,name:'1.0.0'}], activateTabPaneName:'12', + funcVisible:false, /**end 在上面加自定义属性**/ }//end return },//end data @@ -543,6 +545,14 @@ params.productId=$event.productId params.menuId=$event.menuId params.menuName=$event.menuName + if($event.funcId){ + params.funcId=$event.funcId + params.funcName=$event.funcName + } + }else if(fieldName==='funcId'){ + params.productId=$event.productId + params.funcId=$event.id + params.funcName=$event.name }else{ params[fieldName]=$event } @@ -564,12 +574,20 @@ this.$copyText(link).then(e => { this.$notify({position:'bottom-left',showClose:true,message:"拷贝成果",type:'success'}) }); + }, + onFuncSelected(row){ + this.editForm.funcId=row.id + this.editForm.funcName=row.name + this.funcVisible=false; + if(this.opType!=='add'){ + this.editXmQuestionSomeFields(this.editForm,'funcId',row) + } } },//end method components: { //在下面添加其它组件 'xm-question-edit':XmQuestionEdit 'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect, - XmMyDoFocus + XmMyDoFocus,XmFuncSelect, }, mounted() { console.log("question_add"); diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue index 0daccc57..7b4155dc 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -1,7 +1,5 @@