Explorar o código

解决企业微信名字和工号在一起的问题

Lijy %!s(int64=2) %!d(string=hai) anos
pai
achega
aee0ba49a3

+ 5 - 5
fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -9,7 +9,7 @@
             </div>
             </div>
             <div v-if="multiSelect" :style="'line-height: '+selectHeight+'px;margin-left: -10px'" :class="selectName == $t('defaultText.pleaseChoose') ? 'selecttex selecttexXuan' : 'selecttex'">
             <div v-if="multiSelect" :style="'line-height: '+selectHeight+'px;margin-left: -10px'" :class="selectName == $t('defaultText.pleaseChoose') ? 'selecttex selecttexXuan' : 'selecttex'">
                 <span v-if="multiSelectList.length > 0">
                 <span v-if="multiSelectList.length > 0">
-                    <span v-if="!tile">
+                    <span v-if="!tile" style="width: 100%">
                         <span class="all">
                         <span class="all">
                             <ww-open-data type='userName' :openid='multiSelectList[0].name'></ww-open-data>
                             <ww-open-data type='userName' :openid='multiSelectList[0].name'></ww-open-data>
                             {{multiSelectList[0].name}}
                             {{multiSelectList[0].name}}
@@ -17,11 +17,11 @@
                         </span>
                         </span>
                         <span class="all" v-if="multiSelectList.length > 1"> + {{multiSelectList.length - 1}}</span>
                         <span class="all" v-if="multiSelectList.length > 1"> + {{multiSelectList.length - 1}}</span>
                     </span>
                     </span>
-                    <span v-if="tile">
+                    <span v-if="tile" style="width: 100%">
                         <span class="all" style="margin-right: 6px" v-for="(items, indexs) in multiSelectList" :key="indexs">
                         <span class="all" style="margin-right: 6px" v-for="(items, indexs) in multiSelectList" :key="indexs">
                             <ww-open-data type='userName' :openid='items.name'></ww-open-data>
                             <ww-open-data type='userName' :openid='items.name'></ww-open-data>
                             <!-- {{items.name}} -->
                             <!-- {{items.name}} -->
-                            <span v-if="items.jobNumber">{{items.jobNumber}}</span>
+                            <span v-if="items.jobNumber" class="spanFllat">{{items.jobNumber}}</span>
                             <i class="el-icon-error" @click.stop="deleteMultiSelectList(indexs)" v-if="!disabled"></i>
                             <i class="el-icon-error" @click.stop="deleteMultiSelectList(indexs)" v-if="!disabled"></i>
                         </span>
                         </span>
                     </span>
                     </span>
@@ -43,7 +43,7 @@
         <div class="transitionBox" :style="filterable ? 'margin: 30px 0;' : ''">
         <div class="transitionBox" :style="filterable ? 'margin: 30px 0;' : ''">
             <ul class="transitionBoxUl">
             <ul class="transitionBoxUl">
                 <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index)" @click="liClick(item, index)"> 
                 <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index)" @click="liClick(item, index)"> 
-                    <span v-if="!multiSelect">
+                    <span v-if="!multiSelect" style="width: 100%">
                         <span v-if="item.name">
                         <span v-if="item.name">
                             <ww-open-data type='userName' :openid='item.name'></ww-open-data>
                             <ww-open-data type='userName' :openid='item.name'></ww-open-data>
                         </span> 
                         </span> 
@@ -54,7 +54,7 @@
                         <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>
                         <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>
                     </span>
                     </span>
 
 
-                    <span v-if="multiSelect">
+                    <span v-if="multiSelect" style="width: 100%">
                         <span :class="item.flg ? 'hoverSpan hoverSpanHover' : 'hoverSpan'">
                         <span :class="item.flg ? 'hoverSpan hoverSpanHover' : 'hoverSpan'">
                             <span>
                             <span>
                                 <ww-open-data type='userName' :openid='item.name'></ww-open-data>
                                 <ww-open-data type='userName' :openid='item.name'></ww-open-data>

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -8,7 +8,7 @@
                     <span>{{$t('workingHoursHousekeeper')}}</span>
                     <span>{{$t('workingHoursHousekeeper')}}</span>
                 </div>
                 </div>
             </el-col>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="6">
                 <div class="tools" @click.prevent="collapse" style="position: relative;">
                 <div class="tools" @click.prevent="collapse" style="position: relative;">
                     <i class="fa fa-align-justify"></i>
                     <i class="fa fa-align-justify"></i>
                     <div class="gongshimingz">
                     <div class="gongshimingz">
@@ -17,7 +17,7 @@
                 </div>
                 </div>
             </el-col>
             </el-col>
 
 
-            <el-col :span="11" class="userinfo">
+            <el-col :span="12" class="userinfo">
                 <!-- 中英文切换入口 -->
                 <!-- 中英文切换入口 -->
                 <!-- <el-dropdown trigger="click" @command="langChange" style="margin-right:30px;">
                 <!-- <el-dropdown trigger="click" @command="langChange" style="margin-right:30px;">
                     <span class="el-dropdown-link userinfo-inner">
                     <span class="el-dropdown-link userinfo-inner">