外出办事,改成临时外出

This commit is contained in:
lSun 2025-01-03 15:30:58 +08:00
parent 02ad2dda9b
commit 796db0b3b0
8 changed files with 43 additions and 42 deletions

View File

@ -2,7 +2,7 @@
<div class="content"> <div class="content">
<div class="content-box"> <div class="content-box">
<div class="title-box"> <div class="title-box">
<div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月轮休外出办事异常情况</div> <div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月轮休临时外出异常情况</div>
</div> </div>
<div class="list-box"> <div class="list-box">
<div class="listItem" style="background-color: #FFF7F1;" @click="toggleDialog(10)"> <div class="listItem" style="background-color: #FFF7F1;" @click="toggleDialog(10)">

View File

@ -56,7 +56,7 @@
<div v-else>{{ scope.row.errorRestCount}}</div> <div v-else>{{ scope.row.errorRestCount}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外出办事未审批条数" align="center" prop="errorOutCount" sortable> <el-table-column label="临时外出未审批条数" align="center" prop="errorOutCount" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.errorOutCount!=0" <div v-if="scope.row.errorOutCount!=0"
@click="openRecord(scope.row,title2)" style="color: #02a7f0; cursor: pointer"> @click="openRecord(scope.row,title2)" style="color: #02a7f0; cursor: pointer">
@ -211,7 +211,7 @@
// //
title: "", title: "",
title1: "轮休未审批记录", title1: "轮休未审批记录",
title2: "外出办事未审批记录", title2: "临时外出未审批记录",
titleExamine:'', titleExamine:'',
// //
open: false, open: false,
@ -405,7 +405,7 @@
this.queryRecord.attCurrentMonth = row.attCurrentMonth; this.queryRecord.attCurrentMonth = row.attCurrentMonth;
if(titleBoss=='轮休未审批记录'){ if(titleBoss=='轮休未审批记录'){
this.queryRecord.attStatis=1 this.queryRecord.attStatis=1
}else if(titleBoss=='外出办事未审批记录'){ }else if(titleBoss=='临时外出未审批记录'){
this.queryRecord.attStatis=2; this.queryRecord.attStatis=2;
} }
this.showRecord = true; this.showRecord = true;
@ -422,10 +422,10 @@
this.totalTwo = response.total; this.totalTwo = response.total;
this.loadingTwo = false; this.loadingTwo = false;
}); });
}else if(this.title=='外出办事未审批记录'){ }else if(this.title=='临时外出未审批记录'){
getDetailExceptionOut(this.addDateRange(this.queryRecord, this.dateRange)).then(response => { getDetailExceptionOut(this.addDateRange(this.queryRecord, this.dateRange)).then(response => {
this.tableDataRecord = response.rows; this.tableDataRecord = response.rows;
this.leaveType="外出办事" this.leaveType="临时外出"
this.totalTwo = response.total; this.totalTwo = response.total;
this.loadingTwo = false; this.loadingTwo = false;
}); });
@ -483,7 +483,7 @@
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
exportExceptionError(this.queryParams).then(res => { exportExceptionError(this.queryParams).then(res => {
downloadFile({ fileName: `轮休外出办事异常报表_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' }) downloadFile({ fileName: `轮休临时外出异常报表_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
}) })
}, },

View File

@ -319,7 +319,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
leaveType:"外出办事", leaveType:"临时外出",
leaveDate: undefined, leaveDate: undefined,
examineStatus: undefined examineStatus: undefined
}, },
@ -445,7 +445,7 @@ export default {
leaveEndDate: undefined, leaveEndDate: undefined,
leaveEndInterval:undefined, leaveEndInterval:undefined,
leaveDuration:undefined, leaveDuration:undefined,
leaveType:"外出办事", leaveType:"临时外出",
examineStatus:"0", examineStatus:"0",
isAgree: "0", isAgree: "0",
hostUserId:[], hostUserId:[],

View File

@ -273,7 +273,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
leaveType:"外出办事", leaveType:"临时外出",
userName: undefined, userName: undefined,
orgName: undefined, orgName: undefined,
}, },
@ -419,7 +419,7 @@ export default {
let param = { let param = {
id:this.form.id, id:this.form.id,
examineStatus:'1', examineStatus:'1',
leaveType:"外出办事", leaveType:"临时外出",
examineOpinion:this.form.examineOpinion, examineOpinion:this.form.examineOpinion,
orgName: name orgName: name
} }
@ -440,7 +440,7 @@ export default {
let param = { let param = {
id:this.form.id, id:this.form.id,
examineStatus:'2', examineStatus:'2',
leaveType:"外出办事", leaveType:"临时外出",
examineOpinion:this.form.examineOpinion, examineOpinion:this.form.examineOpinion,
orgName:name orgName:name
} }

View File

@ -476,7 +476,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
leaveType:"外出办事", leaveType:"临时外出",
leaveDate: undefined, leaveDate: undefined,
examineStatus: '' examineStatus: ''
}, },

