From 52fc3ccb78d7b57f1e98263a514290f382ce23d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 27 Mar 2022 22:32:15 +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/XmQuestionAdd.vue      |  74 ++++++++----
 .../xm/core/xmQuestion/XmQuestionEdit.vue     | 108 +++++++++++++-----
 .../xm/core/xmQuestion/XmQuestionMng.vue      |   5 +
 3 files changed, 138 insertions(+), 49 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index fdc88f70..86872e2e 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -1,21 +1,26 @@
 <template>
 	<section class="page-container  padding">
-		<el-row>
-			<el-steps simple finish-status="success">
-				<el-step title="已激活,待确认" description="创建后自动激活、关闭后重新激活)"></el-step>
-				<el-step title="已确认,待解决" description="业务确认缺陷后变为已确认"></el-step>
-				<el-step title="已解决,待关闭" description="开发修复缺陷后，变成已解决"></el-step>
-				<el-step title="已关闭(可重新激活)" description="测试通过后变为已关闭，已关闭缺陷可以重新激活"></el-step>
+		<el-row class="padding-bottom">
+			<!--1|新提交 
+				2|处理中 
+				3|已修复
+				4|重新打开
+				5|已发布
+				6|已拒绝
+				7|挂起 --> 
+			<el-steps :active="calcBugStep" simple finish-status="success" >
+				<el-step v-for="(item,index) in dicts['bugStatus']" :title="item.name" :key="index" @click.native.stop="editForm.bugStatus=item.id">
+					<el-link slot="title" @click="editForm.bugStatus=item.id">
+						 {{item.name}} 
+					 </el-link>
+				</el-step> 
 			</el-steps>
 		</el-row>
 		<el-row class="page-main  padding">
 			<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-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-row>
 							<el-col :span="12">
@@ -25,18 +30,17 @@
 								</el-form-item>
 							</el-col>
 							<el-col  :span="12">
-								<el-form-item label="归属任务" prop="taskName"> 
-									
-									<div    class="icon" :style="{backgroundColor:   '#409EFF' }">
-										<i :class="  'el-icon-s-operation'  " ></i>
-									</div>  
-									 <el-tag  closable @click="showSelectTask" @close.stop="handleCloseTaskTag">{{addForm.taskName?addForm.taskName:'未关联任务'}}</el-tag>   
+								<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-row>
 						<el-row> 
 								<el-col :span="12">
-									<el-form-item label="优先级" prop="priority">
+									<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> 
@@ -68,9 +72,22 @@
 										</el-select> 
 									</el-form-item>
 								</el-col>
+						</el-row> 
+						<el-row> 
+								<el-col :span="12">
+									<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="12">
+									<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-row> 
 								<el-col :span="12">
 									<el-form-item label="提出人" prop="askUsername">
@@ -79,7 +96,7 @@
 									</el-form-item> 
 								</el-col>
 								<el-col :span="12">
-									<el-form-item label="指派给" prop="handlerUsername">
+									<el-form-item label="负责人" prop="handlerUsername">
 										{{addForm.handlerUsername}} <el-button type="text" @click="sendToAsk">指派给提出人</el-button><el-button type="text"  @click="sendToCreater">指派给创建人</el-button><el-button type="text"  @click="showGroupUsers('handlerUsername')">指派给其它人</el-button>
 									</el-form-item>
 								</el-col>
@@ -108,7 +125,7 @@
 								<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-form-item label="缺陷描述" prop="description">
+						<el-form-item label="缺陷描述" prop="description">
 							<el-tooltip content="点击切换为富文本编辑|普通文本">
 								<el-button icon="el-icon-refresh" @click="descriptionEditorVisible=!descriptionEditorVisible" type="text"></el-button>
 							</el-tooltip>
