update code
parent
f43818ff7d
commit
03ee180175
|
|
@ -1,47 +1,21 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
ref="queryForm"
|
||||
size="small"
|
||||
:inline="true"
|
||||
v-show="showSearch"
|
||||
label-width="82px"
|
||||
>
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="82px">
|
||||
<el-form-item label="项目名称" prop="projectId">
|
||||
<el-select
|
||||
:disabled="prjDisabled"
|
||||
v-model="queryParams.projectId"
|
||||
placeholder="请选择项目"
|
||||
clearable
|
||||
@change="doQuerySub()"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in projectOptions"
|
||||
:key="index"
|
||||
:label="item.projectName"
|
||||
:value="item.id"
|
||||
>
|
||||
<el-select :disabled="prjDisabled" v-model="queryParams.projectId" placeholder="请选择项目" clearable
|
||||
@change="doQuerySub()">
|
||||
<el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="总包单位" prop="deptId">
|
||||
<el-select v-model="queryParams.deptId" placeholder="请选择总包单位" clearable>
|
||||
<el-option
|
||||
v-for="(item, index) in depts"
|
||||
:key="index"
|
||||
:label="item.deptName"
|
||||
:value="item.deptId"
|
||||
>
|
||||
<el-option v-for="(item, index) in depts" :key="index" :label="item.deptName" :value="item.deptId">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="分包商类型" prop="companyTypeId">
|
||||
<el-select
|
||||
v-model="queryParams.companyTypeId"
|
||||
placeholder="请选择分包商类型"
|
||||
clearable
|
||||
>
|
||||
<el-select v-model="queryParams.companyTypeId" placeholder="请选择分包商类型" clearable>
|
||||
<el-option value="0" label="所有"></el-option>
|
||||
<el-option value="101" label="总包人员"></el-option>
|
||||
<el-option value="102" label="监理人员"></el-option>
|
||||
|
|
@ -49,113 +23,60 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="日期" prop="createBy">
|
||||
<el-date-picker
|
||||
v-model="queryParams.attendanceTime"
|
||||
:picker-options="disableTime"
|
||||
type="date"
|
||||
placeholder="选择日期"
|
||||
>
|
||||
<el-date-picker v-model="queryParams.attendanceTime" :picker-options="disableTime" type="date"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
-
|
||||
<el-date-picker
|
||||
v-model="queryParams.attendanceOutTime"
|
||||
:picker-options="disableTime"
|
||||
type="date"
|
||||
placeholder="选择日期"
|
||||
>
|
||||
<el-date-picker v-model="queryParams.attendanceOutTime" :picker-options="disableTime" type="date"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="姓名" prop="workerName">
|
||||
<el-input v-model="queryParams.workerName" placeholder="请输入姓名"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
|
||||
>搜索</el-button
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-setting"
|
||||
size="mini"
|
||||
@click="handleSetting"
|
||||
v-if="!prjDisabled"
|
||||
v-hasPermi="['project:attendanceConfig:edit']"
|
||||
>设置</el-button
|
||||
>
|
||||
<el-button type="warning" plain icon="el-icon-setting" size="mini" @click="handleSetting" v-if="!prjDisabled"
|
||||
v-hasPermi="['project:attendanceConfig:edit']">设置</el-button>
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||
v-hasPermi="['project:attendance:export']">导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8" v-if="1 == 2">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['project:attendance:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['project:attendance:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['project:attendance:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['project:attendance:edit']">修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['project:attendance:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['project:attendance:remove']">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['project:attendance:export']"
|
||||
>导出</el-button
|
||||
>
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||
v-hasPermi="['project:attendance:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="attendanceList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table v-loading="loading" :data="attendanceList" @selection-change="handleSelectionChange">
|
||||
<el-table-column label="照片" align="center" prop="id">
|
||||
<template slot-scope="{ row }">
|
||||
<el-image
|
||||
:src="row.scanPhoto || row.workerPhoto"
|
||||
:preview-src-list="[row.scanPhoto || row.workerPhoto]"
|
||||
style="height: 60px"
|
||||
/>
|
||||
<el-image :src="row.scanPhoto || row.workerPhoto" :preview-src-list="[row.scanPhoto || row.workerPhoto]"
|
||||
style="height: 60px" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="姓名" align="center" prop="workerName" />
|
||||
<el-table-column label="籍贯" align="center" prop="nativePlace" />
|
||||
<el-table-column label="性别" align="center" prop="attendanceType">
|
||||
<template slot-scope="{ row }">{{
|
||||
row.workerGender == 1 ? "女" : "男"
|
||||
}}</template>
|
||||
row.workerGender == 1 ? "女" : "男"
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="进场时间" align="center" prop="inTime" width="96">
|
||||
<template slot-scope="{ row }">
|
||||
|
|
@ -177,65 +98,31 @@
|
|||
<el-table-column label="所属班组" align="center" prop="groupName" />
|
||||
<el-table-column label="工种" align="center" prop="workTypeName" />
|
||||
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
v-if="1 == 2"
|
||||
>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="1 == 2">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['project:attendance:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['project:attendance:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['project:attendance:edit']">修改</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['project:attendance:remove']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
|
||||
<!-- 添加或修改劳务实名制管理对话框 -->
|
||||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
width="500px"
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
>
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false"
|
||||
:close-on-press-escape="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="厂商编号参考字典attendance_vendors" prop="vendorsCode">
|
||||
<el-input
|
||||
v-model="form.vendorsCode"
|
||||
placeholder="请输入厂商编号参考字典attendance_vendors"
|
||||
/>
|
||||
<el-input v-model="form.vendorsCode" placeholder="请输入厂商编号参考字典attendance_vendors" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工人Id" prop="workerId">
|
||||
<el-input v-model="form.workerId" placeholder="请输入工人Id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="考勤时间yyyy-MM-dd HH:mm:ss" prop="attendanceTime">
|
||||
<el-input
|
||||
v-model="form.attendanceTime"
|
||||
placeholder="请输入考勤时间yyyy-MM-dd HH:mm:ss"
|
||||
/>
|
||||
<el-input v-model="form.attendanceTime" placeholder="请输入考勤时间yyyy-MM-dd HH:mm:ss" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备编号" prop="deviceCode">
|
||||
<el-input v-model="form.deviceCode" placeholder="请输入设备编号" />
|
||||
|
|
@ -542,7 +429,7 @@ export default {
|
|||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
.catch(() => { });
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@
|
|||
<el-form-item style="position: absolute;right:0px;">
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||
v-hasPermi="['project:attendanceWorker:export']">导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
|
|
|||
|
|
@ -144,17 +144,17 @@ public class SurProjectAttendanceData extends BaseEntity
|
|||
this.attendanceOutTime = attendanceOutTime;
|
||||
}
|
||||
|
||||
@Excel(name = "项目ID")
|
||||
|
||||
private Long projectId;
|
||||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
@Excel(name = "部门ID")
|
||||
|
||||
private Long deptId;
|
||||
@Excel(name = "部门名称")
|
||||
private String deptName;
|
||||
@Excel(name = "姓名")
|
||||
private String workerName;
|
||||
@Excel(name = "照片")
|
||||
|
||||
private String workerPhoto;
|
||||
@Excel(name = "性别0:男 1:女")
|
||||
private Long workerGender;
|
||||
|
|
@ -174,68 +174,58 @@ public class SurProjectAttendanceData extends BaseEntity
|
|||
@Excel(name = "是否特殊工种")
|
||||
private Integer specWorkType;
|
||||
@Excel(name = "分包商类型")
|
||||
|
||||
private String companyTypeId;
|
||||
@Excel(name = "分包商名称")
|
||||
private String companyName;
|
||||
@Excel(name = "考勤时间(离开)yyyy-MM-dd HH:mm:ss")
|
||||
private String attendanceOutTime;
|
||||
/** */
|
||||
private Long id;
|
||||
|
||||
/** 配置项ID,可以获取项目ID和总包ID */
|
||||
@Excel(name = "配置项ID,可以获取项目ID和总包ID")
|
||||
private Long cfgid;
|
||||
|
||||
/** 注册应用ID */
|
||||
@Excel(name = "注册应用ID")
|
||||
private String appId;
|
||||
|
||||
/** 厂商编号参考字典attendance_vendors */
|
||||
@Excel(name = "厂商编号参考字典attendance_vendors")
|
||||
private String vendorsCode;
|
||||
|
||||
/** 服务端ID */
|
||||
@Excel(name = "服务端ID")
|
||||
private String serverid;
|
||||
|
||||
/** 工人Id */
|
||||
@Excel(name = "工人Id")
|
||||
private String workerId;
|
||||
|
||||
/** 考勤时间yyyy-MM-dd HH:mm:ss */
|
||||
@Excel(name = "考勤时间yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "考勤时间(进场)")
|
||||
private String attendanceTime;
|
||||
|
||||
@Excel(name = "考勤时间(离开)")
|
||||
private String attendanceOutTime;
|
||||
/** 身份证号 */
|
||||
@Excel(name = "身份证号")
|
||||
private String identification;
|
||||
|
||||
/** */
|
||||
private Long id;
|
||||
|
||||
/** 配置项ID,可以获取项目ID和总包ID */
|
||||
private Long cfgid;
|
||||
|
||||
/** 注册应用ID */
|
||||
private String appId;
|
||||
|
||||
/** 厂商编号参考字典attendance_vendors */
|
||||
private String vendorsCode;
|
||||
|
||||
/** 服务端ID */
|
||||
private String serverid;
|
||||
|
||||
/** 队伍id */
|
||||
@Excel(name = "队伍id")
|
||||
private Long teamId;
|
||||
|
||||
/** 工种编码 */
|
||||
@Excel(name = "工种编码")
|
||||
private String workTypeCode;
|
||||
|
||||
/** 分包商id */
|
||||
@Excel(name = "分包商id")
|
||||
private String companyId;
|
||||
|
||||
/** 平台对应分包商ID */
|
||||
@Excel(name = "平台对应分包商ID")
|
||||
private Long vendorId;
|
||||
|
||||
/** 设备编号 */
|
||||
@Excel(name = "设备编号")
|
||||
private String deviceCode;
|
||||
|
||||
/** 照片 */
|
||||
@Excel(name = "照片")
|
||||
private String scanPhoto;
|
||||
|
||||
/** */
|
||||
@Excel(name = "数据是否有效")
|
||||
private Long isDel;
|
||||
|
||||
private Long subDeptId;
|
||||
|
|
|
|||
|
|
@ -27,15 +27,15 @@ public class SurProjectAttendanceUser extends BaseEntity
|
|||
private Long id;
|
||||
|
||||
/** 配置项ID,可以获取项目ID和总包ID */
|
||||
@Excel(name = "配置项ID,可以获取项目ID和总包ID")
|
||||
|
||||
private Long cfgid;
|
||||
|
||||
/** 注册应用ID */
|
||||
@Excel(name = "注册应用ID")
|
||||
|
||||
private String appId;
|
||||
|
||||
/** 厂商编号参考字典attendance_vendors */
|
||||
@Excel(name = "厂商编号参考字典attendance_vendors")
|
||||
|
||||
private String vendorsCode;
|
||||
|
||||
/** 工人id */
|
||||
|
|
@ -43,7 +43,7 @@ public class SurProjectAttendanceUser extends BaseEntity
|
|||
private String workerId;
|
||||
|
||||
/** 项目工人履历id对于旧劳务，这个字段相当于工人的projectWorkerId，管理人员的registerManagerId */
|
||||
@Excel(name = "项目工人履历id对于旧劳务，这个字段相当于工人的projectWorkerId，管理人员的registerManagerId")
|
||||
|
||||
private Long laborWorkerId;
|
||||
|
||||
/** 人员类别0：工人，1：管理人员 */
|
||||
|
|
@ -51,7 +51,7 @@ public class SurProjectAttendanceUser extends BaseEntity
|
|||
private Long workerCategory;
|
||||
|
||||
/** 工号 */
|
||||
@Excel(name = "工号")
|
||||
|
||||
private Long qrCode;
|
||||
|
||||
/** 姓名 */
|
||||
|
|
@ -87,11 +87,11 @@ public class SurProjectAttendanceUser extends BaseEntity
|
|||
private String photo;
|
||||
|
||||
/** 近照 */
|
||||
@Excel(name = "近照")
|
||||
|
||||
private String recentPhoto;
|
||||
|
||||
/** 所属班组ID */
|
||||
@Excel(name = "所属班组ID")
|
||||
|
||||
private String groupId;
|
||||
|
||||
/** 所属班组 */
|
||||
|
|
@ -177,7 +177,9 @@ public class SurProjectAttendanceUser extends BaseEntity
|
|||
this.recentPhotoBase64 = recentPhotoBase64;
|
||||
}
|
||||
|
||||
@Excel(name = "进场时间")
|
||||
private Date inTime;
|
||||
@Excel(name = "离场时间")
|
||||
private Date outTime;
|
||||
|
||||
public static SurProjectAttendanceUser createFromHuazhu(JSONObject j) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue