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

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -3,6 +3,7 @@
   "navigation": {
     "reports": "Hours report",
     "projectManagement": "project management",
+    "contractManagement": "contract management",
     "professionalAudit": "Professional audit",
     "departmentAudit": "Department audit",
     "projectReportReview": "Report review",

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -3,6 +3,7 @@
   "navigation": {
     "reports": "工时报告",
     "projectManagement": "项目管理",
+    "contractManagement": "合同管理",
     "professionalAudit": "专业审核",
     "departmentAudit": "部门审核",
     "projectReportReview": "项目报告审核",

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

@@ -212,7 +212,7 @@
               <!-- <span style="color: #606266">请假时间</span>
               <el-date-picker v-model="createDate" type="date" @change="chufas()" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" clearable="false"> </el-date-picker> -->
                 <span style="color: #606266">{{ $t('message.period') }}</span>
-                <el-date-picker v-model="createDate" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" @change="chufas()" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:210px"></el-date-picker>
+                <el-date-picker v-model="createDate" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" @change="chufas()" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:240px"></el-date-picker>
             </div>
             <div>
               <el-button type="primary" size="small" style="margin-left:20px" @click="exportLeave()">{{ $t('dao-chu-qing-jia-dan') }}</el-button>

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -112,25 +112,18 @@
                <el-time-picker
                style="width:160px;"
                     v-model="startTime"
-                    :picker-options="{
-                        start: '08:30',
-                        end: '18:30'
-                    }"
                     format="HH:mm"
-                    :placeholder="$t('pointintime')">
+                    :placeholder="$t('pointintime')"
+                    @change="timePicker(0)">
                 </el-time-picker>
             </el-form-item>
             <el-form-item :label="$t('time.endTime')">
                <el-time-picker
                style="width:160px;"
                             v-model="endTime"
-                            :picker-options="{
-                                start: '08:30',
-                                end: '18:30',
-                                minTime: startTime
-                            }"
                             format="HH:mm"
-                            :placeholder="$t('pointintime')">
+                            :placeholder="$t('pointintime')"
+                            @change="timePicker(1)">
                         </el-time-picker>
             </el-form-item>
             </el-form>
@@ -548,6 +541,18 @@
             this.getRestList()
         },
          methods: {
+            timePicker(e){
+                // console.log('timePicker',this.startTime,this.endTime);
+                if(this.startTime && this.endTime){
+                    if(this.startTime > this.endTime){
+                        if(e){
+                            this.startTime = this.endTime
+                        }else{
+                            this.endTime = this.startTime
+                        }
+                    }
+                }
+            },
             timeAlldayChange(){
                 if(this.timeType.maxReportTime < this.timeType.allday || this.timeType.lockWorktime){
                     this.timeType.maxReportTime = this.timeType.allday

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -485,7 +485,13 @@
 
         <el-dialog :title="$t('historicalpersonnelcost')" :visible.sync="userSalaryListDialog" width="550px" >
             <el-table :data="userSalaryList" highlight-current-row v-loading="listLoading" height="300px" style="width: 100%;">
-                <el-table-column prop="userName" :label="$t('lable.name')" ></el-table-column>
+                <el-table-column prop="userName" :label="$t('lable.name')" >
+                  <template slot-scope="scope">
+                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data></span>
+                    <span v-else>{{scope.row.userName}}</span>
+                  </template>
+                  
+                </el-table-column>
                 <el-table-column prop="indate" :label="$t('updatetime')" width="150px">
                 </el-table-column>
                 <el-table-column prop="salaryType" :label="$t('payway')" >
@@ -524,10 +530,11 @@
         <el-dialog :title="$t('permissiontotransfer')" :visible.sync="transferDialog" width="550px" >
             <el-form  label-width="200px">
                 <el-form-item :label="$t('administratorroleto')" >
-                    <el-select v-model="toUserId" style="width:300px" filterable clearable>
+                    <el-select v-model="toUserId" style="width:300px" filterable clearable v-if="user.userNameNeedTranslate != '1'">
                         <el-option v-for="item in allActiveUsers" :key="item.id" :value="item.id" :label="item.name">
                         </el-option>
                     </el-select>
+                    <selectCat :size="'medium'" :widthStr="'300'" v-if="user.userNameNeedTranslate == '1'" :subject="allActiveUsers" :subjectId="toUserId" :distinction="'12'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
                 <el-form-item :label="$t('transferoftheirrole')" >
                     <el-select v-model="myRoleId" style="width:300px">
@@ -3312,6 +3319,8 @@ export default {
         this.depForm.managerId = obj.id
       } else if(obj.distinction == '5'){
         this.depForm.reportAuditUserid = obj.id
+      } else if(obj.distinction == '12'){
+        this.toUserId = obj.id
       }
     }
   },