This commit is contained in:
2025-07-29 16:25:47 +08:00
parent 7e7e51853d
commit 78c13c4131
3 changed files with 53 additions and 317 deletions

View File

@ -10,7 +10,7 @@ import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQ
export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => { export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => {
return request({ return request({
url: '/project/constructionUserFile/list', url: '/contractor/constructionUserFile/list',
method: 'get', method: 'get',
params: query params: query
}); });

View File

@ -0,0 +1,52 @@
import request from '@/utils/request';
// 人员 考勤 补卡 请假接口 对接go 后台
// 获取施工人员列表
export const getBusConstructionUser = (params) => {
return request({
url: '/zm/api/wxApplet/wxApplet/busConstructionUser/list',
method: 'get',
params
});
};
// 获取人员详情
export const getDetails = (id) => {
return request({
url: '/zm/api/wxApplet/wxApplet/busConstructionUser/getDetails',
method: 'get',
params: {
id: id
}
});
};
// 获取考勤列表数据
export const pcSelectBelowProjectOfPersonnel = (params) => {
return request({
url: '/zm/api/v1/system/busConstructionUser/pcSelectBelowProjectOfPersonnel',
method: 'get',
params
});
};
// 获取考勤图表数据
export const pcCollectDataForTwoWeeks = (params) => {
return request({
url: '/api/v1/system/busConstructionUser/pcCollectDataForTwoWeeks',
method: 'get',
params
});
};
// 获取补卡申请
export const busReissueACardList = (params) => {
return request({
url: '/zm/api/v1/system/busReissueACard/list',
method: 'get',
params
});
};
// 获取请假列表
export const busAskforleaveList = (params) => {
return request({
url: '/zm/api/v1/system/busAskforleave/list',
method: 'get',
params
});
};

View File

@ -35,72 +35,12 @@
</el-card> </el-card>
</div> </div>
</transition> </transition>
<el-card shadow="never"> <el-card shadow="never">
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['contractor:constructionUser:remove']"
>
删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['contractor:constructionUser:export']"
>导出
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
</el-col>
<el-col :span="1.5">
<el-switch
v-model="playCardStatus"
class="ml-2"
inline-prompt
style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
:loading="playCardLoding"
@change="handlePlayCardStatus"
inactive-text="一键关闭打卡"
active-text="一键开启打卡"
/>
</el-col>
<el-row @mouseover="informationStatus = true" :gutter="10" @mouseout="informationStatus = false">
<el-col :span="1.5">
<el-button type="success" plain>员工资料 </el-button>
</el-col>
<el-col :span="1.5" v-show="informationStatus">
<el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['contractor:constructionUserFile:download']"
>下载资料模板
</el-button>
</el-col>
<el-col :span="1.5" v-show="informationStatus">
<file-upload
v-model="filePath"
isImportInfo
:isShowTip="false"
uploadUrl="/project/constructionUserFile/upload/zip"
:limit="1"
:file-size="50"
>
<el-button type="warning" plain icon="Edit" v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
</file-upload>
</el-col>
</el-row>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
</template> </template>
<el-table v-loading="loading" :data="constructionUserList" @selection-change="handleSelectionChange" v-cloak> <el-table v-loading="loading" :data="constructionUserList" @selection-change="handleSelectionChange" v-cloak>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="60" align="center" /> <el-table-column label="序号" type="index" width="60" align="center" />
@ -167,25 +107,6 @@
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']"> <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']">
详情 详情
</el-button> </el-button>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:constructionUser:edit']">
修改
</el-button>
<el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </el-button>
<el-button
link
type="danger"
icon="Avatar"
@click="handleJoinBlacklist(scope.row)"
v-hasPermi="['contractor:constructionBlacklist:add']"
>
黑名单
</el-button>
<!-- <el-button link type="primary" icon="Switch" @click="handleToggle(scope.row)"> 切换人脸 </el-button> -->
<el-button link type="primary" icon="Switch" @click="handleChange(scope.row)"> 人员迁移 </el-button>
<el-button link type="primary" icon="ChatLineSquare" @click="handleExit(scope.row)"> 入退场记录 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['contractor:constructionUser:remove']">
删除
</el-button>
<el-tooltip content="红点:部分上传,绿点:已上传,无点:未上传" placement="right" effect="dark"> <el-tooltip content="红点:部分上传,绿点:已上传,无点:未上传" placement="right" effect="dark">
<el-badge :is-dot="scope.row.fileUploadStatus != '1'" :type="uploadStatusColor(scope.row.fileUploadStatus)"> <el-badge :is-dot="scope.row.fileUploadStatus != '1'" :type="uploadStatusColor(scope.row.fileUploadStatus)">
<el-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button> <el-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button>
@ -195,174 +116,11 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card> </el-card>
<!-- 添加或修改施工人员对话框 -->
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
<el-form ref="constructionUserFormRef" :model="form" :rules="rules" label-width="130px" :inline="true">
<div class="block_box">
<div class="msg">用户信息</div>
<div class="el-row">
<div class="el-col el-col-24">
<el-form-item label="人脸照" prop="facePic">
<image-upload v-model="form.facePic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证正面图片" prop="sfzFrontPic">
<image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证背面图片" prop="sfzBackPic">
<image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="人员姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入人员姓名" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="分包公司" prop="contractorId">
<el-select v-model="form.contractorId" clearable placeholder="请选择分包公司">
<el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="民族" prop="nation">
<el-input v-model="form.nation" placeholder="请输入民族" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证号码" prop="sfzNumber">
<el-input v-model="form.sfzNumber" placeholder="请输入身份证号码" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证有效开始期" prop="sfzStart">
<el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证有效结束期" prop="sfzEnd">
<el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证地址" prop="sfzSite">
<el-input v-model="form.sfzSite" placeholder="请输入身份证地址" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证出生日期" prop="sfzBirth">
<el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="籍贯" prop="nativePlace">
<el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
</el-form-item>
</div>
</div>
</div>
<div class="block_box">
<div class="msg">银行卡</div>
<div class="el-row">
<div class="el-col el-col-24">
<el-form-item label="银行图片" prop="yhkPic">
<image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="银行卡号" prop="yhkNumber">
<el-input v-model="form.yhkNumber" placeholder="请输入银行卡号" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="开户行" prop="yhkOpeningBank">
<el-input v-model="form.yhkOpeningBank" placeholder="请输入开户行" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="持卡人" prop="yhkCardholder">
<el-input v-model="form.yhkCardholder" placeholder="请输入持卡人" />
</el-form-item>
</div>
</div>
</div>
<div class="block_box">
<div class="msg">单位信息</div>
<div class="el-row">
<div class="el-col el-col-24">
<el-form-item label="特种作业证图片" prop="specialWorkPic">
<image-upload v-model="form.specialWorkPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="工种" prop="typeOfWork">
<el-select v-model="form.typeOfWork" clearable placeholder="请选择工种">
<el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="打卡" prop="clock">
<el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
<el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="结算方式" prop="wageMeasureUnit">
<el-select v-model="form.wageMeasureUnit" clearable placeholder="请选择结算方式">
<el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width: 240px" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
<el-dialog draggable title="施工人员详情" v-model="showDetailDrawer" width="800px"> <el-dialog draggable title="施工人员详情" v-model="showDetailDrawer" width="800px">
<construction-user-detail :user-id="currentUserId" /> <construction-user-detail :user-id="currentUserId" />
</el-dialog> </el-dialog>
<el-dialog draggable :title="skipName + '-人员迁移'" v-model="skip" width="500px">
<el-form-item label="所属项目" label-width="130px">
<el-select v-model="skipObject.projectId" @change="selectProject" placeholder="请选择所属项目" style="width: 240px">
<el-option v-for="item in skipOptions" :key="item.id" :label="item.projectName" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="分包单位" label-width="130px">
<el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位" style="width: 240px">
<el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="setUnits">确认</el-button>
<el-button @click="skip = false"> 取消 </el-button>
</div>
</template>
</el-dialog>
<el-dialog draggable title="上传文件" v-model="fileStatus" width="770px"> <el-dialog draggable title="上传文件" v-model="fileStatus" width="770px">
<div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value"> <div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value">
<div class="title">{{ item.label }}</div> <div class="title">{{ item.label }}</div>
@ -392,78 +150,6 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog draggable title="修改在职状态" v-model="statusDialog" width="30%">
<el-form-item label="在职状态">
<el-select v-model="vocationalStatus" placeholder="请选择状态">
<el-option v-for="item in user_status_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<template #footer>
<span
><el-button type="primary" @click="handleEdit">保存</el-button>
<el-button @click="statusDialog = false">取消</el-button>
</span>
</template>
</el-dialog>
<el-dialog draggable title="温馨提示" v-model="salaryStatus" width="30%">
<span>请输入薪资</span>
<el-input class="mt-xl" v-model="changeSalary" placeholder="" clearable @change=""></el-input>
<template #footer>
<span>
<el-button type="primary" @click="handleSalary">确认</el-button>
<el-button @click="salaryStatus = false">取消</el-button>
</span>
</template>
</el-dialog>
<el-dialog draggable title="入场退场记录" v-model="exitStatus" width="600px">
<div v-for="(item, index) in exitList">
<el-timeline>
<el-timeline-item color="#0bbd87" class="mb">
{{ '入场时间:' + item.entryDate }}
</el-timeline-item>
<el-timeline-item color="rgb(255, 73, 73)">
<div class="mb">{{ '退场时间:' + item.entryDate }}</div>
<div class="pl-xl">
<span class="text-coolgray font-bold">退场文件<image-preview v-for="itm in item.pathUrl" :src="itm" width="100px" class="mr" /></span
><br />
<p class="mt text-coolgray">
备注<span class="text-blue">{{ item.remark }}</span>
</p>
</div>
</el-timeline-item>
</el-timeline>
</div>
<template #footer>
<span>
<el-button @click="exitStatus = false">关闭</el-button>
</span>
</template>
</el-dialog>
<el-dialog draggable :title="`打卡记录`" v-model="playCardCalendar" width="770px" :close-on-click-modal="false">
<el-calendar ref="calendar" v-model="calendarDay">
<template #header="{ date }">
<span>{{ date }}</span>
<div class="status-detail flex items-center justify-between">
<div class="green">全天考勤正常</div>
<div class="orange">半勤</div>
<div class="red">缺卡</div>
<div class="gray">请假</div>
</div>
<el-date-picker v-model="monthValue" type="month" placeholder="请选择月份" @change="handleMonth" />
</template>
<template #date-cell="{ data }">
<div
class="w100% h100% position-relative m-0 monthDay"
:class="data.isSelected ? 'is-selected' : ''"
@click="handleViewPlayCard(playCardIdx(data), data)"
>
{{ data.day.split('-').slice(1).join('-') }}
<div :style="{ background: playCardColor(data) }" v-if="playCardIdx(data) != -1"></div>
</div>
</template>
</el-calendar>
</el-dialog>
</div> </div>
</template> </template>
@ -495,7 +181,6 @@ import {
} from '@/api/project/constructionUser/types'; } from '@/api/project/constructionUser/types';
import { useUserStoreHook } from '@/store/modules/user'; import { useUserStoreHook } from '@/store/modules/user';
import { listContractor } from '@/api/project/contractor'; import { listContractor } from '@/api/project/contractor';
import { listProjectTeam } from '@/api/project/projectTeam';
import { ContractorVO } from '@/api/project/contractor/types'; import { ContractorVO } from '@/api/project/contractor/types';
import { ProjectTeamVO } from '@/api/project/projectTeam/types'; import { ProjectTeamVO } from '@/api/project/projectTeam/types';
import ConstructionUserDetail from '@/views/project/constructionUser/component/ConstructionUserDetail.vue'; import ConstructionUserDetail from '@/views/project/constructionUser/component/ConstructionUserDetail.vue';
@ -556,7 +241,6 @@ const dialog = reactive<DialogOption>({
title: '', title: '',
id: undefined id: undefined
}); });
const baseUrl = import.meta.env.VITE_APP_BASE_API;
//人员迁移条件 //人员迁移条件
const skipObject: skipType = reactive({ const skipObject: skipType = reactive({
id: '', id: '',