From eb72b257db0e2911107f38212425b3f554329bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 27 Jul 2022 00:21:31 +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

---
 .../core/xmQuestion/XmQuestionAddForTask.vue  |  516 --------
 .../xm/core/xmQuestion/XmQuestionEdit.vue     |   14 +-
 .../xm/core/xmQuestion/XmQuestionForTask.vue  | 1131 -----------------
 .../xm/core/xmQuestion/XmQuestionMng.vue      |    8 +-
 src/views/xm/core/xmTask/XmTaskEdit.vue       |    7 +-
 .../xm/core/xmTestCase/XmTestCaseEdit.vue     |    2 +-
 .../xm/core/xmTestCasedb/XmTestCasedbMng.vue  |    6 +-
 7 files changed, 28 insertions(+), 1656 deletions(-)
 delete mode 100644 src/views/xm/core/xmQuestion/XmQuestionAddForTask.vue
 delete mode 100644 src/views/xm/core/xmQuestion/XmQuestionForTask.vue

diff --git a/src/views/xm/core/xmQuestion/XmQuestionAddForTask.vue b/src/views/xm/core/xmQuestion/XmQuestionAddForTask.vue
deleted file mode 100644
index 3deb1c07..00000000
--- a/src/views/xm/core/xmQuestion/XmQuestionAddForTask.vue
+++ /dev/null
@@ -1,516 +0,0 @@
-<template>
-	<section> 
-		<el-row class="page-main">
-			<el-form :model="addForm" label-width="120px"  :rules="addFormRules" ref="addForm">
-						<el-form-item label="缺陷标题" prop="name">
-							<el-input v-model="addForm.name" placeholder="缺陷标题" ></el-input> 
-						</el-form-item>
-						<el-row>
-							<el-col :span="8">
-								<el-form-item label="归属项目" prop="projectId">
-									<font v-if="filters.selProject">{{this.filters.selProject?this.filters.selProject.name:''}}</font>
- 									 <xm-project-select ref="xmProjectSelect" v-if="!selProject" @row-click="onPorjectConfirm"></xm-project-select>
-								</el-form-item>
-							</el-col>
-							<el-col  :span="8">
-								<el-form-item label="隶属需求" prop="menuId"> 
-									<el-tag title="隶属需求" closable @click="showSelectMenu" @close.stop="handleCloseMenuTag">
-									<div class="icon" :style="{backgroundColor:   'rgb(79, 140, 255)' }">
-										<i :class="  'el-icon-document'  " ></i>
-									</div> {{addForm.menuName?addForm.menuName:"未关联需求"}}</el-tag> 
-								</el-form-item>
-							</el-col>
-							<el-col :span="8">
-								<el-form-item label="负责人" prop="handlerUsername">
-									{{addForm.handlerUsername}} 
-									  <el-popover
-										placement="top-start"
-										title="重新指派给"
-										width="200"
-										trigger="hover" >
-											<el-row>
-												<el-button type="text" @click="sendToAsk">提出人</el-button><br>
-												<el-button type="text"  @click="sendToCreater">创建人</el-button><br>
-												<el-button type="text"  @click="showGroupUsers('handlerUsername')">其它人</el-button><br>
-											</el-row>
-										<el-button slot="reference"  type="text">指派给</el-button>
-									</el-popover>
-									
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col :span="8">
-								<el-form-item label="严重程度" prop="bugSeverity">
-								<el-select v-model="addForm.bugSeverity" placeholder="请选择严重程度">
-									<el-option v-for="(i,index) in dicts['bugSeverity']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-								</el-select> 
-								</el-form-item>
-							</el-col> 
-							<el-col :span="8">
-								<el-form-item label="优先级别" prop="priority">
-									<el-select v-model="addForm.priority" placeholder="请选择优先级">
-										<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-									</el-select> 
-								</el-form-item> 
-							</el-col>
-							<el-col :span="8">
-								<el-form-item label="结束时间" prop="endTime">
-										<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="addForm.endTime"></el-date-picker>
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-tabs value="1">
-							<el-tab-pane name="1" label="基本信息">
-								<el-row> 
-										<el-col :span="6">
-											<el-form-item label="复现频率" prop="repRate">
-												<el-select v-model="addForm.repRate" placeholder="请选择复现频率">
-													<el-option v-for="(i,index) in dicts['bugRepRate']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-												</el-select> 
-											</el-form-item>
-											
-										</el-col> 
-										<el-col :span="6">
-											<el-form-item label="复现版本" prop="verNum">
-												<el-select v-model="addForm.verNum" placeholder="请选择版本">
-													<el-option v-for="(i,index) in xmProductVersions" :label="i.name" :value="i.id" :key="index">{{i.id}}</el-option>
-												</el-select> 
-											</el-form-item>
-										</el-col> 
-										<el-col :span="6">
-											<el-form-item label="缺陷类别" prop="bugType">
-												<el-select v-model="addForm.bugType" placeholder="请选择缺陷类别">
-													<el-option v-for="(i,index) in dicts['bugType']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
-												</el-select> 
-											</el-form-item>
-											
-										</el-col> 
-										<el-col :span="6">
-											<el-form-item label="提出人" prop="askUsername">
-												<el-tag @click="showGroupUsers('askUsername')">{{addForm.askUsername?addForm.askUsername:'未关联提出人'}}</el-tag>
- 											</el-form-item> 
-										</el-col>
-								</el-row>
-
-								
-								<el-form-item label="缺陷描述" prop="description">
-									<el-tooltip content="点击切换为富文本编辑|普通文本">
-										<el-button icon="el-icon-refresh" @click="descriptionEditorVisible=!descriptionEditorVisible" type="text"></el-button>
-									</el-tooltip>
-									<div v-if="descriptionEditorVisible==false">
-										<el-input  style="width:100%;" v-model="addForm.description" type="textarea" :rows="6"> </el-input>
-									</div>
-									<div v-else>
-										<vue-editor class="rich-context" :id="'description_'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
-									</div>
-								</el-form-item>
-							</el-tab-pane>
-							<el-tab-pane label="测试步骤" name="2">
-								<el-form-item label="测试步骤" prop="opStep">
-									<el-tooltip content="点击切换为富文本编辑|普通文本">
-										<el-button icon="el-icon-refresh" @click="opStepEditorVisible=!opStepEditorVisible" type="text"></el-button>
-									</el-tooltip>
-									<div v-if="opStepEditorVisible==false">
-										<el-input  style="width:100%;" v-model="addForm.opStep" type="textarea" :rows="6"> </el-input>
-									</div>
-									<div v-else>
-										<vue-editor  :id="'opStep'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.opStep" ref="opStep"></vue-editor>
-									</div>
-								</el-form-item>
-							</el-tab-pane>
-							<el-tab-pane label="预期结果" name="3">
-								<el-form-item label="预期结果" prop="expectResult">
-									<el-tooltip content="点击切换为富文本编辑|普通文本">
-										<el-button icon="el-icon-refresh" @click="expectResultEditorVisible=!expectResultEditorVisible" type="text"></el-button>
-									</el-tooltip>
-									<div v-if="expectResultEditorVisible==false">
-										<el-input  style="width:100%;" v-model="addForm.expectResult" type="textarea" :rows="6"> </el-input>
-									</div>
-									<div v-else>
-										<vue-editor v-if="expectResultEditorVisible==true" :id="'expectResult'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.expectResult"  ref="expectResult"></vue-editor>
-									</div>
-								</el-form-item>
-							</el-tab-pane> 
-						</el-tabs> 
-			</el-form>
-			<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="70%"  append-to-body   :close-on-click-modal="false">
-				<xm-group-mng  :sel-project="filters.selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
-			</el-drawer>
-
-			<el-drawer title="选中任务" :visible.sync="selectTaskVisible" fullscreen  size="70%"  append-to-body   :close-on-click-modal="false">
-				<xm-task-list  :sel-project="filters.selProject"   @task-selected="onSelectedTask"></xm-task-list>
-			</el-drawer>
-
-			<el-drawer append-to-body title="需求选择" :visible.sync="selectMenuVisible"   size="70%"   :close-on-click-modal="false">
-				<xm-menu-select :is-select-menu="true" checkScope="3"  @selected="onSelectedMenu" :sel-project="filters.selProject" :xm-product="xmProduct"></xm-menu-select>
-			</el-drawer> 
-		</el-row>
-		<el-row>
-			<el-button @click.native="handleCancel">取消</el-button>
-			<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">保存</el-button>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { addXmQuestion } from '@/api/xm/core/xmQuestion';
-	import { mapGetters } from 'vuex';
-	import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件
-	import {sn} from '@/common/js/sequence';
-	import VueEditor from '@/components/Tinymce/index';
-
-	import XmGroupMng from '../xmGroup/XmGroupSelect';
-	import xmMenuSelect from '../xmMenu/XmMenuSelect';
-	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
-
-
-	import XmTaskList from '../xmTask/XmTaskList';
-
-	export default {
-		computed: {
-			...mapGetters([
-				'userInfo','roles'
-			]),
-			calcBugStep(){
-				if(this.dicts['bugStatus'] && this.addForm){
-					var index=this.dicts['bugStatus'].findIndex(i=>{
-						if(i.id==this.addForm.bugStatus){
-							return true;
-						}else{
-							return false;
-						}
-					})
-					return index+1;
-				}else{
-					return 0;
-				}
-				 
-			}
-		},
-		props:['xmTask','xmQuestion','visible',"selProject",'xmProduct'],
-		watch: {
-	      'xmQuestion':function( xmQuestion ) {
-		   this.addForm=Object.assign(this.addForm, this.xmQuestion);
-		   this.addForm.qtype=this.qtype
-	      },
-	      'visible':function(visible) {
-	      	if(visible==true){
-				  //从新打开页面时某些数据需要重新加载，可以在这里添加
-				  if(this.qtype){
-					   this.addForm.qtype=this.qtype
-				  }else{
-					   this.addForm.qtype='1'
-				  }
-				  
-				   this.addForm.id=sn()
-				   this.initByTask();
-
-	      	}
-		  },
-		  selProject:function(selProject){
-			  if(!selProject){
-				  this.filters.selProject=null;
-				  this.addForm.projectId=''
-				  this.addForm.projectName=''
-			  }else{
-				  this.filters.selProject=selProject
-				  this.addForm.projectId=selProject.id
-				  this.addForm.projectName=selProject.name
-			  }
-		  }
-	    },
-		data() {
-			return {
-				filters:{
-					selProject:null,
-				},
-				dicts:{
-					priority:[],
-					bugSeverity:[],
-					bugSolution:[],
-					bugStatus:[],
-					bugType:[],
-					bugRepRate:[],
-				},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					name: [
-						{required: true, message: '缺陷标题不可为空', trigger: 'blur' }
-					],
-					askUsername: [
-						{required: true, message: '提出人不可为空', trigger: 'blur' }
-					],
-					handlerUsername: [
-						{required: true, message: '请指派给一个人', trigger: 'blur' }
-					],
-				},
-				//新增界面数据 xm_question
-				addForm: {
-					id:'',name:'',projectId:'',projectName:'',taskId:'',taskName:'',endTime:'',askUserid:'',askUsername:'',handlerUserid:'',handlerUsername:'',priority:'3',solution:'',processTime:'',receiptMessage:'',receiptTime:'',description:'',createUserid:'',createUsername:'',createTime:'',status:'',bugSeverity:'3',
-					qtype:'',
-					attachment: [],
-					repRate:'',
-					verNum:'',
-					bugReason:'',
-				},
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				fileVisible: true,
-				selectUserVisible: false,
-				userFieldName:'',
-				selectTaskVisible:false,
-				selectMenuVisible:false,
-				selectProjectVisible:false,
-				opStepEditorVisible:false,
-				expectResultEditorVisible:false,
-				descriptionEditorVisible:false,
-				xmProductVersions:[{id:"1.0.0" ,name:'1.0.0'}],
-
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.setDefaultData();
-				this.$emit('cancel');
-			},
-			//新增提交XmQuestion xm_question 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				this.$refs.addForm.validate((valid) => {
-					console.log(this.addForm.handlerUserid);
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => {
-							this.load.add=true
-							let params = Object.assign({}, this.addForm);
-
-							if(params.expectResult){
-								params.expectResult=params.expectResult.replace(/<p>\n<br>\n<\p>/g,"");
-								params.expectResult=params.expectResult.replace(/<p><br><\p>/g,"");
-							}
-							if(params.opStep){
-								params.opStep=params.opStep.replace(/<p>\n<br>\n<\p>/g,"");
-								params.opStep=params.opStep.replace("<p><br><\p>","");
-							}
-							if(params.description){
-								params.description=params.description.replace(/<p>\n<br>\n<\p>/g,"");
-								params.description=params.description.replace("<p><br><\p>","");
-							}
-							if(this.xmProduct && this.xmProduct.id){
-								params.productId=this.xmProduct.id
-							}
-							addXmQuestion(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$emit('submit');//  @submit="afterAddSubmit"
-									this.handleCancel();
-								}
-								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			},
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-			//上传附件
-			onChange : function(file,fileList){
-				let list = [];
-				if(fileList != null && fileList.length > 0){
-					fileList.forEach( (item)=>{
-						let fileOne = {
-							id: item.id,
-							name: item.name,
-							addr: item.url,
-							type: item.fileSuffix,
-							remark: item.remark,
-						}
-						list.push(fileOne);
-					} );
-					this.addForm.attachment = list;
-					console.log(list);
-				}
-			},
-
-			setDefaultData() {
-				this.addForm.id = sn();
-				if(this.filters.selProject){
-
-					this.addForm.projectId = this.filters.selProject.id;
-					this.addForm.projectName = this.filters.selProject.name;
-				}
-				this.addForm.createUserid = this.userInfo.userid;
-				this.addForm.createUsername = this.userInfo.username;
-				this.addForm.askUserid = this.userInfo.userid;
-				this.addForm.askUsername = this.userInfo.username;
-				this.addForm.handlerUserid = this.userInfo.userid;
-				this.addForm.handlerUsername = this.userInfo.username;
-				this.addForm.endTime = this.formateDate(new Date().getTime() + 7*24*3600*1000);
-				this.fileVisible = this.visible;
-				console.log("set default data success");
-			},
-			formateDate(time) {
-				const date = new Date(time);
-				const m = date.getMonth()+1;
-				const d = date.getDate();
-				return date.getFullYear()+"-"+(m < 10 ? "0"+m : m)+"-"+ (d < 10 ? "0"+d : d) + " 00:00:00";
-			},
-			showGroupUsers:function(fieldName){
-				this.userFieldName=fieldName;
-				this.selectUserVisible=true;
-			},
-			onUserConfirm:function(groupUsers){
-				if(groupUsers==null || groupUsers.length==0){
-					if(this.userFieldName=='askUsername'){
-						this.addForm.askUserid=''
-						this.addForm.askUsername=''
-					}else if(this.userFieldName=='handlerUsername'){
-						this.addForm.handlerUserid=''
-						this.addForm.handlerUsername='';
-					}
-				}else{
-					var user=groupUsers[0]
-					if(this.userFieldName=='askUsername'){
-						this.addForm.askUserid=user.userid
-						this.addForm.askUsername=user.username
-					}else if(this.userFieldName=='handlerUsername'){
-						this.addForm.handlerUserid=user.userid
-						this.addForm.handlerUsername=user.username
-					}
-				}
-				this.selectUserVisible=false
-			},
-			showSelectTask:function(){
-				if(this.filters.selProject==null){
-					this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'error' });
-					return ;
-				}
-				this.selectTaskVisible=true;
-			},
-			onSelectedTask(task){
-				this.addForm.taskId=task.id
-				this.addForm.taskName=task.name
-				this.selectTaskVisible=false;
-				if(task.menuId){
-					this.addForm.menuId=task.menuId
-					this.addForm.menuName=task.menuName
-					this.addForm.productId=task.productId
-				}
-				
-				this.addForm.handlerUserid=task.executorUserid
-				this.addForm.handlerUsername=task.executorUsername 
-			},
-			handleCloseTaskTag:function(){
-				this.addForm.taskId=''
-				this.addForm.taskName=""
-			},
-			showSelectMenu:function(){
-				if(this.filters.selProject==null){
-					this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'error' });
-					this.$refs.xmProjectSelect.projectVisible=true;
-					return ;
-				}
-				this.selectMenuVisible=true;
-			},
-			onSelectedMenu(menu){
-				this.addForm.menuId=menu.menuId
-				this.addForm.menuName=menu.menuName
-				this.addForm.iterationId=menu.iterationId
-				this.addForm.iterationName=menu.iterationName
-				this.addForm.productId=menu.productId
-				this.selectMenuVisible=false;
-			},
-			handleCloseMenuTag:function(){
-				this.addForm.menuId=''
-				this.addForm.menuName=""
-			},
-			sendToCreater(){
-				this.addForm.handlerUsername=this.addForm.createUsername
-				this.addForm.handlerUserid=this.addForm.createUserid
-			},
-			sendToAsk(){
-				this.addForm.handlerUsername=this.addForm.askUsername
-				this.addForm.handlerUserid=this.addForm.askUserid
-			}, 
-			onPorjectConfirm:function(project){
-				this.filters.selProject=project
-				this.addForm.projectId=project.id
-				this.addForm.projectName=project.name
-				this.selectProjectVisible=false;
-			},
-			clearProject(){
-				this.filters.selProject=null
-				this.addForm.projectId=''
-				this.addForm.projectName=''
-			},
-			initByTask(){
-				if(this.xmTask && this.xmTask.id){ 
- 					this.addForm.menuId=this.xmTask.menuId
-					this.addForm.menuName=this.xmTask.menuName
-					this.addForm.taskId=this.xmTask.id
-					this.addForm.taskName=this.xmTask.name
-					this.addForm.projectId=this.xmTask.projectId
-					this.addForm.productId=this.xmTask.productId 
-					if(this.xmTask.executorUserid){
-						this.addForm.handlerUserid = this.xmTask.executorUserid;
-						this.addForm.handlerUsername = this.xmTask.executorUsername;
-					}else{
-						this.addForm.handlerUserid = this.xmTask.createUserid;
-						this.addForm.handlerUsername = this.xmTask.createUsername;
-					}
-					
-				}
-			}
-			/**end 在上面加自定义方法**/
-
-		},//end method
-		components: {
-				//在下面添加其它组件 'xm-question-edit':XmQuestionEdit
-				'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmProjectSelect
-		},
-		mounted() {
-			console.log("question_add");
-			this.addForm=Object.assign(this.addForm, this.xmQuestion);
-			if(!this.selProject){
-				this.filters.selProject=null
-			}else{
-				this.filters.selProject=this.selProject
-			}
-			this.addForm.qtype=this.qtype
-			this.setDefaultData();
-			this.initByTask();
-			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate']).then(res=>{
-				if(res.data.tips.isOk){
-					this.dicts['bugSeverity']=res.data.data.bugSeverity
-					this.dicts['bugSolution']=res.data.data.bugSolution
-					this.dicts['bugStatus']=res.data.data.bugStatus
-					this.dicts['bugType']=res.data.data.bugType
-					this.dicts['priority']=res.data.data.priority
-					this.dicts['bugRepRate']=res.data.data.bugRepRate
-				}
-			});
-			/**在下面写其它函数***/
-
-		}//end mounted
-	}
-
-</script>
-
-<style lang="scss" scoped>
-
-  .wf-main-context-box {
-	border:1px dashed #000;
-	margin-bottom: 10px;
-	margin-top: 30px;
-	padding:10px;
-}
- .wf-main-context p {
-	color: #585858;
-}
-
-.wf-main-context   p  > img {
-	max-width: 100%;
-}
-</style>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index e4e91ec5..2761d907 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -228,7 +228,7 @@
 				 
 			}
 		},
