From f8d2a0d859dcf867b55bf9f509079bdf499f3038 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 10:10:47 +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/components/XmUserField/index.vue | 12 ++++++++----
 src/views/xm/core/xmGroup/XmGroupSelect.vue        |  2 +-
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue    | 10 +++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/components/XmUserField/index.vue b/src/views/xm/core/components/XmUserField/index.vue
index 661253ae..e1f575ed 100644
--- a/src/views/xm/core/components/XmUserField/index.vue
+++ b/src/views/xm/core/components/XmUserField/index.vue
@@ -27,17 +27,17 @@
                         </div>
                       </el-option> 
                       <el-option value="" >
-                          <el-row><el-button :type="deptUserVisible?'':'primary'" @click.stop="deptUserVisible=false">常用用户</el-button> <el-button :type="deptUserVisible?'primary':''"  @click.stop="deptUserVisible=true">部门用户</el-button><el-button v-if="projectId" :type="projectVisible?'primary':''"  @click.stop="projectVisible=true">项目组</el-button> </el-row>
+                          <el-row><el-button :type="deptUserVisible?'':'primary'" @click.stop="deptUserVisible=false">常用用户</el-button> <el-button :type="deptUserVisible?'primary':''"  @click.stop="deptUserVisible=true">部门用户</el-button><el-button v-if="projectId||productId" :type="projectVisible?'primary':''"  @click.stop="projectVisible=true">项目组</el-button> </el-row>
                       </el-option>
                   </el-select> 
               </div>
 						</div> 
-            <el-dialog :visible.sync="deptUserVisible" append-to-body top="20px" width="60%">
+            <el-dialog v-if="disabled!==true" :visible.sync="deptUserVisible" append-to-body top="20px" width="60%">
                <users-select :visible="deptUserVisible" :isSingleUser="true"  :isSelectByDept="true" @confirm="onConfirmUsers"></users-select>
             </el-dialog>
             
-            <el-dialog :visible.sync="projectVisible" append-to-body top="20px" width="60%">
-               <xm-group-select :sel-project="{id:projectId}" :isSelectSingleUser="true" @user-confirm="onProjectUsersConfirm"></xm-group-select>
+            <el-dialog v-if="disabled!==true" :visible.sync="projectVisible" append-to-body top="20px" width="60%">
+               <xm-group-select :sel-project="{id:projectId}" :xm-product="{id:productId}" :isSelectSingleUser="true" @user-confirm="onProjectUsersConfirm"></xm-group-select>
             </el-dialog>
     </el-row>
   </template>
@@ -97,6 +97,10 @@
           default:''
         },
       
+        productId:{
+          type:String,
+          default:''
+        },
         disabled:{
             type:Boolean,
             default:false,
diff --git a/src/views/xm/core/xmGroup/XmGroupSelect.vue b/src/views/xm/core/xmGroup/XmGroupSelect.vue
index acb7ca30..57f7d250 100644
--- a/src/views/xm/core/xmGroup/XmGroupSelect.vue
+++ b/src/views/xm/core/xmGroup/XmGroupSelect.vue
@@ -7,7 +7,7 @@
 							 
 					<el-button   type="primary" @click="userConfirm" icon="el-icon-finished">确认选择</el-button>  
 		</el-row>  
-		<el-row class="padding-top" v-loading="load.list" :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table">
+		<el-row class="padding-top" v-loading="load.list" :style="{height:maxTableHeight+'px'}" ref="table">
 			<el-row v-for="(item,index) in xmGroupFormworkSels" :key="index"> 
 				<h3>
 					<div class="padding-top">{{item.groupName}}
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 7276c2de..c9bae0f2 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -16,9 +16,9 @@
 								<el-divider direction="vertical"></el-divider> 
 								<el-button type="text" icon="el-icon-copy" @click="copyLink">拷贝链接(快速分享)</el-button>
 						</el-form-item> 
-								<el-row> 
+								<el-row class="padding"> 
 									<el-col :span="6"> 
-											<xm-user-field :project-id="editForm.projectId" label="责任人" v-model="editForm" userid-key="handlerUserid" username-key="handlerUsername" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)"></xm-user-field>
+											<xm-user-field :project-id="editForm.projectId" :product-id="editForm.productId" label="责任人" v-model="editForm" userid-key="handlerUserid" username-key="handlerUsername" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)"></xm-user-field>
 											<el-popover
 												placement="top-start"
 												title="重新指派给"
@@ -53,8 +53,8 @@
 											
 												<el-col :span="8">
 													<el-form-item label="提出人" prop="askUsername">
-														<el-tag @click="showGroupUsers('askUserid')">{{editForm.askUsername?editForm.askUsername:'未关联提出人'}}</el-tag> 
-													</el-form-item> 
+														<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">
 													<el-form-item label="复现频率" prop="repRate"> 
@@ -154,7 +154,7 @@
 									
 								</el-tabs> 
 						</el-col>
-						<el-col :span="6">
+						<el-col :span="6" class="padding border">
 							<el-form-item label="归属项目" prop="projectId">
 								{{editForm.projectId}}
 							</el-form-item>