From b3c65bcfc9fb4c7630f79049b2b2cc57becebad9 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, 14 Jan 2023 18:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/imgUtil.js                            | 10 ++++-
 src/components/MdpSelectUserX/index.vue       |  2 +
 .../core/components/MdpSelectUserXm/index.vue | 38 ++++++++++++++-----
 src/views/xm/core/xmMenu/XmMenuEdit.vue       |  2 +-
 src/views/xm/core/xmTask/XmTaskEdit.vue       |  4 +-
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/api/imgUtil.js b/src/api/imgUtil.js
index 99f57048..4a4ff609 100644
--- a/src/api/imgUtil.js
+++ b/src/api/imgUtil.js
@@ -89,9 +89,11 @@ h55,h56,h57,h58,h59,h60,h61,h62,h63,h64,h64,h66,h67,h68,h69,h70
  export default {
 
   onImgError:function(userid,$event){
+    debugger;
     let img = $event.srcElement;
     img.src = this.getDefHeadimg(userid)
     img.onerror = null; //防止闪图
+    return false;
   },
 
 /**
@@ -121,12 +123,16 @@ getDefHeadimg:function(userid){
  * @param {*} rand false || true ,是否给url添加随机数，用于立即刷新头像，否则头像更新后，会被cdn缓存一段时间
  * @returns 
  */
- getHeadimgurl:function (userid,headimgurl,rand) { 
+ getHeadimgurl:function (userid,headimgurl,rand) {  
+  debugger;
+  if(!userid){
+    return null;
+  }
   if(headimgurl){
     return headimgurl;
   }else{
     var authorStr=sessionStorage.getItem('authorMsg_' + userid) 
-    if(authorStr){
+    if(authorStr&&authorStr!='null'&& authorStr!='undefined'){
       var author=JSON.parse(authorStr)
       if(author && author.headimgurl){
         return author.headimgurl
diff --git a/src/components/MdpSelectUserX/index.vue b/src/components/MdpSelectUserX/index.vue
index 9056a97c..7b6177fa 100644
--- a/src/components/MdpSelectUserX/index.vue
+++ b/src/components/MdpSelectUserX/index.vue
@@ -53,6 +53,7 @@
     computed: { 
       
       avaterCpd(){  
+        debugger;
         var isEmpty=this.isEmpty(this.myVal)
         var username=isEmpty?"":(this.myVal.username?this.myVal.username:this.myVal.userid)
         var obj={isNull:isEmpty,icon:'el-icon-user',color:'#E4E7ED',innerText:username,userid:'',headimgurl:''} 
@@ -105,6 +106,7 @@
         },  
         
       myVal(){
+        debugger;
          if(!this.myVal||!this.myVal.userid){
               if(this.value && this.value[this.useridKey]){
                 this.value[this.useridKey]=""
diff --git a/src/views/xm/core/components/MdpSelectUserXm/index.vue b/src/views/xm/core/components/MdpSelectUserXm/index.vue
index 9898ebc7..dc275739 100644
--- a/src/views/xm/core/components/MdpSelectUserXm/index.vue
+++ b/src/views/xm/core/components/MdpSelectUserXm/index.vue
@@ -1,8 +1,14 @@
 <template>    
     <el-row>
 						<div class="field-box">  
-							<el-avatar class="field-avater" :class="{'dashed-circle':avaterCpd.isNull}"  :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar> 
+              <div class="avatar-container">
+                <div class="avatar-wrapper">
+                  <img v-if="avaterCpd.userid" class="user-avatar" :class="{'dashed-circle':avaterCpd.isNull}"   :style="{backgroundColor:avaterCpd.color}" :src="getHeadimgurl(avaterCpd.userid,avaterCpd.headimgurl)" @error="onImgError(avaterCpd.userid,$event)"></img>  
+                  <el-avatar v-else class="field-avater" :class="{'dashed-circle':avaterCpd.isNull}"  :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar> 
 							
+                </div>
+              </div>
+
               <div class="field-info" :class="{disabled:disabled===true,enabled:disabled!==true}">
                 <slot name="field-info" :value="myVal"  >
 								<span class="field-value" v-if="!avaterCpd.isNull">{{avaterCpd.innerText}} </span>
@@ -17,19 +23,19 @@
                       <el-select 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 :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 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" :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> 
+                                    <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 :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-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-row>
                             </el-option>
                         </el-select> 
                         <slot name="extOper">
@@ -54,15 +60,21 @@
   import UsersSelect from '@/views/mdp/sys/user/UsersSelectOnly.vue'
   import XmGroupSelect from '@/views/xm/core/xmGroup/XmGroupSelect.vue'
   var us=localStorage.getItem("mdp-his-users") 
+  import imtUtil  from '@/api/imgUtil';//全局公共库
   var users=us?JSON.parse(us):[] 
   export default {
     name: 'mdp-select-user-xm',
     components: { UsersSelect, XmGroupSelect },
     computed: { 
       avaterCpd(){  
+        debugger;
         var isEmpty=this.isEmpty(this.myVal)
         var username=isEmpty?"":(this.myVal.username?this.myVal.username:this.myVal.userid)
-        var obj={isNull:isEmpty,icon:'el-icon-user',color:'#E4E7ED',innerText:username} 
+        var obj={isNull:isEmpty,icon:'el-icon-user',color:'#E4E7ED',innerText:username,userid:'',headimgurl:''} 
+        if(!isEmpty){
+            obj.headimgurl=this.myVal.headimgurl
+            obj.userid=this.myVal.userid
+          }
           if(this.getColor||this.color){
             if(this.getColor){
                obj.color= this.getColor(this.myVal)
@@ -75,6 +87,8 @@
                  obj.color= util.getColor(this.myVal.userid) 
             } 
           } 
+
+
           if(this.getIcon||this.icon){
             if(this.getIcon){
               obj.icon= this.getIcon(this.myVal)
@@ -82,13 +96,15 @@
              obj.icon=this.icon
             }
           } 
+
+          debugger;
           
         return obj;
       }
     },
     data(){
         return {
-            myVal:{userid:'',username:''}, 
+            myVal:{userid:'',username:'',headimgurl:''}, 
             users:[],
             deptUserVisible:false,
             projectVisible:false,
@@ -161,7 +177,7 @@
      
     },
     methods: {    
-        
+        ...imtUtil,
       
         isEmpty(v) {  
           switch (typeof v) {
@@ -200,13 +216,15 @@
         }, 
 
          initData(){   
-            var myVal={}
+          debugger;
+            var myVal={userid:'',username:'',headimgurl:''}
             if(this.value){
               myVal.userid=this.value[this.useridKey]
               myVal.username=this.value[this.usernameKey]  
+              myVal.headimgurl=this.value.headimgurl
               this.myVal=myVal
             }else{
-              this.myVal={userid:'',username:''}
+              this.myVal=myVal
             }
            
           
@@ -252,7 +270,7 @@
     },
     mounted(){  
 			this.users=users
-      this.initData();
+      //this.initData();
 
     }
   }
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 1eeec58b..148b2b7a 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -125,7 +125,7 @@
 								<mdp-field-x v-model="editForm.finishRate" label="进度"> 
 									<div slot="value" style="min-width:150px;"><el-progress  :percentage="editForm.finishRate?editForm.finishRate:0"></el-progress>
 									</div>
-									<div slot="oper"><el-button  @click="activateTabPaneName='2'" type="primary">查看工时</el-button><el-button  @click="activateTabPaneName='6'" type="primary">查看子工作项</el-button></div>
+									<div slot="oper"><el-button  @click="activateTabPaneName='51'" type="primary">查看工时</el-button><el-button  @click="activateTabPaneName='6'" type="primary">查看子工作项</el-button></div>
 								</mdp-field-x>  
 							</el-col>  
 							<el-col :span="8">  
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index d38b485e..c04cd289 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -144,9 +144,9 @@
 									<mdp-select-user-xm  label="负责人" v-model="editForm" userid-key="createUserid" username-key="createUsername" @change="editXmTaskSomeFields(editForm,'createUserid',$event)"></mdp-select-user-xm> 
  							</el-col>   
 							<el-col :span="8" v-if="editForm.ntype=='0'">  
-									<mdp-field-x v-if="editForm.crowd=='1'"  label="执行人" v-model="editForm.executorUsername">
+									<mdp-select-user-xm v-if="editForm.crowd=='1'"  label="执行人" v-model="editForm.executorUsername">
 										<el-button slot="oper" @click="activateTabPaneName='42'">去管理竞标人</el-button>
-									</mdp-field-x> 
+									</mdp-select-user-xm> 
 									<mdp-select-user-xm v-if="editForm.crowd!='1'" label="执行人" v-model="editForm" userid-key="executorUserid" username-key="executorUsername" @change="editXmTaskSomeFields(editForm,'executorUserid',$event)"></mdp-select-user-xm> 
  							</el-col>