|
@@ -1785,6 +1785,9 @@
|
|
</el-input>
|
|
</el-input>
|
|
<selectCat v-if="user.userNameNeedTranslate == '1'" :filterable="true" :searchBoxTop="'1'" :size="'small'" :subject="usersList" :subjectId="usersListId" :distinction="'15'" :clearable="true" @selectCal="selectCal"></selectCat>
|
|
<selectCat v-if="user.userNameNeedTranslate == '1'" :filterable="true" :searchBoxTop="'1'" :size="'small'" :subject="usersList" :subjectId="usersListId" :distinction="'15'" :clearable="true" @selectCal="selectCal"></selectCat>
|
|
<div style="float: right; vertical-align: middle;height:32px">
|
|
<div style="float: right; vertical-align: middle;height:32px">
|
|
|
|
+ <el-link v-if="user.companyId==7536" style="margin-right: 14px"
|
|
|
|
+ type="primary" v-loading="refreshAttendanceLoading"
|
|
|
|
+ @click="refreshAttendanceCli()" >刷新考勤</el-link>
|
|
<el-link
|
|
<el-link
|
|
type="primary" v-loading="remindering"
|
|
type="primary" v-loading="remindering"
|
|
@click="batchRejectAndRemind()" >一键驳回并提醒</el-link>
|
|
@click="batchRejectAndRemind()" >一键驳回并提醒</el-link>
|
|
@@ -2682,6 +2685,7 @@
|
|
transferWorkingHoursVisable: false,
|
|
transferWorkingHoursVisable: false,
|
|
multiOptionData:[],
|
|
multiOptionData:[],
|
|
businessTripsArray: [],
|
|
businessTripsArray: [],
|
|
|
|
+ refreshAttendanceLoading: false
|
|
};
|
|
};
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
@@ -2766,6 +2770,39 @@
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
...mapMutations(['upDataLoading']),
|
|
...mapMutations(['upDataLoading']),
|
|
|
|
+ // 刷新考勤
|
|
|
|
+ refreshAttendanceCli() {
|
|
|
|
+ const firstDay = this.dayjs(this.date, 'YYYY-MM').startOf('month');
|
|
|
|
+ const lastDay = this.dayjs(this.date, 'YYYY-MM').endOf('month');
|
|
|
|
+ const formData = {
|
|
|
|
+ startDate: firstDay.format('YYYY-MM-DD'),
|
|
|
|
+ endDate: lastDay.format('YYYY-MM-DD')
|
|
|
|
+ }
|
|
|
|
+ this.refreshAttendanceLoading = true;
|
|
|
|
+ this.http.post('/user-fv-time/syncHongHuFvTime',{
|
|
|
|
+ ...formData
|
|
|
|
+ },res => {
|
|
|
|
+ this.refreshAttendanceLoading = false;
|
|
|
|
+ if(res.code == 'ok'){
|
|
|
|
+ this.$message({
|
|
|
|
+ message: `刷新成功!`,
|
|
|
|
+ type: 'success'
|
|
|
|
+ })
|
|
|
|
+ this.showReportTimeLessThanCardTimeList()
|
|
|
|
+ }else {
|
|
|
|
+ this.$message({
|
|
|
|
+ message: res.msg,
|
|
|
|
+ type: 'error'
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ },err => {
|
|
|
|
+ this.refreshAttendanceLoading = false;
|
|
|
|
+ this.$message({
|
|
|
|
+ message: err,
|
|
|
|
+ type: 'error'
|
|
|
|
+ })
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 已填工时情况表设置背景色
|
|
// 已填工时情况表设置背景色
|
|
hasworkTblCellStyle({ columnIndex, row, column }) {
|
|
hasworkTblCellStyle({ columnIndex, row, column }) {
|
|
if(columnIndex > 2) {
|
|
if(columnIndex > 2) {
|
|
@@ -2820,9 +2857,9 @@
|
|
this.http.post(
|
|
this.http.post(
|
|
"/report/getReportTimeLessThanCardTimeList",
|
|
"/report/getReportTimeLessThanCardTimeList",
|
|
{
|
|
{
|
|
- date: this.notfullSelectDateMonth,
|
|
|
|
- deptId: this.deptIdForHasReport.length>0?this.deptIdForHasReport[this.deptIdForHasReport.length-1]:null,
|
|
|
|
- userId: this.usersListId
|
|
|
|
|
|
+ date: this.notfullSelectDateMonth,
|
|
|
|
+ deptId: this.deptIdForHasReport.length>0?this.deptIdForHasReport[this.deptIdForHasReport.length-1]:null,
|
|
|
|
+ userId: this.usersListId,
|
|
},
|
|
},
|
|
(res) => {
|
|
(res) => {
|
|
if (res.code == "ok") {
|
|
if (res.code == "ok") {
|