提交代码

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

@@ -422,10 +422,18 @@
                     </el-form-item>
                     <!--考勤时长显示-->
                     <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>
-                        </span>
+                        <template v-if="user.companyId != 7536">
+                            <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>
+                            </span>
+                        </template>
+                        <template v-if="user.companyId == 7536 && workForm.time">
+                            {{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>
+                        </template>
+
                         <!--批量填报不显示考勤记录-->
                         <span v-if="!isBatch && (user.timeType.syncDingding==1 || user.timeType.syncCorpwxTime==1)&&!workForm.time" >{{$t('other.noAttendanceRecord')}}</span>
                         <!--针对明夷，批量填报（不含代填）情况下显示考勤时长-->
@@ -442,6 +450,9 @@
                         <el-button type="default" style="margin-left:5px;" size="small" :loading="syncTimeLoading" 
                         v-if="!isBatch && user.companyId === 5978" icon="el-icon-refresh" 
                                 @click="refreshBeiSengAttendance(workForm.createDate)"></el-button>
+                        <el-button type="default" style="margin-left:5px;" size="small" :loading="syncTimeLoading" 
+                        v-if="!isBatch && user.companyId === 7536" icon="el-icon-refresh" 
+                                @click="refreshBeiSengAttendanceTwo(workForm.createDate)"></el-button>
                         
                         <span v-if="user.companyId==5978" style="margin-left:5px;" class="themeFontColor"><i class="el-icon-warning"></i>{{$t('other.kaoqingTimeTip')}}</span>
                     </el-form-item>
@@ -3355,6 +3366,31 @@
                     })
                 })
             },
+            refreshBeiSengAttendanceTwo(workdate) {
+                if (!workdate) return;
+                this.syncTimeLoading = true;
+                this.http.post('/user-fv-time/syncHongHuFvTime',{
+                    startDate: workdate,
+                    endDate: workdate,
+                    userId: this.user.id
+                },res => {
+                    this.syncTimeLoading = false;
+                    if(res.code == 'ok'){
+                        this.workForm.time = res.data;
+                    }else {
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        })
+                    }
+                },err => {
+                    this.syncTimeLoading = false;
+                    this.$message({
+                        message: err,
+                        type: 'error'
+                    })
+                })
+            },
             weeklyFilledTimeClick(parameterDate){ //按周填报-已填工时-点击
                 this.weeklyFilledTimeDialog = true
                 this.weeklyFilledTimeLoading = true

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -30,23 +30,43 @@
                         <div class="attendanceRecord">
                             <template v-if="user.timeType.syncDingding == 1 || user.timeType.syncCorpwxTime == 1">
                                 <span>打卡:</span>
-                                <span v-if="!report.time">暂无考勤记录</span>
-                                <span v-else>{{ report.time.startTime }}-{{ report.time.endTime }}, 工作{{
-                                    report.time.workHours }}h
-                                    <span v-if="report.time.askLeaveTime">|&nbsp;请假{{ report.time.askLeaveTime
-                                    }}h</span>
-                                    <span v-if="report.time.otTime" style="color:#DAA520;">|&nbsp;加班{{ report.time.otTime
-                                    }}h</span></span>
+                                <template v-if="user.companyId != 7536">
+                                    <span v-if="!report.time">暂无考勤记录</span>
+                                    <span v-else>{{ report.time.startTime }}-{{ report.time.endTime }}, 工作{{
+                                        report.time.workHours }}h
+                                        <span v-if="report.time.askLeaveTime">|&nbsp;请假{{ report.time.askLeaveTime
+                                        }}h</span>
+                                        <span v-if="report.time.otTime" style="color:#DAA520;">|&nbsp;加班{{ report.time.otTime
+                                        }}h</span></span>
+                                </template>
+
+                                <template v-if="user.companyId == 7536">
+                                    <span v-if="!report.time">暂无考勤记录</span>
+                                    <span v-else>工作{{
+                                        report.time.workHours }}h
+                                        <span v-if="report.time.askLeaveTime">|&nbsp;请假{{ report.time.askLeaveTime
+                                        }}h</span>
+                                        <span v-if="report.time.otTime" style="color:#DAA520;">|&nbsp;加班{{ report.time.otTime
+                                        }}h</span></span>
+                                </template>
                             </template>
                             <span style="margin-left:5px">总填报：</span>
                             <span>{{ totalReportHours }}h</span>
                         </div>
                     </template>
                     <template #right-icon>
-                        <van-button icon="replay" native-type="button" type="default" size="mini"
+                        <template v-if="user.companyId != 7536">
+                            <van-button icon="replay" native-type="button" type="default" size="mini"
                             style="height:0.6rem;padding:0 0.16667rem;" :loading="cardRefLoading" loading-size="0.26667rem"
                             @click.stop.native="cardtimeRefresh(form.createDate)"
                             v-if="!substitute && user.timeType.syncCorpwxTime == 1 && (user.timeType.syncDingding == 1 || user.timeType.syncCorpwxTime == 1)"></van-button>
+                        </template>
+                        <template v-if="user.companyId == 7536">
+                            <van-button icon="replay" native-type="button" type="default" size="mini"
+                                style="height:0.6rem;padding:0 0.16667rem;" :loading="cardRefLoading" loading-size="0.26667rem"
+                                @click.stop.native="cardtimeRefreshTwo(form.createDate)"
+                            ></van-button>
+                        </template>
                     </template>
                 </van-cell>
                 <!-- <div v-if="report.time" class="attendanceRecord">
@@ -972,6 +992,24 @@ export default {
                     }
                 }).catch(err => { this.$toast.clear(); this.cardRefLoading = false; })
         },
+        cardtimeRefreshTwo(workdate) {  // 考勤记录刷新
+            if (!workdate) return;
+            this.cardRefLoading = true;
+            this.$axios.post('/user-fv-time/syncHongHuFvTime', {
+                startDate: workdate,
+                endDate: workdate,
+                userId: this.user.id
+            })
+                .then(res => {
+                    if (res.code == 'ok') {
+                        this.cardRefLoading = false;
+                        this.report.time = res.data.time;
+                    } else {
+                        this.cardRefLoading = false;
+                        this.$toast.fail('获取失败:' + res.msg);
+                    }
+                }).catch(err => { this.$toast.clear(); this.cardRefLoading = false; })
+        },
         auditorClick(domainIndex, auditorIndex) {
             if (this.canEdit) {
                 this.auditor.index = domainIndex