View File

@ -49,7 +49,7 @@
</el-table-column> </el-table-column>
<el-table-column label="临时外出人数" align="center" width="180"> <el-table-column label="临时外出人数" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="clickable" @click="handleClick('外出办事',scope.row)" style="color: blue; cursor: pointer;"> <span class="clickable" @click="handleClick('临时外出',scope.row)" style="color: blue; cursor: pointer;">
{{ scope.row.outNum }} {{ scope.row.outNum }}
</span> </span>
</template> </template>
@ -123,7 +123,7 @@
<el-table-column label="开始时间" align="center" prop="startDate" width="160"/> <el-table-column label="开始时间" align="center" prop="startDate" width="160"/>
<el-table-column label="结束时间" align="center" prop="endDate" width="160"/> <el-table-column label="结束时间" align="center" prop="endDate" width="160"/>
<el-table-column label="时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true" width="100"/> <el-table-column label="时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '外出办事')"> <el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '临时外出')">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.examineStatus === '0'">待审核</span> <span v-if="scope.row.examineStatus === '0'">待审核</span>
<span v-else-if="scope.row.examineStatus === '1'">已通过</span> <span v-else-if="scope.row.examineStatus === '1'">已通过</span>
@ -586,7 +586,7 @@ export default {
this.open = true; this.open = true;
if (type==='轮休'){ if (type==='轮休'){
this.title = "轮休人员"; this.title = "轮休人员";
} else if (type==='外出办事'){ } else if (type==='临时外出'){
this.title = "临时外出人员"; this.title = "临时外出人员";
} else if (type==='出差报备'){ } else if (type==='出差报备'){
this.title = "出差人员"; this.title = "出差人员";

View File

@ -475,6 +475,7 @@ export default {
this.title = "工作时间外出次数"; this.title = "工作时间外出次数";
this.queryRecordOutCount.userId = row.userId; this.queryRecordOutCount.userId = row.userId;
this.queryRecordOutCount.attCurrentDay = row.attCurrentDay; this.queryRecordOutCount.attCurrentDay = row.attCurrentDay;
this.queryRecordOutCount.attCurrentMonth = row.attCurrentMonth;
this.showOutCount = true; this.showOutCount = true;
this.getOutCountList(); this.getOutCountList();
}, },

View File

@ -117,7 +117,7 @@
updateStatus(param).then(response => { updateStatus(param).then(response => {
if(row.type.indexOf('月异常考勤统计')>-1){//month if(row.type.indexOf('月异常考勤统计')>-1){//month
this.$router.replace({ path: '/attendanceReport/monthlyError',query:{param:value}}) this.$router.replace({ path: '/attendanceReport/monthlyError',query:{param:value}})
}else if(row.type.indexOf('月轮休外出办事异常统计')>-1){//month }else if(row.type.indexOf('月轮休临时外出异常统计')>-1){//month
this.$router.replace({ path: '/exceptionHandle/errorData',query:{param:value} }) this.$router.replace({ path: '/exceptionHandle/errorData',query:{param:value} })
}else if(row.type.indexOf('项目部角色未配置')>-1){// }else if(row.type.indexOf('项目部角色未配置')>-1){//
this.$router.replace({ path: '/process/pro/rolesRemind',query:{param:value}}) this.$router.replace({ path: '/process/pro/rolesRemind',query:{param:value}})