From ffdef8204af7693e904049d4bd6b3a48e02b5c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 28 Jan 2023 18:27:14 +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/xmTestCase/XmTestCaseMng.vue      | 17 +++++++++++---
 .../core/xmTestPlanCase/XmTestPlanCaseMng.vue | 23 +++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 63e4f8e9..5807c631 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -38,7 +38,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 @visible-change="selectVisible(scope.row,$event)" :dict="dicts['testCaseStatus']" v-model="scope.row.caseStatus" effect="dark" @change="editSomeFields(scope.row,'caseStatus',$event)"></mdp-select-dict-tag> 
                             </template>
                         </el-table-column>      
                         <el-table-column prop="funcName" label="模块" min-width="150" show-overflow-tooltip>
@@ -53,7 +53,7 @@
                         </el-table-column>      
                         <el-table-column prop="cusername" label="负责人姓名" min-width="120" show-overflow-tooltip>
                             <template slot-scope="scope"> 
-                                <mdp-select-user-xm  userid-key="cuserid" username-key="cusername" v-model="scope.row" :disabled="true"> 
+                                <mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)"  userid-key="cuserid" username-key="cusername" :product-id="xmProductCpd?xmProductCpd.id:null" v-model="scope.row"  @change="editSomeFields(scope.row,'cuserid',$event)"> 
                                 </mdp-select-user-xm>
                             </template>
                         </el-table-column>   
@@ -236,6 +236,11 @@ export default {
             }).catch( err => this.load.list = false );
         },
 
+        selectVisible(row,visible){
+            if(visible==true){
+                this.rowClick(row);
+            }
+        },
         //显示编辑界面 XmTestCase 测试用例
         showEdit: function ( row,index ) {
             this.editFormVisible = true;
@@ -309,7 +314,13 @@ export default {
         }else{
             params['ids']=[row].map(i=>i.id)
         }
-        params[fieldName]=$event
+        if(fieldName=='cuserid'){
+            params.cuserid=$event[0].userid
+            params.cusername=$event[0].username
+        }else{
+            params[fieldName]=$event
+        }
+        
         var func = editSomeFieldsXmTestCase
         func(params).then(res=>{
           let tips = res.data.tips;
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
index aff6c132..b8987128 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
@@ -34,24 +34,24 @@
                         </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)" :disabled="true"></mdp-select-dict-tag> 
+                                <mdp-select-dict-tag @visible-change="selectVisible(scope.row,$event)" :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"> 
                             <el-table-column prop="execStatus" label="执行结果" width="120" show-overflow-tooltip>
                                 <template slot-scope="scope"> 
-                                    <mdp-select-dict-tag :dict="dicts['testStepTcode']" v-model="scope.row.execStatus" effect="dark" @change="editSomeFields(scope.row,'execStatus',$event)"></mdp-select-dict-tag> 
+                                    <mdp-select-dict-tag @visible-change="selectVisible(scope.row,$event)" :dict="dicts['testStepTcode']" v-model="scope.row.execStatus" effect="dark" @change="editSomeFields(scope.row,'execStatus',$event)"></mdp-select-dict-tag> 
                                 </template>
                             </el-table-column>
                             <el-table-column prop="execUsername" label="执行人姓名" min-width="120" >
                                 <template slot-scope="scope">  
-                                    <mdp-select-user-xm  userid-key="execUserid" username-key="execUsername" v-model="scope.row" :disabled="true"> 
+                                    <mdp-select-user-xm @visible-change="selectVisible(scope.row,$event)" :product-id="xmProductCpd?xmProductCpd.id:null" :project-id="xmProject?xmProject.id:null"  userid-key="execUserid" username-key="execUsername" v-model="scope.row"  @change="editSomeFields(scope.row,'execUserid',$event)"> 
                                     </mdp-select-user-xm>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="priority" label="优先级" width="120" >
                                 <template slot-scope="scope">
-                                    <mdp-select-dict-tag :dict="dicts['priority']" v-model="scope.row.priority" @change="editSomeFields(scope.row,'priority',$event)"></mdp-select-dict-tag>  
+                                    <mdp-select-dict-tag @visible-change="selectVisible(scope.row,$event)" :dict="dicts['priority']" v-model="scope.row.priority" @change="editSomeFields(scope.row,'priority',$event)"></mdp-select-dict-tag>  
                                 </template>
                             </el-table-column>
                             <el-table-column prop="remark" label="执行备注" min-width="150" show-overflow-tooltip>
@@ -319,7 +319,13 @@ export default {
         }else{
             params['pkList']=[row].map(i=>{ return { caseId:i.caseId,  planId:i.planId}})
         }
-        params[fieldName]=$event
+        if(fieldName=='execUserid'){
+            params.execUserid=$event[0].userid
+            params.execUsername=$event[0].username
+        }else{
+            params[fieldName]=$event
+        }
+       
         var func = editSomeFieldsXmTestPlanCase
         func(params).then(res=>{
           let tips = res.data.tips;
@@ -334,6 +340,13 @@ export default {
           }
         }).catch((e)=>Object.assign(this.editForm,this.editFormBak))
       },
+      
+
+        selectVisible(row,visible){
+            if(visible==true){
+                this.rowClick(row);
+            }
+        },
         rowClick: function(row, event, column){
             this.editForm=row
             this.editFormBak={...row};