From 8856b3b37db00f95447d503fa5cabca7ba65c488 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, 3 Mar 2023 18:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96tag=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Mdp/index.scss                 |  3 -
 src/components/MdpSelectDictTag/index.vue     |  3 +-
 src/components/MdpSelectUserX/index.vue       |  8 +--
 .../core/components/MdpSelectUserXm/index.vue | 55 ++++++++++---------
 .../xm/core/xmQuestion/XmQuestionEdit.vue     |  4 +-
 5 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/components/Mdp/index.scss b/src/components/Mdp/index.scss
index ee30b2ba..c5960d47 100644
--- a/src/components/Mdp/index.scss
+++ b/src/components/Mdp/index.scss
@@ -4,8 +4,6 @@
   margin-right: 5px;
   align-items: center;
   cursor: pointer;
-  height: 28px;
-  line-height: 28px;
   .field-avater {  
     background-color: #ff9f73;
   }
@@ -34,7 +32,6 @@
   .field-oper {
     height: 28px;
     line-height: 28px;
-    margin-right: 5px; 
     display: none;
   }  
 }
diff --git a/src/components/MdpSelectDictTag/index.vue b/src/components/MdpSelectDictTag/index.vue
index 23574d81..3e38524a 100644
--- a/src/components/MdpSelectDictTag/index.vue
+++ b/src/components/MdpSelectDictTag/index.vue
@@ -1,7 +1,8 @@
 <template>    
     <div :class="{'field-box':true,'small':size=='small','medium':size=='medium'}">
         <div class="field-info" :class="{disabled:disabled===true,enabled:disabled!==true}">
-           <div v-if="(currentItem&&currentItem.id)"><el-tag     :type="currentItem.className" :closable="closable" :effect="effect">{{currentItem.name}}</el-tag></div> 
+           <div v-if="(currentItem&&currentItem.id)">
+            <el-tag     :type="currentItem.className" :closable="closable" :color="currentItem.color" :effect="effect">{{currentItem.name}}</el-tag></div> 
            <div v-else> {{currentItem.name}} </div> 
         </div>
         <div v-if="disabled!==true" class="field-oper" :class="{disabled:disabled===true,enabled:disabled!==true}">
diff --git a/src/components/MdpSelectUserX/index.vue b/src/components/MdpSelectUserX/index.vue
index b3a201fc..8c5a5f02 100644
--- a/src/components/MdpSelectUserX/index.vue
+++ b/src/components/MdpSelectUserX/index.vue
@@ -26,11 +26,11 @@
                                   <i v-if=" myVal && myVal.userid==item.userid" class="el-icon-check"></i> 
                                   <i v-else>&nbsp;&nbsp;</i>  
                             </div>
-                          </el-option> 
-                      </el-select> 
-                      <slot name="extOper">
+                          </el-option>  
+                          <slot name="extOper">
 
-                      </slot>
+                          </slot>
+                      </el-select> 
                       </slot>
                   </div> 
 						</div> 
diff --git a/src/views/xm/core/components/MdpSelectUserXm/index.vue b/src/views/xm/core/components/MdpSelectUserXm/index.vue
index 4ad42c36..faca48e7 100644
--- a/src/views/xm/core/components/MdpSelectUserXm/index.vue
+++ b/src/views/xm/core/components/MdpSelectUserXm/index.vue
@@ -20,36 +20,39 @@
 							</div>  
               <div v-if="disabled!==true" class="field-oper" :class="{disabled:disabled===true,enabled:disabled!==true}">
                 <slot name="oper">
-                      <el-select :size="size" v-model="myVal" @change="onSelectChange" :clearable="clearable" filterable value-key="userid" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('blur',$event)" @click="$emit('click',$event)">  
-                            
-                            <el-option :value="myVal" disabled v-if="users && users.length>10">
-                                <el-row ><el-button v-if="users && users.length>0" :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-button v-if="projectId||productId" :type="productVisible?'primary':''"  @click.stop="productVisible=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">
-                                    <img class="user-avatar"  :style="{backgroundColor:getMyColor(item)}" :src="getHeadimgurl(item.userid,item.headimgurl)" @error="onImgError(item.userid,$event)"></img>  
-                                    <span class="username">{{item.username}}</span>
-                                    <i v-if="myVal && 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 v-if="users && users.length>0" :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-button v-if="projectId||productId" :type="productVisible?'primary':''"  @click.stop="productVisible=true">产品组</el-button> 
+                    <el-select :size="size" v-model="myVal" @change="onSelectChange" :clearable="clearable" filterable value-key="userid" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('blur',$event)" @click="$emit('click',$event)">  
+                        
+                        <el-option :value="myVal" disabled v-if="users && users.length>10">
+                            <el-row ><el-button v-if="users && users.length>0" :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-button v-if="projectId||productId" :type="productVisible?'primary':''"  @click.stop="productVisible=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">
+                                <img class="user-avatar"  :style="{backgroundColor:getMyColor(item)}" :src="getHeadimgurl(item.userid,item.headimgurl)" @error="onImgError(item.userid,$event)"></img>  
+                                <span class="username">{{item.username}}</span>
+                                <i v-if="myVal && 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 v-if="users && users.length>0" :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-button v-if="projectId||productId" :type="productVisible?'primary':''"  @click.stop="productVisible=true">产品组</el-button> 
 
-                                </el-row>
-                            </el-option>
-                        </el-select> 
+                            </el-row>
+                        </el-option>
                         <slot name="extOper">
 
                         </slot>
-                      </slot>
-                  </div>
+                    </el-select> 
+
+                  </slot>
+              </div>
 						</div> 
             <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="onTeamUsersConfirm"></users-select>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 7a9ed310..802ed168 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -60,9 +60,9 @@
 								<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-row slot="extOper" style="margin-left:20px;">
 														指派给 <el-button type="text" @click="sendToAsk"> 提出人</el-button>  <el-button type="text"  @click="sendToCreater"> 创建人</el-button>  
-													</el-row> 
+												</el-row> 
 											</mdp-select-user-xm>