考勤明细
This commit is contained in:
parent
67656d982b
commit
49e79471da
|
|
@ -64,4 +64,22 @@ export function synchronous(data) {
|
|||
})
|
||||
}
|
||||
|
||||
// 查询外出次数查询列表
|
||||
export function getOutCountList(query) {
|
||||
return request({
|
||||
url: '/system/attDetails/getOutCountList',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询外出次数查询列表
|
||||
export function getAttCountList(query) {
|
||||
return request({
|
||||
url: '/system/attDetails/getAttCountList',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -76,6 +76,23 @@
|
|||
<span>{{ formatDate(scope.row.attCurrentDay) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工作时间外出次数" align="center" prop="normalNum" width="180">
|
||||
<template slot-scope="scope">
|
||||
<div
|
||||
@click="openOutCountList(scope.row)" style="color: #02a7f0; cursor: pointer">
|
||||
{{ scope.row.outCount}}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="打卡记录" align="center" prop="normalNum" >
|
||||
<template slot-scope="scope">
|
||||
<div
|
||||
@click="openAttCountList(scope.row)" style="color: #02a7f0; cursor: pointer">
|
||||
{{ scope.row.attCount}}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="上班打卡时间" align="center" prop="toWorkAttCurrentTime" width="180"></el-table-column>
|
||||
<el-table-column label="上班状态" align="center" prop="toWorkAttStatus">
|
||||
<template slot-scope="scope">
|
||||
|
|
@ -179,14 +196,81 @@
|
|||
</el-dialog>
|
||||
|
||||
|
||||
<!-- 外出次数查询 -->
|
||||
<el-dialog :title="title" :visible.sync="showOutCount" width="1200px" height="1000px" append-to-body >
|
||||
<el-form :model="queryRecord" ref="queryFormRecord" size="small" :inline="true" v-show="showSearch" label-width="110px">
|
||||
<el-form-item>
|
||||
<!-- <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>-->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-table v-loading="loadingTwo" :data="tableDataOutCount" width="900px" height = "600px" row-key="id">
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (queryRecord.pageNum - 1) * queryRecord.pageSize + scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="考勤日期" align="center" prop="attCurrentDay" width="180" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ formatDate(scope.row.attCurrentDay) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="打卡时间" align="center" prop="attCurrentTime" width="140" sortable/>
|
||||
<el-table-column label="打卡地址" align="center" prop="attAddress" sortable/>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="totalTwo>0"
|
||||
:total="totalTwo"
|
||||
:page.sync="queryRecord.pageNum"
|
||||
:limit.sync="queryRecord.pageSize"
|
||||
@pagination="getOutCountList"
|
||||
/>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
<!-- 打卡次数记录 -->
|
||||
<el-dialog :title="title" :visible.sync="showAttCount" width="1200px" height="1000px" append-to-body >
|
||||
<el-form :model="queryRecord" ref="queryFormRecord" size="small" :inline="true" v-show="showSearch" label-width="110px">
|
||||
<el-form-item>
|
||||
<!-- <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>-->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-table v-loading="loadingAttCount" :data="tableDataAttCount" width="900px" height = "600px" row-key="id">
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (queryRecord.pageNum - 1) * queryRecord.pageSize + scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="考勤日期" align="center" prop="attCurrentDay" width="180" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ formatDate(scope.row.attCurrentDay) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="打卡时间" align="center" prop="attCurrentTime" width="140" sortable/>
|
||||
<el-table-column label="打卡地址" align="center" prop="attAddress" sortable/>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="totalAttCount>0"
|
||||
:total="totalAttCount"
|
||||
:page.sync="queryAttCount.pageNum"
|
||||
:limit.sync="queryAttCount.pageSize"
|
||||
@pagination="getAttCountList"
|
||||
/>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getDetailsList,updateAttDetails,exportAttRecord,synchronous,listDept } from "@/api/report/attReport";
|
||||
import { getDetailsList,updateAttDetails,exportAttRecord,synchronous,listDept,getOutCountList,getAttCountList } from "@/api/report/attReport";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
import {checkPersonAssignment} from "@/api/system/userInfo";
|
||||
import {getDetail} from "@/api/report/monthlyError";
|
||||
export default {
|
||||
name: "Dict",
|
||||
dicts: ['att_status'],
|
||||
|
|
@ -224,6 +308,33 @@
|
|||
orgId: undefined,
|
||||
attStatus: undefined
|
||||
},
|
||||
queryRecord: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
userId: undefined,
|
||||
attCurrentDay: undefined,
|
||||
userName: undefined,
|
||||
},
|
||||
showOutCount:false,
|
||||
totalTwo: 0,
|
||||
// 遮罩层
|
||||
loadingTwo: false,
|
||||
tableDataOutCount: [],
|
||||
|
||||
|
||||
queryAttCount: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
userId: undefined,
|
||||
attCurrentDay: undefined,
|
||||
userName: undefined,
|
||||
},
|
||||
showAttCount:false,
|
||||
totalAttCount: 0,
|
||||
// 遮罩层
|
||||
loadingAttCount: false,
|
||||
tableDataAttCount: [],
|
||||
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -415,6 +526,45 @@
|
|||
})
|
||||
},
|
||||
|
||||
|
||||
//打开工作时间外出次数
|
||||
openOutCountList(row){
|
||||
this.title = "工作时间外出次数";
|
||||
this.queryRecord.userId = row.userId;
|
||||
this.queryRecord.attCurrentDay = row.attCurrentDay;
|
||||
this.showOutCount = true;
|
||||
this.getOutCountList();
|
||||
},
|
||||
|
||||
/** 查询工作时间外出次数列表 */
|
||||
getOutCountList() {
|
||||
this.loadingTwo = true;
|
||||
getOutCountList(this.queryRecord).then(response => {
|
||||
this.tableDataOutCount = response.rows;
|
||||
this.totalTwo = response.total;
|
||||
this.loadingTwo = false;
|
||||
});
|
||||
},
|
||||
|
||||
//打开打卡次数记录
|
||||
openAttCountList(row){
|
||||
this.title = "打卡记录(当天12:00至第二天凌晨05:00)";
|
||||
this.queryAttCount.userId = row.userId;
|
||||
this.queryAttCount.attCurrentDay = row.attCurrentDay;
|
||||
this.showAttCount = true;
|
||||
this.getAttCountList();
|
||||
},
|
||||
|
||||
/** 查询打卡次数记录列表 */
|
||||
getAttCountList() {
|
||||
this.loadingAttCount = true;
|
||||
getAttCountList(this.queryAttCount).then(response => {
|
||||
this.tableDataAttCount = response.rows;
|
||||
this.totalAttCount = response.total;
|
||||
this.loadingAttCount = false;
|
||||
});
|
||||
},
|
||||
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue