From 5af82bf0001fcf1cb06aa7540432a4f96489ea8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 22 Jul 2022 13:58:12 +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/components/XmUserField/index.vue  |  3 +-
 .../xm/core/xmQuestion/XmQuestionEdit.vue     | 86 +++++++++++++++----
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  7 +-
 .../xmQuestionHandle/XmQuestionHandleMng.vue  |  2 +-
 .../xm/core/xmTestPlanCase/TestStepResult.vue |  6 +-
 .../xmTestPlanCase/XmTestPlanCaseEdit.vue     |  2 +-
 6 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/src/views/xm/core/components/XmUserField/index.vue b/src/views/xm/core/components/XmUserField/index.vue
index e1f575ed..2dbad9df 100644
--- a/src/views/xm/core/components/XmUserField/index.vue
+++ b/src/views/xm/core/components/XmUserField/index.vue
@@ -64,7 +64,8 @@
         value:{  
           handler(){
              this.initData();
-          }
+          },
+          deep:true,
            
         },  
         
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index e570c313..15510ebd 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -53,7 +53,7 @@
 											
 												<el-col :span="8">
 													<el-form-item label="提出人" prop="askUsername">
-														<xm-user-field :project-id="editForm.projectId" :product-id="editForm.productId" label="责任人" v-model="editForm" userid-key="askUserid" username-key="askUsername" @change="editXmQuestionSomeFields(editForm,'askUserid',$event)"></xm-user-field>
+														<xm-user-field :project-id="editForm.projectId" :product-id="editForm.productId" label="提出人" v-model="editForm" userid-key="askUserid" username-key="askUsername" @change="editXmQuestionSomeFields(editForm,'askUserid',$event)"></xm-user-field>
  													</el-form-item> 
 												</el-col>
 												<el-col :span="8">
@@ -124,13 +124,13 @@
 										</el-row>
 									</el-tab-pane> 
 
-									<el-tab-pane label="意见" name="4"> 
+									<el-tab-pane label="意见" name="4" v-if="opType!='add'"> 
 										<el-row> 
 												<xm-question-handle-mng v-if="activateTabPaneName=='4'" :bug="editForm" :visible="activateTabPaneName=='4'"></xm-question-handle-mng>
 											 
 										</el-row>
 									</el-tab-pane>  
-									<el-tab-pane label="关注" name="91"> 
+									<el-tab-pane label="关注" name="91" v-if="opType!='add'"> 
 										<xm-my-do-focus v-if="activateTabPaneName=='91'" :biz-id="editForm.id" :pbiz-id="editForm.projectId" :biz-name="editForm.name" focus-type="5"></xm-my-do-focus>
 									</el-tab-pane>
 									
@@ -151,6 +151,9 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
+					<el-row style="float:right;" v-if="opType==='add'">
+						<el-button type="primary" @click="saveSubmit">保存</el-button>
+					</el-row>
 				</el-form>
 				<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="70%"  append-to-body   :close-on-click-modal="false">
 					<xm-group-mng  :sel-project="selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
@@ -177,7 +180,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { editXmQuestion,editXmQuestionSomeFields } from '@/api/xm/core/xmQuestion'; 
+	import { addXmQuestion,editXmQuestionSomeFields } from '@/api/xm/core/xmQuestion'; 
 	import { mapGetters } from 'vuex';
 	import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件
 	import {sn} from '@/common/js/sequence';
@@ -218,17 +221,15 @@
 				 
 			}
 		},
-		props:['xmQuestion','visible',"selProject",'opType'],
+		props:['xmQuestion','visible',"selProject",'opType','xmProduct','xmTestCase','xmTestPlanCase'],
 		watch: {
 	      'xmQuestion':function( xmQuestion ) {
 	        this.editForm = {...xmQuestion};
 	      },
 	      'visible':function(visible) {
 	      	if(visible==true){
-				this.editFormBak={...this.editForm}
-	      	}else{
-			  this.flowInfoVisible=false;
-			}
+				this.initData(); 
+	      	}
 			this.activateTabPaneName='12'
 	      }
 	    },
@@ -293,8 +294,7 @@
 				selectUserVisible: false,
 				userFieldName:'',
 				xmQuestionHandles:[],
-				selectTaskVisible:false,
-				flowInfoVisible:false,
+				selectTaskVisible:false, 
 				selectMenuVisible:false, 
 				tagSelectVisible:false, 
 				xmProductVersions:[{id:"1.0.0" ,name:'1.0.0'}],
@@ -310,7 +310,7 @@
 				this.$emit('cancel');
 			},
 			//新增提交XmQuestion xm_question 父组件监听@submit="afterAddSubmit"
