From ac7302f1954c98b2df4acd9c09d7b1bca1769bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 25 Jul 2022 15:28:07 +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/components/MdpSelectUserX/index.vue       |  5 +++
 .../core/components/MdpSelectUserXm/index.vue | 39 +++++++++++--------
 .../xm/core/xmQuestion/XmQuestionEdit.vue     | 19 +++------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/components/MdpSelectUserX/index.vue b/src/components/MdpSelectUserX/index.vue
index 5e9fc909..d599b51c 100644
--- a/src/components/MdpSelectUserX/index.vue
+++ b/src/components/MdpSelectUserX/index.vue
@@ -13,6 +13,7 @@
                 </slot>
 							</div>  
               <div v-if="disabled!==true" class="field-oper" :value="myVal"  :class="{disabled:disabled===true,enabled:disabled!==true}">
+                <slot name="oper">
                     <el-select v-model="myVal" @change="onSelectChange" :clearable="clearable">  
                           <el-option disabled value="" style="margin-bottom:5px;">
                               <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>
@@ -27,6 +28,10 @@
                             </div>
                           </el-option> 
                       </el-select> 
+                      <slot name="extOper">
+
+                      </slot>
+                      </slot>
                   </div> 
 						</div> 
             <el-dialog :visible.sync="deptUserVisible" append-to-body top="20px" width="60%">
diff --git a/src/views/xm/core/components/MdpSelectUserXm/index.vue b/src/views/xm/core/components/MdpSelectUserXm/index.vue
index bea2027c..28195141 100644
--- a/src/views/xm/core/components/MdpSelectUserXm/index.vue
+++ b/src/views/xm/core/components/MdpSelectUserXm/index.vue
@@ -13,24 +13,29 @@
                 </slot>
 							</div>  
               <div v-if="disabled!==true" class="field-oper" :class="{disabled:disabled===true,enabled:disabled!==true}">
-                    <el-select v-model="myVal" @change="onSelectChange" :clearable="clearable" filterable value-key="userid">  
+                <slot name="oper">
+                      <el-select v-model="myVal" @change="onSelectChange" :clearable="clearable" filterable value-key="userid">  
+                            
+                            <el-option :value="myVal" disabled v-if="users && users.length>10">
+                                <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-option>
+                            <el-option class="avatar-container" v-for="(item,index) in users" :key="index" :value="item" :label="item.username">  
+                            
+                              <div class="avatar-wrapper">
+                                    <el-avatar class="user-avatar"  :style="{backgroundColor:getMyColor(item)}">{{item.username}}</el-avatar> 
+                                    <span class="username">{{item.username}}</span>
+                                    <i v-if="myVal.userid==item.userid" class="el-icon-check"></i> 
+                                    <i v-else>&nbsp;&nbsp;</i>  
+                              </div>
+                            </el-option> 
+                            <el-option :value="myVal" disabled>
+                                <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> 
+                        <slot name="extOper">
                           
-                          <el-option :value="myVal" disabled v-if="users && users.length>10">
-                              <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-option>
-                          <el-option class="avatar-container" v-for="(item,index) in users" :key="index" :value="item" :label="item.username">  
-                          
-                            <div class="avatar-wrapper">
-                                  <el-avatar class="user-avatar"  :style="{backgroundColor:getMyColor(item)}">{{item.username}}</el-avatar> 
-                                  <span class="username">{{item.username}}</span>
-                                  <i v-if="myVal.userid==item.userid" class="el-icon-check"></i> 
-                                  <i v-else>&nbsp;&nbsp;</i>  
-                            </div>
-                          </el-option> 
-                          <el-option :value="myVal" disabled>
-                              <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> 
+                        </slot>
+                      </slot>
                   </div>
 						</div> 
             <el-dialog v-if="disabled!==true" :visible.sync="deptUserVisible" append-to-body top="20px" width="60%">
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 6c57e304..9e5b7497 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -40,20 +40,13 @@
 								<el-row class="padding"> 
 									<el-col :span="6"> 
 											<mdp-select-user-xm :project-id="editForm.projectId" :product-id="editForm.productId" label="责任人" v-model="editForm" userid-key="handlerUserid" username-key="handlerUsername" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)">
-											
+												<el-row slot="extOper">
+														<el-button type="text" @click="sendToAsk">指派给提出人</el-button> 
+														<el-button type="text"  @click="sendToCreater">指派给创建人</el-button>  
+													</el-row> 
 											</mdp-select-user-xm>
-											<el-popover
-												placement="top-start"
-												title="重新指派给"
-												width="200"
-												trigger="hover" >
-													<el-row>
-														<el-button type="text" @click="sendToAsk">提出人</el-button><br>
-														<el-button type="text"  @click="sendToCreater">创建人</el-button><br>
-														<el-button type="text"  @click="showGroupUsers('handlerUserid')">其它人</el-button><br>
-													</el-row>
-												<el-button slot="reference" type="text">指派给</el-button>
-											</el-popover> 
+ 
+													
 									</el-col>
 									
 									<el-col :span="6">