人员信息,考勤明细
This commit is contained in:
parent
c45c60d720
commit
45d532f14f
|
|
@ -25,7 +25,7 @@
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-right: 10px;"
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-right: 10px;"
|
||||||
>搜索
|
>搜索
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
||||||
>重置
|
>重置
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
|
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
|
||||||
|
|
@ -56,20 +56,20 @@
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="typeList" border resizable @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center"/>
|
<el-table-column type="selection" width="55" align="center"/>
|
||||||
<el-table-column label="序号" align="center" width="80" type="index">
|
<el-table-column label="序号" align="center" width="80" type="index" fixed>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="姓名" align="center" prop="userName"/>
|
<el-table-column label="姓名" align="center" prop="userName" fixed />
|
||||||
<el-table-column label="所属部门" align="center" prop="orgName" :show-overflow-tooltip="true"/>
|
|
||||||
<el-table-column label="考勤日期" align="center" prop="attCurrentDay" width="180" :show-overflow-tooltip="true">
|
<el-table-column label="考勤日期" align="center" prop="attCurrentDay" width="180" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ formatDate(scope.row.attCurrentDay) }}</span>
|
<span>{{ formatDate(scope.row.attCurrentDay) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="所属部门" align="center" width="500" prop="orgName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="工作时间外出次数" align="center" prop="normalNum" width="180">
|
<el-table-column label="工作时间外出次数" align="center" prop="normalNum" width="180">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div @click="openOutCountList(scope.row)" style="color: #02a7f0; cursor: pointer">
|
<div @click="openOutCountList(scope.row)" style="color: #02a7f0; cursor: pointer">
|
||||||
|
|
@ -91,7 +91,7 @@
|
||||||
<dict-tag :options="dict.type.att_status" :value="scope.row.toWorkAttStatus"/>
|
<dict-tag :options="dict.type.att_status" :value="scope.row.toWorkAttStatus"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="打卡地址" align="center" prop="toWorkAttAddress" :show-overflow-tooltip="true"/>
|
<el-table-column label="打卡地址" align="center" prop="toWorkAttAddress" width="500" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="异常备注" align="center" prop="toWorkErrorRemake" :show-overflow-tooltip="true"/>
|
<el-table-column label="异常备注" align="center" prop="toWorkErrorRemake" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="下班打卡时间" align="center" prop="offWorkAttCurrentTime" width="180"></el-table-column>
|
<el-table-column label="下班打卡时间" align="center" prop="offWorkAttCurrentTime" width="180"></el-table-column>
|
||||||
<el-table-column label="下班状态" align="center" prop="offWorkAttStatus">
|
<el-table-column label="下班状态" align="center" prop="offWorkAttStatus">
|
||||||
|
|
@ -99,7 +99,7 @@
|
||||||
<dict-tag :options="dict.type.att_status" :value="scope.row.offWorkAttStatus"/>
|
<dict-tag :options="dict.type.att_status" :value="scope.row.offWorkAttStatus"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="打卡地址" align="center" prop="offWorkAttAddress" :show-overflow-tooltip="true"/>
|
<el-table-column label="打卡地址" align="center" prop="offWorkAttAddress" width="500" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="异常备注" align="center" prop="offWorkErrorRemake" :show-overflow-tooltip="true"/>
|
<el-table-column label="异常备注" align="center" prop="offWorkErrorRemake" :show-overflow-tooltip="true"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
|
|
@ -107,11 +107,11 @@
|
||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<el-dialog title="批量修改" :visible.sync="open" width="1200px" append-to-body @close="cancel">
|
<el-dialog title="批量修改" :visible.sync="open" width="1200px" border resizable append-to-body @close="cancel">
|
||||||
<el-table v-loading="loading" :data="dialogList" width="100%" height="500px">
|
<el-table v-loading="loading" :data="dialogList" width="100%" height="500px">
|
||||||
<el-table-column label="序号" type="index" width="55" align="center" fixed/>
|
<el-table-column label="序号" type="index" width="55" align="center" fixed/>
|
||||||
<el-table-column label="姓名" align="center" prop="userName" fixed/>
|
<el-table-column label="姓名" align="center" prop="userName" fixed/>
|
||||||
<el-table-column label="所属部门" align="center" prop="orgName" :show-overflow-tooltip="true" width="150"
|
<el-table-column label="所属部门" align="center" prop="orgName" :show-overflow-tooltip="true" width="500"
|
||||||
fixed
|
fixed
|
||||||
/>
|
/>
|
||||||
<el-table-column label="考勤日期" align="center" prop="attCurrentDay" :show-overflow-tooltip="true" width="180"
|
<el-table-column label="考勤日期" align="center" prop="attCurrentDay" :show-overflow-tooltip="true" width="180"
|
||||||
|
|
@ -168,7 +168,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column label="打卡地址" align="center" prop="toWorkAttAddress" :show-overflow-tooltip="true"
|
<el-table-column label="打卡地址" align="center" prop="toWorkAttAddress" :show-overflow-tooltip="true"
|
||||||
width="180"
|
width="500"
|
||||||
/>
|
/>
|
||||||
<el-table-column align="center" prop="toErrorRemake" width="200">
|
<el-table-column align="center" prop="toErrorRemake" width="200">
|
||||||
<template slot="header">
|
<template slot="header">
|
||||||
|
|
@ -203,7 +203,7 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="打卡地址" align="center" prop="offWorkAttAddress" :show-overflow-tooltip="true"
|
<el-table-column label="打卡地址" align="center" prop="offWorkAttAddress" :show-overflow-tooltip="true"
|
||||||
width="180"
|
width="500"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
|
|
||||||
<el-table-column align="center" prop="offFilePath" width="180">
|
<el-table-column align="center" prop="offFilePath" width="180">
|
||||||
|
|
@ -242,7 +242,7 @@
|
||||||
|
|
||||||
|
|
||||||
<!-- 外出次数查询 -->
|
<!-- 外出次数查询 -->
|
||||||
<el-dialog :title="title" :visible.sync="showOutCount" width="1200px" height="1000px" append-to-body>
|
<el-dialog :title="title" :visible.sync="showOutCount" border resizable width="1200px" height="1000px" append-to-body>
|
||||||
<el-form :model="queryRecord" ref="queryFormRecord" size="small" :inline="true" v-show="showSearch"
|
<el-form :model="queryRecord" ref="queryFormRecord" size="small" :inline="true" v-show="showSearch"
|
||||||
label-width="110px"
|
label-width="110px"
|
||||||
>
|
>
|
||||||
|
|
@ -264,7 +264,7 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="打卡时间" align="center" prop="attCurrentTime" sortable :show-overflow-tooltip="true"/>
|
<el-table-column label="打卡时间" align="center" prop="attCurrentTime" sortable :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="打卡地址" align="center" prop="attAddress" sortable :show-overflow-tooltip="true"/>
|
<el-table-column label="打卡地址" align="center" prop="attAddress" width="500" sortable :show-overflow-tooltip="true"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination v-show="totalTwo > 0" :total="totalTwo" :page.sync="queryRecord.pageNum"
|
<pagination v-show="totalTwo > 0" :total="totalTwo" :page.sync="queryRecord.pageNum"
|
||||||
|
|
@ -283,7 +283,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-table v-loading="loadingAttCount" :data="tableDataAttCount" width="900px" height="600px" row-key="id">
|
<el-table v-loading="loadingAttCount" :data="tableDataAttCount" border resizable width="900px" height="600px" row-key="id">
|
||||||
<el-table-column label="序号" align="center" width="80" type="index">
|
<el-table-column label="序号" align="center" width="80" type="index">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ (queryAttCount.pageNum - 1) * queryAttCount.pageSize + scope.$index + 1 }}</span>
|
<span>{{ (queryAttCount.pageNum - 1) * queryAttCount.pageSize + scope.$index + 1 }}</span>
|
||||||
|
|
@ -295,7 +295,7 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="打卡时间" align="center" prop="attCurrentTime" sortable :show-overflow-tooltip="true"/>
|
<el-table-column label="打卡时间" align="center" prop="attCurrentTime" sortable :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="打卡地址" align="center" prop="attAddress" sortable :show-overflow-tooltip="true"/>
|
<el-table-column label="打卡地址" align="center" prop="attAddress" width="500" sortable :show-overflow-tooltip="true"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination v-show="totalAttCount > 0" :total="totalAttCount" :page.sync="queryAttCount.pageNum"
|
<pagination v-show="totalAttCount > 0" :total="totalAttCount" :page.sync="queryAttCount.pageNum"
|
||||||
|
|
@ -751,7 +751,7 @@ export default {
|
||||||
isErrorMsg = '上班时间或状态改变时,原因说明、附件不能为空!';
|
isErrorMsg = '上班时间或状态改变时,原因说明、附件不能为空!';
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(newItem.toErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '1')){
|
if(newItem.toErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '1')){
|
||||||
hasChanges = true
|
hasChanges = true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,19 @@
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="手机号" prop="phone">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.phone"
|
||||||
|
placeholder="请输入手机号"
|
||||||
|
clearable
|
||||||
|
maxlength="11"
|
||||||
|
style="width: 240px"
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
|
||||||
<el-form-item label="部门名称" prop="orgId">
|
<el-form-item label="部门名称" prop="orgId">
|
||||||
<treeselect v-model="queryParams.orgId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" style="width: 240px"/>
|
<treeselect v-model="queryParams.orgId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" style="width: 240px"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
@ -118,7 +131,7 @@
|
||||||
@click="handleExamine(scope.row)"
|
@click="handleExamine(scope.row)"
|
||||||
>审核</el-button>
|
>审核</el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
@ -319,6 +332,7 @@
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
userName: undefined,
|
userName: undefined,
|
||||||
|
phone: undefined,
|
||||||
orgId: undefined,
|
orgId: undefined,
|
||||||
postId: undefined,
|
postId: undefined,
|
||||||
isAttend: undefined,
|
isAttend: undefined,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue