From 462b285efbeb6ff5838e649bc1465a990850b779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 24 Jan 2023 21:19:42 +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

---
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue          | 9 +++++++++
 src/views/xm/core/xmTestCase/XmTestCaseEdit.vue          | 3 ++-
 src/views/xm/core/xmTestCase/XmTestCaseSelect.vue        | 5 +++--
 src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue   | 2 +-
 .../xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue      | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 5c551093..b8c739c4 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -618,6 +618,15 @@
 						this.editForm.opStep=this.xmTestCase.testStep 
 						this.editForm.name=this.xmTestCase.caseName
 					} 
+					if(this.xmTestPlan && this.xmTestPlan.id){
+						this.editForm.casedbId=this.xmTestPlan.casedbId
+						this.editForm.casedbName=this.xmTestPlan.casedbName
+						this.editForm.planId=this.xmTestPlan.id
+						this.editForm.projectId=this.xmTestPlan.projectId
+						this.editForm.projectName=this.xmTestPlan.projectName
+						this.editForm.productId=this.xmTestPlan.productId
+						this.editForm.productName=this.xmTestPlan.productName
+					}
 					if(this.xmTestPlanCase  && this.xmTestPlanCase.planId){
 						this.editForm.planId=this.xmTestPlanCase.planId
 						this.editForm.productId=this.xmTestPlanCase.productId
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index bb64d4a4..9206f276 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -39,7 +39,7 @@
 									<mdp-select-dict-x label="状态" :dict="dicts['testCaseStatus']" v-model="editForm.caseStatus"  @change="editSomeFields(editForm,'caseStatus',$event)"></mdp-select-dict-x> 
 								</el-col> 
 								<el-col :span="6"> 
-									 <mdp-select-user-xm label="维护人" userid-key="luserid" username-key="lusername" v-model="editForm" @change="editSomeFields(editForm,'luserid',$event)" :product-id="editForm.productId"></mdp-select-user-xm>
+									 <mdp-select-user-xm label="责任人" userid-key="cuserid" username-key="cusername" v-model="editForm" @change="editSomeFields(editForm,'cuserid',$event)" :product-id="editForm.productId"></mdp-select-user-xm>
  
 								</el-col>  
 								<el-col :span="6">  
@@ -278,6 +278,7 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 				}else if(fieldName=='cuserid'){
 					 params[fieldName]=$event[0].userid
 					 params['cusername']=$event[0].username 
+					 params['cbranchId']=$event[0].branchId 
 				}else if(fieldName=='luserid'){
 					 params[fieldName]=$event[0].userid
 					 params['lusername']=$event[0].username 
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
index d46126d2..fa2ce940 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
@@ -15,7 +15,7 @@
                     <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestCases" icon="el-icon-search">查询</el-button>
                     <span style="float:right;">
                         
-                        <el-button type="primary" v-loading="load.edit" @click="selectConfirm" :disabled="this.sels.length===0 || load.edit==true" icon="el-icon-finished" plain>确认选择</el-button>
+                        <el-button type="primary" v-loading="load.edit" @click="selectConfirm" :disabled="this.sels.length===0 || load.edit==true" icon="el-icon-finished">确认选择</el-button>
                     </span>
                 </el-row>
                 <el-row>
@@ -30,7 +30,7 @@
                         -->
                          <el-table-column prop="caseName" label="标题" min-width="250" show-overflow-tooltip>
                             <template slot-scope="scope">
-                                <span><el-link @click="showEdit(scope.row)"> {{scope.row.caseName}} </el-link></span>
+                                <span>  {{scope.row.caseName}}  </span>
                             </template>
                         </el-table-column>
                         
@@ -197,6 +197,7 @@ export default {
             if(this.xmTestCasedb && this.xmTestCasedb.id){
                 params.casedbId=this.xmTestCasedb.id
             }
+            params.caseStatus="2"
             this.load.list = true;
             listXmTestCase(params).then((res) => {
                 var tips=res.data.tips;
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
index b7e3c322..aff6c132 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
@@ -34,7 +34,7 @@
                         </el-table-column>	
                         <el-table-column prop="caseStatus" label="用例状态" width="100" show-overflow-tooltip>
                             <template slot-scope="scope"> 
-                                <mdp-select-dict-tag :dict="dicts['testCaseStatus']" v-model="scope.row.caseStatus" effect="dark" @change="editSomeFields(scope.row,'caseStatus',$event)"></mdp-select-dict-tag> 
+                                <mdp-select-dict-tag :dict="dicts['testCaseStatus']" v-model="scope.row.caseStatus" effect="dark" @change="editSomeFields(scope.row,'caseStatus',$event)" :disabled="true"></mdp-select-dict-tag> 
                             </template>
                         </el-table-column>  
                         <template v-if="select!==true"> 
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
index 6004d90e..93113103 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
@@ -199,7 +199,7 @@ export default {
             if(this.xmProductCpd && this.xmProductCpd.id){
                 params.productId=this.xmProductCpd.id
             }
-
+            params.caseStatus="2"
             this.load.list = true;
             listXmTestPlanCase(params).then((res) => {
                 var tips=res.data.tips;