-		props:['xmQuestion','visible',"selProject",'opType','xmProduct','xmTestCase','xmTestPlanCase'],
+		props:['xmQuestion','visible',"selProject",'opType','xmProduct','xmTestCase','xmTestPlanCase','xmMenu'],
 		watch: {
 	      'xmQuestion':function( xmQuestion ) {
 	        this.editForm = {...xmQuestion};
@@ -597,6 +597,18 @@
 						this.editForm.name=this.xmTestPlanCase.caseName
 						this.editForm.projectId=this.xmTestPlanCase.projectId
 					}
+					if(this.xmMenu && this.xmMenu.menuId){
+						this.editForm.menuId=this.xmMenu.menuId
+						this.editForm.menuName=this.xmMenu.menuName
+						if(this.xmMenu.productId){
+							this.editForm.productId=this.xmMenu.id
+							this.editForm.productName=this.xmMenu.productName
+						}
+						if(this.xmMenu.funcId){ 
+							this.editForm.funcId=this.xmTestPlanCase.funcId
+							this.editForm.funcName=this.xmTestPlanCase.funcName 
+						}
+					}
 				}else{
 
 				}
diff --git a/src/views/xm/core/xmQuestion/XmQuestionForTask.vue b/src/views/xm/core/xmQuestion/XmQuestionForTask.vue
deleted file mode 100644
index 24e05fe7..00000000
--- a/src/views/xm/core/xmQuestion/XmQuestionForTask.vue
+++ /dev/null
@@ -1,1131 +0,0 @@
-<template>
-	<section class="padding">
-			<el-row>
-				<xm-product-select v-if="!xmProduct&&!xmIteration" style="display:inline;" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="clearProduct"></xm-product-select>
- 
-				  <el-select v-model="filters.bugStatus" placeholder="状态" style="width:100px;"  clearable @change="changeBugStatus">
-					<el-option v-for="(b,index) in dicts['bugStatus']" :value="b.id"  :key="index" :label="b.name">{{b.name}}
-					</el-option>
-				</el-select>
-				<el-select class="hidden-md-and-down" v-model="filters.priority" placeholder="优先级"  style="width:120px;"  clearable @change="changePriority">
-					<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
-					</el-option>
-				</el-select>
-				<el-select class="hidden-md-and-down" v-model="filters.bugSeverity" placeholder="严重程度"  style="width:120px;" clearable @change="changeBugSeverity">
-					<el-option v-for="(b,index) in dicts['bugSeverity']" :value="b.id" :key="index" :label="b.name">{{b.name}}
-					</el-option>
-				</el-select>
-				
-				<el-button v-if="!filters.tags||filters.tags.length==0" @click.native="$refs.tagDialog.open()">标签</el-button>
-				<el-tag v-else @click="$refs.tagDialog.open()"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
-				
-				<el-input style="width:200px;" v-model="filters.key" placeholder="缺陷名称" clearable> 
-				</el-input>
-
-				<el-button @click="searchXmQuestions" type="primary" icon="el-icon-search"></el-button> 
-				<el-popover
-					placement="top-start"
-					title="更多查询条件或操作"
-					width="600"
-					trigger="click" >
-					<el-row> 
-						<el-col :span="24"  style="padding-top:12px;">
-							<font class="more-label-font">需求:</font>
-							<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 需求</el-button>
-							<el-tag v-else  @click="showMenu"  closable @close="clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
-						</el-col>
-						<el-col :span="24" style="padding-top:12px;">
-							<font class="more-label-font">创建者:</font>
-							<el-button v-if="!filters.createUser" @click="showGroupUsers('createUser')">选择创建人</el-button>
-							<el-tag v-else closable @close="clearCreateUser"  @click="showGroupUsers('createUser')">{{filters.createUser.username}}</el-tag>
-							<el-button v-if="!filters.createUser||filters.createUser.userid!=userInfo.userid" @click="setFiltersCreateUserAsMySelf">我的</el-button>
-						</el-col>
-						<el-col :span="24" style="padding-top:12px;">
-							<font class="more-label-font">指派给:</font>
-							<el-button v-if="!filters.handlerUsername" @click="showGroupUsers('handlerUser')">选择被指派人</el-button>
-							<el-tag v-else closable @close="clearHandler"  @click="showGroupUsers('handlerUser')">{{filters.handlerUsername}}</el-tag>
-							<el-button v-if="filters.handlerUserid!=userInfo.userid" @click="setFiltersHandlerAsMySelf">我的</el-button>
-						</el-col>
-
-						<el-col :span="24" style="padding-top:12px;">
-							曾经由<el-button v-if="!filters.hisHandler||!filters.hisHandler.userid" @click="showGroupUsers('hisHandler')">执行人</el-button>
-							<el-tag v-else closable @close="clearHisHandler"  @click="showGroupUsers('hisHandler')">{{filters.hisHandler.username}}</el-tag>
-							<el-button v-if="!filters.hisHandler||filters.hisHandler.userid!=userInfo.userid" @click="setFiltersHisHandlerAsMySelf">我的</el-button>
-							变更状态为
-							<el-select v-model="filters.hisHandleStatus" placeholder="请选择状态"  clearable @change="changeHisHandleStatus">
-								<el-option v-for="(b,index) in dicts['bugStatus']" :value="b.id"  :key="index" :label="b.name">{{b.name}}
-								</el-option>
-							</el-select>的缺陷
-						</el-col>
-						<el-col :span="24" style="padding-top:5px;">
-								<font class="more-label-font">需求:</font>
-							<font  v-if="  filters.menus && filters.menus.length>0">
-								<el-tag  v-for="(item,index) in filters.menus" :key="index"  closable  @close="clearFiltersMenu(item)">{{item.menuName.substr(0,10)}}</el-tag>
-							</font>
-							<el-button v-else    @click="showMenu" type="plian">选需求</el-button>
-						</el-col>
-						<el-col :span="24" class="hidden-lg-and-up" style="padding-top:12px;">
-							<el-select   v-model="filters.priority" placeholder="请选择优先级" clearable @change="changePriority">
-								<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
-								</el-option>
-							</el-select>
-						</el-col>
-						<el-col :span="24"  style="padding-top:12px;">
-							<el-select  v-model="filters.solution" placeholder="请选择解决方案" clearable @change="changeSolution">
-								<el-option v-for="(b,index) in dicts['bugSolution']" :value="b.id" :key="index" :label="b.name">{{b.name}}
-								</el-option>
-							</el-select>
-						</el-col>
-						<el-col  :span="24"  style="padding-top:5px;">
-							<font class="more-label-font">创建时间:</font>
-							<el-date-picker
-								v-model="dateRanger"
-								type="daterange"
-								align="right"
-								unlink-panels
-								range-separator="至"
-								start-placeholder="开始日期"
-								end-placeholder="完成日期"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								:default-time="['00:00:00','23:59:59']"
-								:picker-options="pickerOptions"
-							></el-date-picker>
-						</el-col>
-						<el-col  :span="24"  style="padding-top:5px;">
-							<font class="more-label-font">最后更新时间:</font>
-							<el-date-picker
-								v-model="ltimeRanger"
-								type="daterange"
-								align="right"
-								unlink-panels
-								range-separator="至"
-								start-placeholder="更新时间"
-								end-placeholder="更新时间"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								:default-time="['00:00:00','23:59:59']"
-								:picker-options="pickerOptions"
-							></el-date-picker>
-						</el-col>
-						<el-col :span="24" style="padding-top:5px;">
-							<el-button   type="primary" icon="el-icon-search" @click="searchXmQuestions">查询</el-button>
-							<el-button @click="handleExport"   icon="el-icon-download">导出</el-button>
-						</el-col>
-					</el-row>
-					<el-button  slot="reference" icon="el-icon-more"></el-button>
-				</el-popover> 
-				<span style="float:right;"> 
-   					<el-button  type="primary" icon="el-icon-plus"  @click="showAdd"  round> </el-button>  
-					<el-button @click="batchDel" type="danger" icon="el-icon-delete"></el-button>
-				</span>
-			 </el-row> 
-			 <el-row class="padding-top">
-				<!--列表 XmQuestion xm_question-->
-				<el-table  ref="table" :height="maxTableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
- 					<el-table-column  label="全选" type="selection" min-width="50"  fixed="left"></el-table-column>
-					  <el-table-column prop="id" label="缺陷编号" width="100" show-overflow-tooltip fixed="left"></el-table-column>
-					 <el-table-column prop="name" label="缺陷名称"  min-width="150" show-overflow-tooltip fixed="left">
-						<template slot-scope="scope">  
-								<span class="vlink" @click="showEdit(scope.row)" :title="scope.row.name">  
-									 {{scope.row.name}}
-								</span>    
-						</template>
-					</el-table-column>
-					<el-table-column prop="bugStatus" label="状态"  width="100">
-						<template slot-scope="scope">   
-									<div class="cell-text">
-										 <el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in [formatterBugStatusDicts(scope.row.bugStatus)]" :key="index">{{item.name}}</el-button>
-									</div>
-									<span class="cell-bar">   
-										 <el-select  v-model="scope.row.bugStatus" placeholder="类型"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'bugStatus',$event)">
-												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.bugStatus" :key="index"></el-option> 
-										 </el-select>  
-									</span> 
-						</template>
-					</el-table-column>
-					<el-table-column prop="priority" label="优先级"  width="100">
-						<template slot-scope="scope">   
-									<div class="cell-text">
-										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in [formatterPriorityDicts(scope.row.priority)]" :key="index">{{item.name}}</el-button>
-									</div>
-									<span class="cell-bar">   
-										 <el-select  v-model="scope.row.priority" placeholder="优先级"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'priority',$event)">
-												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"></el-option> 
-										 </el-select>  
-									</span> 
-						</template>
-					</el-table-column> 
-					<el-table-column prop="solution" label="解决方案"  width="100">
-						<template slot-scope="scope">   
-									<div class="cell-text">
-										{{formaterByDicts(scope.row,'solution',scope.row.solution)}}
-									</div>
-									<span class="cell-bar">   
-										 <el-select  v-model="scope.row.solution" placeholder="类型"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'solution',$event)">
-												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.bugSolution" :key="index"></el-option> 
-										 </el-select>  
-									</span> 
-						</template>
-					</el-table-column>
-					<el-table-column prop="bugSeverity" label="严重程度"  width="100">
-						<template slot-scope="scope">   
-									<div class="cell-text">
-										{{formaterByDicts(scope.row,'bugSeverity',scope.row.bugSeverity)}}
-									</div>
-									<span class="cell-bar">   
-										 <el-select  v-model="scope.row.bugSeverity" placeholder="类型"  style="display:block;"  @change="editXmQuestionSomeFields(scope.row,'bugSeverity',$event)">
-												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.bugSeverity" :key="index"></el-option> 
-										 </el-select>  
-									</span> 
-						</template>
-					</el-table-column>
-					<el-table-column prop="projectId" label="项目"  width="100" show-overflow-tooltip> 
-						<template slot-scope="scope">   
-									<div class="cell-text">
-										{{scope.row.projectId}}
-									</div>
-									<span class="cell-bar">   
-										<xm-project-select  style="display:inline;"  :auto-select="false" :link-product-id="xmProduct?xmProduct.id:null" @row-click="editXmQuestionSomeFields(scope.row,'projectId',$event)" ></xm-project-select>
-									</span> 
-						</template>
-					</el-table-column>
-					<el-table-column prop="productId" label="产品"  width="100" show-overflow-tooltip>  
-						<template slot-scope="scope">   
-									<div class="cell-text">
-										{{scope.row.productId}}
-									</div>
-									<span class="cell-bar">   
-										<xm-product-select  style="display:inline;"  :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="editXmQuestionSomeFields(scope.row,'productId',$event)" ></xm-product-select>
-									</span> 
-						</template>
-					</el-table-column>
-					<el-table-column prop="askUsername" label="创建人"  width="100" show-overflow-tooltip> 
-					</el-table-column>
-					
-					<el-table-column prop="createTime" label="创建时间" sortable width="100" show-overflow-tooltip> 
-					</el-table-column>
-					
-					<el-table-column prop="ltime" label="更新时间" sortable  width="100" show-overflow-tooltip> 
-					</el-table-column>
-					<el-table-column prop="handlerUsername" label="负责人"  width="100" show-overflow-tooltip> 
-						<template slot-scope="scope">   
-									<div class="cell-text">
-										{{ scope.row.handlerUsername}}
-									</div>
-									<span class="cell-bar">   
-										 <el-button @click="showGroupUsers('editHandlerUserid',scope.row)">负责人</el-button>
-									</span> 
-						</template>
-					</el-table-column>
-					<el-table-column prop="tagNames" label="标签"  width="100" show-overflow-tooltip> 
-						<template slot-scope="scope">   
-									<div class="cell-text">
-										{{ scope.row.tagNames}}
-									</div>
-									<span class="cell-bar">   
-										 <el-button @click="$refs.tagDialog.open({data:scope.row,action:'editTagIds'})">标签</el-button>
-									</span> 
-						</template>
-					</el-table-column>
-					<el-table-column prop="menuName" label="需求" width="100" show-overflow-tooltip></el-table-column> 
-				</el-table>
-				<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
-			 </el-row>
-			<!--编辑 XmQuestion xm_question界面-->
-			<el-dialog  title="编辑缺陷"   :visible.sync="editFormVisible"   width="80%"  top="20px"  :close-on-click-modal="false" append-to-body>
-					<xm-question-edit :sel-project=" {id:editForm.projectId,name:editForm.projectName} " :xm-question="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-question-edit>
-			</el-dialog>
-
-			<!--新增 XmQuestion xm_question界面-->
-			<el-dialog title="新增缺陷"  :visible.sync="addFormVisible"   width="80%" top="20px"  append-to-body   :close-on-click-modal="false">
-				<xm-question-add  :xm-task="xmTask"  op-type="add" :sel-project=" filters.selProject " :xm-question="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-add>
-			</el-dialog>
- 			<xm-group-dialog ref="xmGroupDialog" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-dialog> 
-			<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible"    size="60%"   :close-on-click-modal="false">
-				<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true"    @menus-selected="onSelectedMenus" ></xm-menu-select>
-			</el-drawer> 
-			
- 			<tag-dialog ref="tagDialog" :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected"></tag-dialog>
- 	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-
-	import config from '@/common/config';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { listXmQuestion, delXmQuestion, batchDelXmQuestion, editStatus ,editXmQuestionSomeFields} from '@/api/xm/core/xmQuestion';
-	import  XmQuestionAdd from './XmQuestionAddForTask';//新增界面
-	import  XmQuestionEdit from './XmQuestionEdit';//修改界面
-	import { mapGetters } from 'vuex'
-
-	import xmMenuSelect from '../xmMenu/XmMenuSelect';
-	import XmGroupDialog from '../xmGroup/XmGroupDialog';
-	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
-
-	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//修改界面
- 	import TagDialog from '@/views/mdp/arc/tag/TagDialog.vue';
- 
-	export default {
-		computed: {
-			...mapGetters([
-				'userInfo','roles'
-			]),
-		},
-		props: ["selProject","xmTask",'xmProduct','xmIteration'],
-		watch:{   
-			xmTask(){
-				this.searchXmQuestions();
-			}
-		},
-		data() {
-			const beginDate = new Date();
-			const endDate = new Date();
-			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
-			return {
-				filters: {
-					key: '',
-					bugStatus:'',
-					priority:'',
-					solution:'',
-					bugSeverity:'',
-					handlerUserid:'',
-					handlerUsername:'',
-					selProject:null,
-					menus:[],
-					product:null,
-					createUser:null,
-					hisHandler:null,
-					hisHandleStatus:null,
-					tags:[],
-
-				},
-				xmQuestions: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:['ltime'],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				dicts:{
-					priority:[],
-					bugSeverity:[],
-					bugSolution:[],
-					bugStatus:[],
-					bugType:[],
-				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
-
-				addFormVisible: false,//新增xmQuestion界面是否显示
-				//新增xmQuestion界面初始化数据
-				addForm: {
-					id:'',name:'',projectId:'',projectName:'',taskId:'',taskName:'',endTime:'',askUserid:'',askUsername:'',handlerUserid:'',handlerUsername:'',priority:'3',solution:'',processTime:'',receiptMessage:'',receiptTime:'',description:'',createUserid:'',createUsername:'',createTime:'',bugStatus:'',bugSeverity:'3',
-					attachment: [],
-				},
-
-				editFormVisible: false,//编辑界面是否显示
-				//编辑xmQuestion界面初始化数据
-				editForm: {
-					id:'',name:'',projectId:'',projectName:'',taskId:'',taskName:'',endTime:'',askUserid:'',askUsername:'',handlerUserid:'',handlerUsername:'',priority:'',solution:'',processTime:'',receiptMessage:'',receiptTime:'',description:'',createUserid:'',createUsername:'',createTime:'',bugStatus:'',bugSeverity:'3',
-					attachment: [],
-				},
-				/**begin 自定义属性请在下面加 请加备注**/
-				selectUserVisible:false,
-				selectProjectVisible:false,
-				productSelectVisible:false,
-				nextAction:'',
-				maxTableHeight:300,
-				cloumns: [
-					{
-						key: 'name',
-						type: 'text',
-						name: '缺陷名称'
-					},
-					{
-						key: 'bugStatus',
-						type: 'dict',
-						name: '状态'
-					},
-					{
-						key: 'bugSeverity',
-						type: 'dict',
-						name: '严重程度'
-					},
-					{
-						key: 'priority',
-						type: 'dict',
-						name: '优先级'
-					},
-					{
-						key: 'solution',
-						type: 'dict',
-						name: '解决方案'
-					},
-					{
-						key: 'handlerUsername',
-						type: 'text',
-						name: '指派给'
-					},
-					{
-						key: 'endTime',
-						type: 'time',
-						name: '到期时间'
-					}
-				],
-				menuVisible:false,
-				dateRanger: [ ],
-				ltimeRanger:[
-				],
-				pickerOptions:  util.getPickerOptions('datarange'),
-				userType:'',//createUser、handlerUser
-				tagSelectVisible:false,
-				/**end 自定义属性请在上面加 请加备注**/
-
-			}
-
-		},//end data
-		methods: {
-			handleSizeChange(pageSize) {
-				this.pageInfo.pageSize=pageSize;
-				this.getXmQuestions();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmQuestions();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmQuestions();
-			},
-			searchXmQuestions(){
-				 this.pageInfo.count=true;
-				 this.getXmQuestions();
-			},
-			//获取列表 XmQuestion xm_question
-			getXmQuestions() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}
-					params.orderBy= orderBys.join(",")
-				}
-
-
-				if(this.dateRanger&&this.dateRanger.length==2){ 
-					params.createTimeStart=this.dateRanger[0]
-					params.createTimeEnd=this.dateRanger[1]
-				}
-				if( this.filters.bugStatus!=null && this.filters.bugStatus!="" ){
-					params.bugStatus=this.filters.bugStatus
-				}
-				if( this.filters.solution!=null && this.filters.solution!=""){
-					params.solution=this.filters.solution
-				}
-				if( this.filters.priority!=null && this.filters.priority!=""){
-					params.priority=this.filters.priority
-				}
-				if( this.filters.bugSeverity!=null && this.filters.bugSeverity!=""){
-					params.bugSeverity=this.filters.bugSeverity
-				}
-				if( this.filters.handlerUserid!=null && this.filters.handlerUserid!=""){
-					params.handlerUserid=this.filters.handlerUserid
-				}
-				if(this.filters.menus && this.filters.menus.length==1){
-					params.menuId=this.filters.menus[0].menuId
- 				}else if(this.filters.menus && this.filters.menus.length>1){
-					params.menuIds=this.filters.menus.map(i=>i.menuId)
- 				}
-
-				if(this.filters.product){
-					params.productId=this.filters.product.id
-				}
-				if(this.filters.createUser){
-					params.createUserid=this.filters.createUser.userid;
-				}
-				if(this.filters.hisHandler){
-					if(this.filters.hisHandleStatus){
-						params.hisHandlerUserid=this.filters.hisHandler.userid;
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: "请选择曾经的缺陷状态", type: 'error' });
-						return;
-					}
-
-				}
-				if(this.filters.hisHandleStatus){
-					if(this.filters.hisHandler){
-						params.hisHandleStatus=this.filters.hisHandleStatus
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: "请选择曾经的执行人", type: 'error' });
-						return;
-					}
-
-				}
-
-				if(this.ltimeRanger && this.ltimeRanger.length>=2){
-					params.ltimeStart=this.ltimeRanger[0]
-					params.ltimeEnd=this.ltimeRanger[1]
-				}
-
-				this.load.list = true;
-				if(this.filters.selProject){
-					params.projectId = this.filters.selProject.id;
-				} 
-				if(this.xmTestCase){
-					params.caseId=this.xmTestCase.id
-				}
-				if(this.xmIteration){
-					params.linkIterationId=this.xmIteration.id
-				}
-
-				if(this.xmTask && this.xmTask.id){
-					params.taskId=this.xmTask.id
-				}
-				if(this.filters.key){
-					params.key='%'+this.filters.key+'%'
-				}
-				if(this.filters.tags && this.filters.tags.length>0){
-					params.tagIdList=this.filters.tags.map(i=>i.tagId)
-				}
-				//params.qtype=this.qtype
-				listXmQuestion(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmQuestions = res.data.data;
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
-					}
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			clearProduct(){
-				this.filters.product=null;
-				this.searchXmQuestions();
-			},
-			showProductVisible(){
-				this.productSelectVisible=true;
-			},
-			onProductSelected(product){
-				this.filters.product=product;
-				this.productSelectVisible=false;
-				this.searchXmQuestions();
-			},
-			showMenu(){
-				this.menuVisible=true;
-			},
-
-			onSelectedMenus(menus){
-				if(!menus || menus.length==0){
-					this.menuVisible=false
-					return;
-				}
-				this.menuVisible=false
-
-				this.filters.menus=menus;
-				this.searchXmQuestions();
-			},
-			clearFiltersMenu(menu){
-				var index=this.filters.menus.findIndex(i=>i.menuId==menu.menuId)
-				this.filters.menus.splice(index,1);
-				this.searchXmQuestions();
-			},
-			clearFiltersTag(tag){
-				var index=this.filters.tags.findIndex(i=>i.tagId==tag.tagId)
-				this.filters.tags.splice(index,1);
-				this.searchXmQuestions();
-			},
-			//显示编辑界面 XmQuestion xm_question
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmQuestion xm_question
-			showAdd: function () {  
-				this.addFormVisible = true;
-			}, 
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.getXmQuestions();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-				this.getXmQuestions();
-			},
-			//选择行xmQuestion
-			selsChange: function (sels) {
-				this.sels = sels;
-			},
-			//删除xmQuestion
-			handleDel: function (row,index) {
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.load.del=true;
-					let params = { id: row.id };
-					delXmQuestion(params).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if(tips.isOk){
-							this.pageInfo.count=true;
-							this.getXmQuestions();
-						}
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			//批量删除xmQuestion
-			batchDel: function () {
-				if(this.sels.length<=0){
-					this.$notify({position:'bottom-left',showClose:true,message:"请选择要删除的缺陷", type: "error"});
-					return ;
-				}
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.load.del=true;
-					batchDelXmQuestion(this.sels).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if( tips.isOk ){
-							this.pageInfo.count=true;
-							this.getXmQuestions();
-						}
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			rowClick: function(row, event, column){
-				this.editForm=row;
-			},
-
-
-
-			isEmpty(str) {
-				return str == null || str == "";
-			},
-			formatDate(time,isDate) {
-				const date = new Date(time);
-				const m = date.getMonth()+1;
-				const d = date.getDate();
-				const h = date.getHours()<10 ? "0"+date.getHours() : date.getHours();
-				const min = date.getMinutes()<10 ? "0"+date.getMinutes() : date.getMinutes();
-				const s = date.getSeconds()<10 ? "0"+date.getSeconds() : date.getSeconds();
-				return date.getFullYear()+"-"+(m < 10 ? "0"+m : m)+"-"+ (d < 10 ? "0"+d : d) + " " + h+":"+min+":"+s;
-			},
-			changeBugStatus(val){
-				this.filters.bugStatus= val;
-				this.getXmQuestions();
-			},
-			changeHisHandleStatus(val){
-				this.filters.hisHandleStatus= val;
-				this.getXmQuestions();
-			},
-			changeBugSeverity(val){
-				this.filters.bugSeverity= val;
-				this.getXmQuestions();
-			},
-			changeSolution(val){
-				this.filters.solution= val;
-				this.getXmQuestions();
-			},
-			changePriority(val){
-				this.filters.priority= val;
-				this.getXmQuestions();
-			},
-			formatterDate: function(row,column,cellValue, index){
-				if(cellValue){
-					return cellValue.substr(0,10);
-				}else{
-					return ""
-				}
-			},
-
-			formatterOption: function(row,column,cellValue, index){
-				var columnName=column.property;
-				var key="";
-				if(columnName=='bugStatus'){
-					key="bugStatus"
-				}else if(columnName=='bugType'){
-					key="bugType"
-				}else if(columnName=='solution'){
-					key="bugSolution"
-				}else if(columnName=='bugSeverity'){
-					key="bugSeverity"
-				}else if(columnName=='priority'){
-					key="priority"
-				}else{
-					return cellValue
-				}
-				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
-					return cellValue;
-				}
-				var list=this.dicts[key].filter(i=>i.id==cellValue)
-				if(list.length>0){
-					return list[0].name
-				}else{
-					return cellValue;
-				}
-
-			},
-			formatterPriorityDicts(cellValue){
-				var key="priority";  
-				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
-					return {id:cellValue,name:cellValue,className:'primary'};
-				}
-				var list=this.dicts[key].filter(i=>i.id==cellValue)
-				if(list.length>0){
-					var data= {...list[0],className:'primary'}
-					if(data.id=='0'){
-						data.className='danger'
-					}else if(data.id=='1'){
-						data.className='warning'
-					}else if(data.id=='2'){
-						data.className='success'
-					}else if(data.id=='3'){
-						data.className='primary'
-					}else if(data.id=='4'){
-						data.className='info'
-					}else{
-						data.className='primary'
-					}
-					return data;
-				}else{
-					return {id:cellValue,name:cellValue,className:'primary'}
-				}
-
-			},
-			formatterBugStatusDicts: function(cellValue){
-				var key="bugStatus";  
-				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
-					return {id:cellValue,name:cellValue,className:'primary'};
-				}
-				var list=this.dicts[key].filter(i=>i.id==cellValue)
-				if(list.length>0){
-					var data= {...list[0],className:'primary'}
-					if(data.id=='1'){
-						data.className='primary'
-					}else if(data.id=='2'){
-						data.className='primary'
-					}else if(data.id=='3'){
-						data.className='success'
-					}else if(data.id=='4'){
-						data.className='warning'
-					}else if(data.id=='5'){
-						data.className='success'
-					}else if(data.id=='6'){
-						data.className='info'
-					}else if(data.id=='7'){
-						data.className='info'
-					}else{
-						data.className='danger'
-					}
-					return data;
-				}else{
-					return {id:cellValue,name:cellValue,className:'primary'}
-				}
-
-			}, 
-			showGroupUsers:function(userType,row){
- 				this.$refs.xmGroupDialog.open({data:row,action:userType})
-			},
-			 
-			handleExport() {
-				this.downloadLoading = true
-				let header = [];
-				let keyList = [];
-				this.cloumns.forEach(d => {
-					header.push(d.name);
-					keyList.push(d.key);
-				});
-				console.log('this.$route==', this.$route);
-				const filename = `${this.$route.meta.title}_第${this.pageInfo.pageNum}页`;
-				const data = this.formatJson(keyList, this.xmQuestions);
-				import('@/vendor/Export2Excel').then(excel => {
-					excel.export_json_to_excel({
-						header,
-						data,
-						filename,
-						// autoWidth: this.autoWidth,
-						bookType: 'xlsx'
-					})
-					this.downloadLoading = false
-				})
-			},
-			formatJson(filterVal, jsonData) {
-				console.log('this.dicts==', this.dicts);
-
-				return jsonData.map(v => filterVal.map(j => {
-					let key = '';
-					if (j === 'timestamp') {
-						return parseTime(v[j])
-					} else if(j == 'bugStatus') {
-						key = "bugStatus"
-					} else if(j == 'bugType') {
-						key = "bugType"
-					} else if(j == 'solution') {
-						key = "bugSolution"
-					} else if(j == 'bugSeverity') {
-						key = "bugSeverity"
-					} else if(j == 'priority') {
-						key = "priority"
-					} else {
-						return v[j];
-					}
-					if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0){
-						return v[j];
-					}
-					var rowData = this.dicts[key].find(i => i.id == v[j]);
-					if(rowData){
-						return rowData.name;
-					}else{
-						return v[j];
-					}
-				}))
-			},
-			/**end 自定义函数请在上面加**/
-
-			onUserConfirm:function(groupUsers,option){
-				if(option.action=='createUser'){
-					if(groupUsers==null || groupUsers.length==0){
-						this.filters.createUser=null
-					}else{
-						var user=groupUsers[0]
-						this.filters.createUser=user
-					}
-				}else if(option.action=='hisHandler'){
-					if(groupUsers==null || groupUsers.length==0){
-						this.filters.hisHandler=null
-					}else{
-						var user=groupUsers[0]
-						this.filters.hisHandler=user
-					}
-				}else if(option.action=='editHandlerUserid'){
-					 this.editXmQuestionSomeFields(option.data,"handlerUserid",groupUsers)
-					 return;
-				}else{
-					if(groupUsers==null || groupUsers.length==0){
-						this.filters.handlerUserid=''
-						this.filters.handlerUsername='';
-					}else{
-						var user=groupUsers[0]
-							this.filters.handlerUserid=user.userid
-							this.filters.handlerUsername=user.username
-					}
-				}
-
-				this.selectUserVisible=false
-				this.searchXmQuestions();
-
-			}, 
-			onProjectConfirm:function(project){
-				this.filters.selProject=project
-				this.selectProjectVisible=false;
-
-				if( this.nextAction=='showAdd'){
-					this.showAdd()
-				}else if( this.nextAction=='showGroupUsers'){
-					this.showGroupUsers(this.userType)
-				}else{
-					this.searchXmQuestions();
-				}
-				this.nextAction=null
-			},
-			showApprovaInfo:function(row){
-				var msgFields=[];
-				if(row.mainTitle!=null && row.mainTitle!=""){
-					msgFields.push("流程【"+row.mainTitle+"】");
-				}
-
-				if(row.taskName!=null && row.taskName!=""){
-					msgFields.push("当前环节【"+row.taskName+"】");
-				}
-
-				if(row.assigneeName!=null && row.assigneeName!=""){
-					msgFields.push("执行人【"+row.assigneeName+"】");
-				}
-
-				if(row.commentMsg!=null && row.commentMsg!=""){
-					msgFields.push("审批意见【"+row.commentMsg+"】");
-				}
-				var msg=msgFields.join(",");
-				return msg;
-			},
-
-			sendToProcessApprova:function(row,bizKey){
-				// 传过来的参数格式
-				if(row.flowState=='1'){
-					this.$notify.error("已经发起，不允许重复发起");
-					return;
-				}
-				let extVars={projectId:row.projectId,branchId:this.userInfo.branchId,questionId:row.id}
-				let jsonExtVars=JSON.stringify(extVars);
-
-				var currDomain=window.location.protocol+"//"+window.location.host;
-				var fullPath=this.$route.fullPath;
-				var bizUrl=currDomain+'/#'+fullPath+'?extVars='+jsonExtVars
-
-				let params={
-					bizKey:bizKey,
-					bizUrl:bizUrl,
-					resUrl:'',
-					bizPkid:row.id,
-					bizParentPkid:row.id,
-					mainContext:'',
-					extVars:extVars,
-					flowVars:{
-						subscribeTaskEvent:'TASK_COMPLETED',
-						data:{
-							id:row.id,
-							branchId:this.userInfo.branchId,
-							projectId:row.projectId,
-
-						}
-					},
-				}
-				if(bizKey=="xm_question_up_approva"){
-					//预算变更审核
-					params.mainTitle='关于缺陷【'+row.name+"】升级的申请";
-					params.mainContext='项目编号：'+row.projectId+','+'项目名称：'+row.projectName+',任务名称：'+row.taskName
-										+'<br>'+row.askUsername+'于'+row.createTime+'提出缺陷('+row.id+')：'+row.name
-										+'<br>缺陷描述：'+row.description;
-					params.restUrl=config.getXmBasePath()+"/xm/core/xmQuestion/processApprova";
-					this.$router.push({name:'ProcdefListForBizStart',params:params});
-
-				}else {
-					this.$notify.error("不支持的审批事项");
-					return;
-				}
-				//this.$store.dispatch('addVisitedViews', {path:'/mdp/workflow/re/procdef/ProcdefListForBizStart',query:{params:jsonParmas}})
-			},
-			clearProject(){
-				this.filters.selProject=null
-				this.nextAction=""
-				this.searchXmQuestions()
-			},
-			clearCreateUser(){
-				this.filters.createUser=null;
-				this.searchXmQuestions();
-				this.nextAction=""
-			},
-			clearHandler(){
-
-				this.filters.handlerUserid=''
-				this.filters.handlerUsername='';
-				this.searchXmQuestions();
-				this.nextAction=""
-			},
-			clearHisHandler(){
-
-				this.filters.hisHandler=null
-				this.searchXmQuestions();
-				this.nextAction=""
-			},
-			handleCommand(command) {
-				if(command.type=='sendToProcessApprova'){
-					this.sendToProcessApprova(command.data,command.bizKey);
-				}
-			},
-			setFiltersHandlerAsMySelf(){
-				this.filters.handlerUserid=this.userInfo.userid;
-				this.filters.handlerUsername=this.userInfo.username;
-				this.searchXmQuestions();
-			},
-			setFiltersCreateUserAsMySelf(){
-				this.filters.createUser=this.userInfo
- 				this.searchXmQuestions();
-			},
-			setFiltersHisHandlerAsMySelf(){
-				this.filters.hisHandler=this.userInfo
- 				this.searchXmQuestions();
-			},
-			getBadge(row){
-				var msg="";
-				if(row.bugStatus=='closed'){
-					return ""
-				}
-				if(row.handlerUsername){
-					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+','+remarks.substr(0,10)+"..."
-						}
-						
-					}else{
-						msg='已指派给'+row.handlerUsername;
-					}
-				}else{
-					msg=row.createUsername+'创建的缺陷'
-				}
-				return msg;
-			},
-			
-			onTagSelected(tags,option) { 
-				if(option.action=="editTagIds"){
-					this.editXmQuestionSomeFields(option.data,"tagIds",tags);
-				}else{
-					if (!tags || tags.length == 0) { 
-						this.filters.tags=[]
-					}else{
-						this.filters.tags=tags
-					}
-					this.searchXmQuestions();
-				}
-				
-			}, 
-			editXmQuestionSomeFields(row,fieldName,$event){
-				var params={ids:[row.id]};
-				if(this.sels.length>0){
-					if(!this.sels.some(k=>k.id==row.id)){
-						this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
-						return;
-					}
-					params.ids=this.sels.map(i=>i.id)
-				}
-				if(fieldName==='handlerUserid'){
-					if($event){ 	
-						params[fieldName]=$event[0].userid;
-						params.handlerUsername=$event[0].username 
-					}else{
-						return;
-					}
-				}else if(fieldName==='tagIds'){
-					if($event){ 	
-						params[fieldName]=$event.map(i=>i.tagId).join(",");
-						params.tagNames=$event.map(i=>i.tagName).join(","); 
-					}else{
-						return;
-					}
-				}else if(fieldName==='workload'){
-					params={...params,...$event}
-				}else if(fieldName==='projectId'){
-					params.projectId=$event.id
-				}else if(fieldName==='productId'){
-					params.productId=$event.id
-				}else{
-					params[fieldName]=$event
-				}
-				
-				editXmQuestionSomeFields(params).then(res=>{
-					var tips = res.data.tips;
-					if(tips.isOk){ 
-						if(this.sels.length>0){
-							 this.sels.forEach(i=>{ 
-								Object.assign(i,params) 
-							 })
-						}else{ 
-							Object.assign(row,params) 
-						}
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
-					}
-				})
-			},
-			/**
-			 * 'bugSeverity','bugSolution','bugStatus','bugType','priority'bugRepRate
-			 */
-			formaterByDicts(row,property,cellValue){ 
-				var property=property
-				var dict=null;
-				if(property=='bugSeverity'){
-					dict=this.dicts['bugSeverity']
-				}else if(property=='solution'){
-					dict=this.dicts['bugSolution']
-				}else if(property=='bugStatus'){
-					dict=this.dicts['bugStatus']
-				}else if(property=='priority'){
-					dict=this.dicts['priority']
-				}else if(property=='bugType'){
-					dict=this.dicts['bugType']
-				}else if(property=='repRate'){
-					dict=this.dicts['bugRepRate']
-				}  
-				if(!dict){
-					return cellValue;
-				}else{
-					var item=dict.find(i=>i.id==cellValue)
-					return item?item.name:cellValue;
-				}
-			},
-		},//end methods
-		components: {
-				'xm-question-add':XmQuestionAdd,
-				'xm-question-edit':XmQuestionEdit,
-				XmGroupDialog,XmProjectSelect,xmMenuSelect,XmProductSelect, TagDialog 
-				//在下面添加其它组件
-		},
-		mounted() {
-			if(this.selProject){
-				this.filters.selProject=this.selProject
-			}
-			if(this.xmProduct){
-				this.filters.product=this.xmProduct
-			}
-			if(this.queryScene=='my'){
-				this.filters.handlerUserid=this.userInfo.userid;
-				this.filters.handlerUsername=this.userInfo.username;
-			}
-			
-			this.$nextTick(() => {
-				
-				
-				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
-				;
-				this.getXmQuestions();
-			});
-				initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate']).then(res=>{
-					if(res.data.tips.isOk){ 
-						this.dicts=res.data.data;
-					}
-				});
-		}
-	}
-
-</script>
-
-<style lang="scss" scoped>
-
-.more-label-font{
-	text-align:center;
-	float:left;
-	padding-top:5px;
-}
-
-.align-right{
-	float: right;
-}
-.badge {
-  margin-top: 7px;
-  padding-bottom: 10px;
-}
-.badge-item {
-  margin-top: 10px;
-  margin-right: 40px;
-}
-</style>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index cc38bce8..927448d2 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -227,7 +227,7 @@
 
 			<!--新增 XmQuestion xm_question界面-->
 			<el-dialog title="新增缺陷"  :visible.sync="addFormVisible"   width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