@@ -161,6 +178,21 @@
 			...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:['xmQuestion','visible',"selProject",'qtype','xmTestCaseExec','xmTestCase'],
 		watch: {
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index e074cc4d..67ab98ed 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -21,9 +21,7 @@
 			<el-row class="padding">
 				<font class="font">{{editForm.name}}</font>
 			</el-row>
-			<el-row class="padding-bottom">
-				<el-tooltip content="项目"><el-tag type="warning">{{selProject.name}} </el-tag></el-tooltip>
-				<el-divider direction="vertical"></el-divider> 
+			<el-row class="padding-bottom"> 
 				<el-tag>{{editForm.createUsername}} 于 {{editForm.createTime}} 创建 </el-tag>
 				<el-divider direction="vertical"></el-divider>
 				<el-tag v-if="editForm.tagNames">{{editForm.tagNames?editForm.tagNames:''}} </el-tag>
@@ -34,28 +32,27 @@
 			<el-divider></el-divider>
 			<el-row>
 				<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm"> 
-						<el-row> 
-							<el-col  :span="12">
-								<el-form-item label="归属任务" prop="taskName"> 
-									
-									<div    class="icon" :style="{backgroundColor:   '#409EFF' }">
-										<i :class="  'el-icon-s-operation'  " ></i>
-									</div>  
-									 <el-tag  closable @click="showSelectTask" @close.stop="handleCloseTaskTag">{{editForm.taskName?editForm.taskName:'未关联任务'}}</el-tag>   
+						
+						<el-row>
+							<el-col :span="12">
+								<el-form-item label="归属项目" prop="projectId">
+									<font v-if="editForm.projectId">{{editForm.projectId?editForm.projectId:''}}</font>
+ 									 <xm-project-select ref="xmProjectSelect" :auto-select="false"  @row-click="onPorjectConfirm" @clear="clearProject"> 
+									  </xm-project-select>
 								</el-form-item>
 							</el-col>
 							<el-col  :span="12">
-								<el-form-item label="归属用户故事" prop="taskName">  
-										<el-tag  closable @click="showSelectMenu" @close.stop="handleCloseMenuTag">
-										<div class="icon" :style="{backgroundColor:   'rgb(79, 140, 255)' }">
-											<i :class="  'el-icon-document'  " ></i>
-										</div> {{editForm.menuName?editForm.menuName:"未关联需求"}}</el-tag> 
+								<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> {{editForm.menuName?editForm.menuName:"未关联需求"}}</el-tag> 
 								</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row> 
 								<el-col :span="12">
-									<el-form-item label="优先级" prop="priority">
+									<el-form-item label="优先级别" prop="priority">
 										<el-select v-model="editForm.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> 
@@ -79,6 +76,26 @@
 									</el-form-item>
 									
 								</el-col>
+								
+								<el-col :span="12">
+									<el-form-item label="复现版本" prop="verNum">
+										<el-select v-model="editForm.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-row>
+						
+						<el-row> 
+								<el-col :span="12">
+									<el-form-item label="缺陷类别" prop="bugType">
+										<el-select v-model="editForm.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="12">
 									<el-form-item label="解决方案" prop="solution">
 										<el-select v-model="editForm.solution" placeholder="请选择解决方案">
@@ -87,9 +104,35 @@
 									</el-form-item>
 								</el-col>
 						</el-row>
-						<el-form-item label="指派给" prop="handlerUsername">
-							{{editForm.handlerUsername}}   <el-button type="text" @click="sendToCreater">指派给创建人</el-button><el-button  type="text" @click="showGroupUsers('handlerUsername')">选其它人</el-button>
-						</el-form-item>
+						
+						
+						<el-row> 
+								<el-col :span="12">
+									<el-form-item label="提出时间" prop="createTime">
+										 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="editForm.createTime"></el-date-picker>
+									</el-form-item>
+									
+								</el-col>
+								
+								<el-col :span="12">
+									<el-form-item label="结束时间" prop="endTime">
+										 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="editForm.endTime"></el-date-picker>
+									</el-form-item>
+								</el-col>
+						</el-row>
+						
+						<el-row> 
+								<el-col :span="12">
+									<el-form-item label="提出人" prop="askUsername">
+										<el-tag @click="showGroupUsers('askUsername')">{{editForm.askUsername?editForm.askUsername:'未关联提出人'}}</el-tag>
+ 									</el-form-item> 
+								</el-col>
+								<el-col :span="12">
+									<el-form-item label="负责人" prop="handlerUsername">
+										{{editForm.handlerUsername}} <el-button type="text" @click="sendToAsk">指派给提出人</el-button><el-button type="text"  @click="sendToCreater">指派给创建人</el-button><el-button type="text"  @click="showGroupUsers('handlerUsername')">指派给其它人</el-button>
+									</el-form-item>
+								</el-col>
+						</el-row> 
 					<el-form-item label="测试步骤" prop="opStep">
 						<el-col :span="24" v-if="editForm.expectResult">
 							<div class="wf-main-context-box" v-if="editForm.opStep">
@@ -181,6 +224,8 @@
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
 	import  XmQuestionHandleMng from '../xmQuestionHandle/XmQuestionHandleMng';//修改界面
   	import TagMng from "@/views/mdp/arc/tag/TagMng";
+	  
+	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
 
 	export default {
 		computed: {
@@ -227,6 +272,7 @@
 					bugStatus:[],
 					bugType:[],
 					bugRepRate:[],
+					bugReason:[],
 				},//下拉选择框的所有静态数据  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 },//查询中...
 				editFormRules: {
@@ -255,6 +301,8 @@
 				selectMenuVisible:false,
 				receiptMessageEditorVisible:false,
 				tagSelectVisible:false,
+				
+				xmProductVersions:[{id:"1.0.0" ,name:'1.0.0'}],
 				/**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -451,22 +499,26 @@
 					this.editForm.tagNames=""
 				}
 			},
+			
+			onPorjectConfirm:function(project){ 
+				this.editForm.projectId=project.id
+				this.editForm.projectName=project.name 
+			},
+			clearProject(){ 
+				this.editForm.projectId=''
+				this.editForm.projectName=''
+			},
 		},//end method
 		components: {
 				//在下面添加其它组件 'xm-question-edit':XmQuestionEdit
-				'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,
+				'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,
 		},
 		mounted() {
 			console.log("question_add");
 			this.editForm=Object.assign(this.editForm, this.xmQuestion);
-			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate']).then(res=>{
+			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason']).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
+					 this.dicts=res.data.data
 				}
 			});
 			//this.getXmQuestionHandle();
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 40afbf15..88665dc6 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -119,6 +119,7 @@
 					<xm-project-select v-else style="display:inline;"  :auto-select="false" :link-product-id="xmProduct?xmProduct.id:null" @row-click="showAddAfterProjectSelect" >
 						  <el-button slot="reference"  type="primary" icon="el-icon-plus"    round> </el-button>  
 					</xm-project-select>
+					<el-button @click="batchDel" type="danger" icon="el-icon-delete"></el-button>
 				</span>
 			 </el-row> 
 			 <el-row class="padding-top">
@@ -624,6 +625,10 @@
 			},
 			//批量删除xmQuestion
 			batchDel: function () {
+				if(this.sels.length<=0){
+					this.$notify({showClose: true, message:"请选择要删除的缺陷", type: "error"});
+					return ;
+				}
 				this.$confirm('确认删除选中记录吗？', '提示', {
 					type: 'warning'
 				}).then(() => {