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

fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -34,7 +34,7 @@
         </div>
     </div>
     <transition name="el-zoom-in-top">
-      <div v-show="show" style="position: relative;z-index: 99;"> 
+      <div v-show="show" style="position: relative;z-index: 999;"> 
         <!-- 搜索框 -->
         <div class="searchBox">
             <el-input :placeholder="$t('peaseenterthe')" size="mini" v-model="searchTex" style="width: 150px" @focus="searchBox()">

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -1486,6 +1486,12 @@ export default {
           url += "/exportUserWorkingTimeList"
           sl.startDate = this.rangeDatas[0]
           sl.endDate = this.rangeDatas[1]
+          if(this.departmentIdArray.length != 0){
+            sl.departmentId = this.departmentIdArray[this.departmentIdArray.length - 1]
+          }
+          if(this.userId){
+            sl.userId = this.userId
+          }
         } else if (this.ins == 9) {
           fName = this.$t('personnelfillingtimelyratestatistics')  + '.xls'
           url += "/exportReportTimelinessRate"

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -3693,6 +3693,7 @@ overflow: auto;
         text-align: center;
         color: #fff;
         background: #778899;
+        overflow: hidden;
     }
     div {
         text-align: left;

fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -102,7 +102,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('starttimes') - $t('time.endTime')" min-width="240">
+      <el-table-column :label="$t('starttimes')  +' - '+ $t('time.endTime')" min-width="240">
         <template slot-scope="scope">
           <span>{{scope.row.startDate ? scope.row.startDate + ' ~ ' + scope.row.endDate : ''}}</span>
         </template>

fhKeeper/formulahousekeeper/timesheet/src/views/project/summary.vue

@@ -504,7 +504,8 @@
                         show: true,
                         feature:{
                             saveAsImage:{
-                                show:true
+                                // show: false
+                                show: this.user.userNameNeedTranslate == 1 ? false : true
                             },
                             restore:{
                                 show:true

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -424,7 +424,7 @@
                         <div class="player">
                             <p @click="chan">{{ $t('participantin') }}</p>
                             <span  v-for="(pl, i) in critic" :key="i">
-                            <div class="bj" style="width: 14%">
+                            <div class="bj" style="width: 14%;">
                                 <span style="background: #778899" v-if="user.userNameNeedTranslate != '1'">{{pl.length > 2 ? pl.substring(pl.length - 2, pl.length) : pl}}</span>
                                 <span style="background: #778899" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='pl'></ww-open-data></span>
                             </div>
@@ -593,6 +593,7 @@
         text-align: center;
         color: #fff;
         background: #778899;
+        overflow: hidden;
     }
     div {
         text-align: left;