-				<xm-question-add   op-type="add" :xm-test-plan-case="xmTestPlanCase" :xm-test-plan="xmTestPlan" :xm-product="filters.product" :xm-test-case="xmTestCase" :qtype="qtype" :sel-project=" filters.selProject " :xm-question="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-add>
+				<xm-question-add  :xm-menu="xmMenu" op-type="add" :xm-test-plan-case="xmTestPlanCase" :xm-test-plan="xmTestPlan" :xm-product="filters.product" :xm-test-case="xmTestCase" :qtype="qtype" :sel-project=" filters.selProject " :xm-question="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-add>
 			</el-dialog>
  			<xm-group-dialog ref="xmGroupDialog" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-dialog> 
 			<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible"    size="60%"   :close-on-click-modal="false">
@@ -262,7 +262,7 @@
 				'userInfo','roles'
 			]),
 		},
-		props: ["selProject",'qtype','xmTestPlanCase','xmTestCase','xmTestPlan','xmIteration','xmProduct','queryScene'],
+		props: ["selProject",'qtype','xmTestPlanCase','xmTestCase','xmTestPlan','xmIteration','xmProduct','queryScene','xmMenu'],
 		watch:{
 			selProject:function(selProject){
 				this.filters.selProject=this.selProject
@@ -512,6 +512,10 @@
 					params.linkIterationId=this.xmIteration.id
 				}
 
+				if(this.xmMenu){
+					params.menuId=this.xmMenu.menuId
+				}
+
 				if(this.filters.key){
 					params.key='%'+this.filters.key+'%'
 				}
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index a9a5e263..11c16c9f 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -283,7 +283,8 @@
 							 <xm-sub-work-item v-if="activateTabPaneName=='4'" :parent-xm-task="editForm"  @sub-work-item-num="setSubWorkItemNum" @add-sub-task="onAddSubTask"></xm-sub-work-item>
 					</el-tab-pane>
 					<el-tab-pane label="缺陷" name="41" v-if="editForm.ntype!='1'">  
-						<xm-question-for-task v-if="activateTabPaneName=='41'"  :xm-task="editForm" :sel-project="xmProject"></xm-question-for-task>
+						<xm-question-mng v-if="activateTabPaneName=='41' && editForm.menuId" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:null" :xm-menu="editForm.menuId?{menuId:editForm.menuId,menuName:editForm.menuName}:null" :sel-project="xmProject"></xm-question-mng>
+						<div v-else-if="activateTabPaneName=='41'">缺陷由用户故事关联得出，请先关联用户故事. <el-button @click="activateTabPaneName=3">去关联</el-button></div>
 					</el-tab-pane>
 					
 					<el-tab-pane label="执行人" name="42" v-if="editForm.ntype!='1'"> 
@@ -565,7 +566,7 @@
 	import XmRecord from '../xmRecord/XmRecord' 
 	import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm'
 	import XmSubWorkItem from "@/views/xm/core/xmTaskWorkItem/XmSubWorkItem";
-	import xmQuestionForTask from "@/views/xm/core/xmQuestion/XmQuestionForTask";
+	import xmQuestionMng from "@/views/xm/core/xmQuestion/XmQuestionMng";
 	import XmTaskWorkloadRecord from "../xmTaskWorkload/XmTaskWorkloadRecord"
 	import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
 	import XmMyDoFocus from '@/views/myWork/my/components/DoFocus';
@@ -996,7 +997,7 @@
 		components: { 
  			xmSkillMng,
 			skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmTaskWorkloadRecord,XmMenuEdit,
-			XmRecord,xmQuestionForTask,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"),
+			XmRecord,xmQuestionMng,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay,MdpSelectUserXm,'xm-task-edit':()=>import("./XmTaskDetail"),
 			//在下面添加其它组件 'xm-task-edit':XmTaskEdit
 		},
 		mounted() { 
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index 08257563..8b323f66 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -114,7 +114,7 @@
 		</el-dialog>
 		
 		<el-dialog title="选择测试库" :visible.sync="testCasedbVisible" :with-header="false" width="90%" top="20px"    append-to-body   :close-on-click-modal="false" >
-			<xm-test-casedb-mng v-if="testCasedbVisible" :select="true" :xm-product="xmProduct?xmProduct:(xmMenu?{id:xmMenu.productId,productName:xmMenu.productName}:null)"  :visible="testCasedbVisible" @cancel="testCasedbVisible=false" @select="onTestCasedbSelect"></xm-test-casedb-mng>
+			<xm-test-casedb-mng v-if="testCasedbVisible" :select="true" :xm-product="xmProduct&&xmProduct.id?xmProduct:(xmMenu&&xmMenu.menuId?{id:xmMenu.productId,productName:xmMenu.productName}:null)"  :visible="testCasedbVisible" @cancel="testCasedbVisible=false" @select="onTestCasedbSelect"></xm-test-casedb-mng>
 		</el-dialog>
 	</section>
 </template>
diff --git a/src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue b/src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue
index bd237a51..02efcb0c 100644
--- a/src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue
+++ b/src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue
@@ -22,8 +22,10 @@
 				-->
  				<el-table-column prop="name" label="用例库名称" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
-				        <span><el-link @click="goCasedbInfo(scope.row)">{{scope.row.name}} </el-link> </span>
-                        <span class="tool-bar">
+				        <span v-if="select!==true"><el-link @click="goCasedbInfo(scope.row)">{{scope.row.name}} </el-link> </span>
+                        <span v-else> {{scope.row.name}}  </span>
+                        <span class="tool-bar"> 
+                            <el-button type="warning" @click="goCasedbInfo(scope.row)" icon="el-icon-s-data"  plain circle title="视图"></el-button>  
                             <el-button type="primary" @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit"  plain circle></el-button>  
                         </span>
                     </template>