Pārlūkot izejas kodu

Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

cs 2 gadi atpakaļ
vecāks
revīzija
36780b67aa

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

@@ -9,7 +9,7 @@
             </div>
             <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="!tile">
+                    <span v-if="!tile" style="width: 100%">
                         <span class="all">
                             <ww-open-data type='userName' :openid='multiSelectList[0].name'></ww-open-data>
                             {{multiSelectList[0].name}}
@@ -17,11 +17,11 @@
                         </span>
                         <span class="all" v-if="multiSelectList.length > 1"> + {{multiSelectList.length - 1}}</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">
                             <ww-open-data type='userName' :openid='items.name'></ww-open-data>
                             <!-- {{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>
                         </span>
                     </span>
@@ -43,7 +43,7 @@
         <div class="transitionBox" :style="filterable ? 'margin: 30px 0;' : ''">
             <ul class="transitionBoxUl">
                 <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">
                             <ww-open-data type='userName' :openid='item.name'></ww-open-data>
                         </span> 
@@ -54,9 +54,9 @@
                         <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>
                     </span>
 
-                    <span v-if="multiSelect">
+                    <span v-if="multiSelect" style="width: 100%">
                         <span :class="item.flg ? 'hoverSpan hoverSpanHover' : 'hoverSpan'">
-                            <span>
+                            <span style="width: 100%;display: inline-block;">
                                 <ww-open-data type='userName' :openid='item.name'></ww-open-data>
                                 <!-- {{item.name}} -->
                                 <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>

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

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

+ 10 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -1012,9 +1012,9 @@
                             }
                         } 
                         else if(this.theCustomListFlg) {
-                            // this.allListData = res.data.list
+                            // this.allListData = res.data.list ? res.data.list : []
                             this.total = this.allListData.list.length
-                            list = this.allListData.list.slice(0+50*(this.page-1),49+50*(this.page-1))
+                            list = this.total ? this.allListData.list.slice(0+50*(this.page-1),49+50*(this.page-1)) : []
                             // list = res.data.list
                             
                             for(var i in list) {
@@ -1039,8 +1039,14 @@
                         } 
                         else {
                             //自定义列表:data:{cost:3, costMoney:222}
-                            this.total = this.allListData.length
-                            list = this.allListData.slice(0+50*(this.page-1),49+50*(this.page-1))
+                            this.total = this.allListData.costList.length
+                            console.log('slice',this.allListData);
+                            // if(this.total){
+                                list = this.allListData.costList.slice(0+50*(this.page-1),49+50*(this.page-1))
+                            // }else{
+                            //     list = 
+                            // }
+                            // list = this.total ?  : []
                             
                             for(var i in list) {
                                 xList.push(list[i].name);

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -15,7 +15,7 @@
             工时报表统计等更多功能,请从PC端企业微信进入
         </div> -->
         <!-- <van-icon v-if="isCorpWX" class="kefu" name="service-o" size="30" color="#20a0ff" @click="tokefu" /> -->
-        <div class="kefu"><img src="../../assets/icon/kefu.png" alt=""></div>
+        <div v-if="isCorpWX" class="kefu" @click="tokefu"><img src="../../assets/icon/kefu.png" alt=""></div>
         <div class="tip"  v-if="!isCorpWX">
             体验报表统计等更多功能,尽在PC端<br>
             网页用户访问http://worktime.ttkuaiban.com,钉钉用户直接从钉钉PC端进入工时管家