diff --git a/public/人员入场-模版.xlsx b/public/人员入场-模版.xlsx new file mode 100644 index 0000000..a766b69 Binary files /dev/null and b/public/人员入场-模版.xlsx differ diff --git a/public/失信人员-模板.xlsx b/public/失信人员-模板.xlsx new file mode 100644 index 0000000..fa4a54e Binary files /dev/null and b/public/失信人员-模板.xlsx differ diff --git a/src/api/construction-person/entry-and-exit-manage/person-entry.js b/src/api/construction-person/entry-and-exit-manage/person-entry.js index 86eb993..be2aec4 100644 --- a/src/api/construction-person/entry-and-exit-manage/person-entry.js +++ b/src/api/construction-person/entry-and-exit-manage/person-entry.js @@ -51,3 +51,10 @@ export const importEntryPersonAPI = (data) => { data, }) } +// 修改人员的红绿灯状态 +export const updatePersonLightStatusAPI = (id) => { + return request({ + url: `/bmw/workerWageCard/light/${id}`, + method: 'POST', + }) +} diff --git a/src/api/construction-person/entry-and-exit-manage/person-exit.js b/src/api/construction-person/entry-and-exit-manage/person-exit.js index 8b27245..0848670 100644 --- a/src/api/construction-person/entry-and-exit-manage/person-exit.js +++ b/src/api/construction-person/entry-and-exit-manage/person-exit.js @@ -40,7 +40,7 @@ export const uploadExitFileAPI = (data) => { export const deleteEntryPersonAPI = (data) => { return request({ url: `/bmw/worker/delete/${data.id}`, - method: 'post', + method: 'POST', }) } @@ -48,14 +48,14 @@ export const deleteEntryPersonAPI = (data) => { export const getEntryPersonDetailAPI = (data) => { return request({ url: `/bmw/worker/select/${data.id}`, - method: 'post', + method: 'POST', }) } // 人员出场 修改人员接口 export const editEntryPersonAPI = (data) => { return request({ url: `/bmw/worker/edit`, - method: 'post', + method: 'POST', data, }) } @@ -64,7 +64,15 @@ export const editEntryPersonAPI = (data) => { export const getExitPersonListAPI = (data) => { return request({ url: '/bmw/workerExit/list', - method: 'get', + method: 'GET', params: data, }) } + +// 人员出场后 查看工资结算确认单 +export const getExitFileAPI = (id) => { + return request({ + url: `/bmw/workerExit/lookFile/${id}`, + method: 'POST', + }) +} diff --git a/src/components/UploadImgFormData/index.vue b/src/components/UploadImgFormData/index.vue index fca7908..145f78a 100644 --- a/src/components/UploadImgFormData/index.vue +++ b/src/components/UploadImgFormData/index.vue @@ -103,6 +103,7 @@ export default { methods: { // 删除 async handleRemove(file, fileList) { + this.$emit('onUploadChange', fileList) // if (file.response && file.response.data.length > 0) { // this.$emit('deleteFile', { // filePath: file.response.data[0].filePath, @@ -190,6 +191,7 @@ export default { handleChange(file, fileList) { console.log(file, fileList, 'file, fileList') this.$emit('update:fileList', fileList) + this.$emit('onUploadChange', fileList) }, }, diff --git a/src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue b/src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue index eb4a23d..2539958 100644 --- a/src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue +++ b/src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue @@ -133,6 +133,10 @@ export default { type: [String, Number], default: '', }, + workerId: { + type: [String, Number], + default: '', + }, }, data() { return { @@ -203,9 +207,10 @@ export default { this.download( '/bmw/workerLight/attExportByWorkerMsg', { - teamId: this.teamId, proId: this.proId, + teamId: this.teamId, idNumber: this.idNumber, + workerId: this.workerId, startDate: this.timeRange[0], endDate: this.timeRange[1], }, @@ -216,9 +221,10 @@ export default { // 获取考勤详情列表 async getAttendanceDetailsListData() { const params = { - teamId: this.teamId, proId: this.proId, + teamId: this.teamId, idNumber: this.idNumber, + workerId: this.workerId, startDate: this.timeRange[0], endDate: this.timeRange[1], } diff --git a/src/views/construction-person/attendance-manage/attendance-count/person-table.vue b/src/views/construction-person/attendance-manage/attendance-count/person-table.vue index 584c90c..349dd61 100644 --- a/src/views/construction-person/attendance-manage/attendance-count/person-table.vue +++ b/src/views/construction-person/attendance-manage/attendance-count/person-table.vue @@ -52,6 +52,7 @@ @@ -97,7 +98,8 @@ export default { personDialogConfig, getPersonListAPI, idNumber: '', - slots: ['attDay', 'notAttNum'], + workerId: '', + slots: ['attNum', 'notAttNum'], } }, methods: { @@ -120,6 +122,7 @@ export default { // 点击人员姓名 弹出考勤详情 onHandleCheckPerson(data) { this.idNumber = data.idNumber + this.workerId = data.workerId this.personDialogConfig.outerVisible = true }, }, diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue index b84415d..f04680c 100644 --- a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue +++ b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue @@ -20,7 +20,14 @@ v-model="idCardReaderForm.idCardReaderAddress" /> - + {{ isConnected ? '已连接' : '未连接' }} @@ -189,6 +196,7 @@ :limit="1" :file-size="10" :multiple="true" + @onUploadChange="onUploadChange" :file-type="['jpg', 'png', 'jpeg']" :file-list.sync="idCardInfoForm.faceImg" :is-uploaded="idCardInfoForm.faceImg.length >= 1" @@ -580,6 +588,7 @@ import { addEntryPersonAPI, editEntryPersonAPI, getEntryPersonDetailAPI, + updatePersonLightStatusAPI, } from '@/api/construction-person/entry-and-exit-manage/person-entry' import { getSubSelectListByConditionAPI, @@ -1207,6 +1216,19 @@ export default { ? '修改人员成功' : '新增人员成功', ) + + // 更新一下红绿灯状态 + const result = + await updatePersonLightStatusAPI( + this.queryDetailsId + ? this.workerId + : res.data.id, + ) + console.log( + result, + 'result红绿灯状态更新结果', + ) + resolve() } else { this.$modal.msgError(res.msg) @@ -1542,9 +1564,13 @@ export default { this.webSocket.close() }, - // 下载身份证读卡器驱动 - downloadIdCardReaderDriver() { - // window.open(this.idCardReaderForm.idCardReaderAddress) + // 人脸照片验证 + onUploadChange(fileList) { + console.log('人脸照片验证', fileList) + + if (fileList.length > 0) { + // 走验证逻辑 + } }, }, diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue index 6019530..34bf446 100644 --- a/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue +++ b/src/views/construction-person/entry-and-exit-manage/person-entry/index.vue @@ -96,6 +96,7 @@ > @@ -57,21 +57,104 @@ label="离场人员工资结算确认单" > + + + +