-			editSubmit: function (tardgetBugStatus) {
+			saveSubmit: function (tardgetBugStatus) {
 				this.$refs.editForm.validate((valid) => { 
 					if (valid) {
 						this.$confirm('确认提交吗？', '提示', {}).then(() => {
@@ -327,7 +327,7 @@
 								params.description=params.description.replace(/<p>\n<br>\n<\/p>/g,"");
 								params.description=params.description.replace(/<p><br><\/p>/g,"");
 							}
-							editXmQuestion(params).then((res) => {
+							addXmQuestion(params).then((res) => {
 								this.load.edit=false
 								var tips=res.data.tips;
 								if(tips.isOk){
@@ -540,6 +540,60 @@
 				if(this.opType!=='add'){
 					this.editXmQuestionSomeFields(this.editForm,'funcId',row)
 				}
+			},
+			initData(){
+				this.editForm=Object.assign(this.editForm, this.xmQuestion);
+				if(this.opType==='add'){ 
+					this.editForm.askUserid=this.userInfo.userid
+					this.editForm.askUsername=this.userInfo.username
+					this.editForm.handlerUserid=this.userInfo.userid
+					this.editForm.handlerUsername=this.userInfo.username  
+					this.editForm.bugReason="0"
+					this.editForm.bugReason="0"
+					this.editForm.qtype="1"
+					this.editForm.bugSeverity="1"
+					this.editForm.priority="3"
+					this.editForm.bugStatus="0"
+					if(this.selProject && this.selProject.id){
+						this.editForm.projectId=this.selProject.id
+						this.editForm.projectName=this.selProject.name
+					}
+					if(this.xmProduct && this.xmProduct.id){
+						this.editForm.productId=this.xmProduct.id
+						this.editForm.productName=this.xmProduct.productName
+					}
+					if(this.xmTestCase && this.xmTestCase.id){
+						this.editForm.productId=this.xmTestCase.productId
+						this.editForm.productName=this.xmTestCase.productName
+						this.editForm.caseId=this.xmTestCase.caseId
+						this.editForm.caseName=this.xmTestCase.caseName
+						this.editForm.casedbId=this.xmTestCase.casedbId  
+						this.editForm.funcId=this.xmTestCase.funcId
+						this.editForm.funcName=this.xmTestCase.funcName 
+						this.editForm.menuId=this.xmTestCase.menuId
+						this.editForm.menuName=this.xmTestCase.menuName 
+						this.editForm.opStep=this.xmTestCase.testStep 
+						this.editForm.name=this.xmTestCase.caseName
+					} 
+					if(this.xmTestPlanCase  && this.xmTestPlanCase.planId){
+						this.editForm.planId=this.xmTestPlanCase.planId
+						this.editForm.productId=this.xmTestPlanCase.productId
+						this.editForm.productName=this.xmTestPlanCase.productName
+						this.editForm.caseId=this.xmTestPlanCase.caseId
+						this.editForm.caseName=this.xmTestPlanCase.caseName
+						this.editForm.casedbId=this.xmTestPlanCase.casedbId  
+						this.editForm.funcId=this.xmTestPlanCase.funcId
+						this.editForm.funcName=this.xmTestPlanCase.funcName 
+						this.editForm.menuId=this.xmTestPlanCase.menuId
+						this.editForm.menuName=this.xmTestPlanCase.menuName  
+						this.editForm.opStep=this.xmTestPlanCase.testStep
+						this.editForm.name=this.xmTestPlanCase.caseName
+						this.editForm.projectId=this.xmTestPlanCase.projectId
+					}
+				}else{
+
+				}
+				this.editFormBak={...this.editForm}
 			}
 		},//end method
 		components: {
@@ -547,10 +601,8 @@
 				'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,
 			XmMyDoFocus,XmFuncSelect,XmUserField,TestStepConfig,TestStepResult,
 		},
-		mounted() {
-			console.log("question_add");
-			this.editForm=Object.assign(this.editForm, this.xmQuestion);
-			this.editFormBak={...this.editForm}
+		mounted() { 
+			this.initData();
 			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason']).then(res=>{
 				if(res.data.tips.isOk){
 					 this.dicts=res.data.data
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 15bec9a4..d5bd988c 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -286,7 +286,7 @@
 				'userInfo','roles'
 			]),
 		},
-		props: ["selProject",'qtype','xmTestPlanCase','xmTestCase','xmIteration','xmProduct','queryScene'],
+		props: ["selProject",'qtype','xmTestPlanCase','xmTestCase','xmTestPlan','xmIteration','xmProduct','queryScene'],
 		watch:{
 			selProject:function(selProject){
 				this.filters.selProject=this.selProject
@@ -524,6 +524,11 @@
 					params.planId=this.xmTestPlanCase.planId 
 					params.caseId=this.xmTestPlanCase.caseId
 				}
+				
+				if(this.xmTestPlan){
+					params.planId=this.xmTestPlan.id  
+					params.projectId=this.xmTestPlan.projectId
+				}
 				if(this.xmTestCase){
 					params.caseId=this.xmTestCase.id
 				}
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
index 9899cdb5..1a0dcabe 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
@@ -14,7 +14,7 @@
 						<div style="max-height:100px;overflow:auto;" v-html="scope.row.receiptMessage"></div>
 					</template> 
 				</el-table-column>
-				<el-table-column prop="receiptTime" label="时间" width="100" ></el-table-column>  
+				<el-table-column prop="receiptTime" label="时间" width="150" ></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>
diff --git a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
index 1699be8d..f5e84396 100644
--- a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
+++ b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
@@ -134,7 +134,11 @@
 				return icons[parseInt(execStatus)]
 			},
 			addBug(item,index){
-
+				if(this.value instanceof Array){
+					this.$emit("add-bug",val)
+				}else{ 
+					this.$emit("add-bug",JSON.stringify(val))
+				} 
 			}
 		},//end methods
 		components: {  
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
index 4ffe7e0d..d56f2d1f 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
@@ -172,7 +172,7 @@
 		
 		<!--新增 XmQuestion xm_question界面-->
 		<el-dialog title="新增缺陷"  :visible.sync="addBugVisible"   width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
-			<xm-question-add   op-type="add" :xm-product="{id:editForm.productId,productName:editForm.productName}" :xm-test-plan-case="editForm"  :sel-project=" {id:editForm.projectId,name:editForm.projectName} "  :visible="addBugVisible" @cancel="addBugVisible=false" ></xm-question-add>
+			<xm-question-add  op-type="add" :xm-product="{id:editForm.productId,productName:editForm.productName}" :xm-test-plan-case="editForm"  :sel-project=" {id:editForm.projectId,name:editForm.projectName} "  :visible="addBugVisible" @cancel="addBugVisible=false" ></xm-question-add>
 		</el-dialog>
 	</section>
 </template>