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

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1441,7 +1441,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             }
             IPage<Project> projectIPage;
-            LocalDateTime d1 = LocalDateTime.now();
             if(pageIndex!=null && pageSize!=null){
                 projectIPage= projectMapper.selectPage(new Page<>(pageIndex, pageSize),
                         queryWrapper);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -887,7 +887,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     UserFvTime time = userFvTimeList.get(0);
                     resultMap.put("time", time);
                 }
-                showRefresh = true;
+                //针对泓浒，前端不显示考勤时间
+                if (companyId != 7536) {
+                    showRefresh = true;
+                }
             } else if (timeType.getShowCorpwxCardtime() == 1) {
                 User user = userMapper.selectById(userId);
                 List<UserCorpwxTime> corpwxTimes = null;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1418,7 +1418,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         User user = new User()
                                 .setId(id.toString())
                                 .setName(name)
-                                .setPassword(MD5Util.getPassword("000000"))
+                                .setPassword(MD5Util.getPassword(creator.getCompanyId() == 7536? "uFw$9&!2L^bCx" : "000000"))
                                 .setPhone(phone)
                                 .setOnlyAuditOnce(onlyAuditOnce)
                                 .setRoleId(roleId)
@@ -1870,7 +1870,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 userList.add(new User()
                         .setId(id.toString())
                         .setName(name)
-                        .setPassword(MD5Util.getPassword("000000"))
+                        .setPassword(MD5Util.getPassword(companyId == 7536?"uFw$9&!2L^bCx":"000000"))
                         .setPhone(phone)
                         .setRoleId(defaultRole.getId())
                         .setRoleName(defaultRole.getRolename())

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/MD5Util.java

@@ -22,7 +22,7 @@ public class MD5Util {
     }
 
     public static void main(String[] args) throws ParseException {
-        System.out.println(getPassword("Dy890606@1"));
+        System.out.println(getPassword("uFw$9&!2L^bCx"));
 
     }
 

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

@@ -432,7 +432,7 @@
             <el-pagination :key="projectListPageComponentKey"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :page-sizes="[20 , 50 , 80 , 100]"
+                :page-sizes="[20 , 50 , 80 , 100,500]"
                 :page-size="size"
                 :current-page.sync="page"
                 layout="total, sizes, prev, pager, next"
@@ -1382,8 +1382,8 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button  @click="addGroupPersonDialog = false" >{{ $t('btn.cancel') }}</el-button>
-                <el-button type="primary" @click="addGroupPersonSure()" v-if="isAddGroupPerson">{{ $t('btn.determine') }}</el-button>
-                <el-button type="primary" @click="addProPersonSure()" v-else>{{ $t('btn.determine') }}</el-button>
+                <el-button type="primary" @click="addGroupPersonSure()" v-if="isAddGroupPerson" :loading="addingPerson">{{ $t('btn.determine') }}</el-button>
+                <el-button type="primary" @click="addProPersonSure()" v-else :loading="addingPerson">{{ $t('btn.determine') }}</el-button>
             </div>
 
             <el-dialog append-to-body :title="$t('screening.selectPeople')" v-if="addGroupPersonPdialog" :visible.sync="addGroupPersonPdialog" width="40%" top="6.5vh">
@@ -1821,6 +1821,7 @@ a {
         },
         data() {
             return {
+                addingPerson: false,
                 attemptFields: localStorage.getItem('attemptFields'),
                 importTaskDialog: false,
                 manDaySetting:{},
@@ -3162,13 +3163,14 @@ a {
                 for(let i=0;i<this.addGroupPersonData.group.length;i++){
                     groupList = [...groupList,...this.addGroupPersonData.group[i]]
                 }
+                this.addingPerson = true;
                 this.http.post('/project/batchAddMembToGroup',{
                     membIdArray: JSON.stringify(this.addGroupPersonData.person),
                     groupIds: JSON.stringify(groupList)
                 },res => {
                     if(res.code == 'ok'){
                         this.addGroupPersonDialog = false,
-                        
+                        this.addingPerson = false;
                         this.batchSetWudulistBtn1()
                         this.$message({
                             message: this.$t('addsuccessful'),
@@ -3296,12 +3298,14 @@ a {
                     // proArr += this.checkedProjectArr[i].id + ','
                 }
                 // proArr = proArr.substring(0,proArr.length - 1)
+                this.addingPerson = true;
                 this.http.post('/project/batchSetParticipation',{
                     userIds: JSON.stringify(this.addGroupPersonData.person),
                     projectIdArray: JSON.stringify(proArr),
                     deptIds: JSON.stringify(this.batchDepartment)
                 },res => {
                     if(res.code == 'ok'){
+                        this.addingPerson = false;
                         this.addGroupPersonDialog = false,
                         
                         this.batchSetWudulistBtn1()

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -421,7 +421,7 @@
                         <el-button type="primary" @click="getAIReport()" v-if="!hasWrittenReport" style="margin-left:5px;" >{{ $t('zhiNengTianBao') }}</el-button>
                     </el-form-item>
                     <!--考勤时长显示-->
-                    <el-form-item :label="$t('other.attendancePunch')" v-if="workForm.showRefresh || user.companyId == 5978">
+                    <el-form-item :label="$t('other.attendancePunch')" v-if="workForm.showRefresh">
                         <span v-if="workForm.time">{{workForm.time.startTime}}-{{workForm.time.endTime}}, {{workForm.time.isOffiBusiness?'出差':'工作'}}{{workForm.time.workHours}}{{$t('time.hour')}}
                         <span v-if="workForm.time.askLeaveTime">|&nbsp;{{ $t('other.AskForLeave') }}{{ workForm.time.askLeaveTime }}{{$t('time.hour')}}</span>
                         <span v-if="workForm.time.otTime" style="color:#FFA500;">|&nbsp;加班{{ workForm.time.otTime }}{{$t('time.hour')}}</span>