diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js index df513016..cf3ba649 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -287,4 +287,9 @@ export const getWorkerAdmissionDetailPageApi = data => get('xmgl/workerAdmission // 删除人员入场明细信息 export const deleteWorkerAdmissionDetailApi = data => post('xmgl/workerAdmissionDetail/delete', data); // 列表查询人员入场明细资格证书信息 -export const getWorkerAdmissionCertificateDetailListApi = data => get('xmgl/workerAdmissionCertificateDetail/list', data); \ No newline at end of file +export const getWorkerAdmissionCertificateDetailListApi = data => get('xmgl/workerAdmissionCertificateDetail/list', data); + +// 批量录入 +export const batchEntryRecordApi = data => post('xmgl/workerAdmissionDetail/importWorkerBatch', data); +// 导出人员申请表 +export const exportWorkerApplyApi = data => post('xmgl/workerAdmission/exportXls', data); \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index c4463520..076dd784 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -64,7 +64,7 @@ export default new Vuex.Store({ FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - WORKFLOWURL: "http://192.168.34.175:88/#/workspace/forms", //罗峰工作流地址(本地) + WORKFLOWURL: "http://192.168.34.100:88/#/workspace/forms", //罗峰工作流地址(本地) CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 diff --git a/src/views/projectFront/laborManage/admissionPersons.vue b/src/views/projectFront/laborManage/admissionPersons.vue index 1486bc7d..49e57b67 100644 --- a/src/views/projectFront/laborManage/admissionPersons.vue +++ b/src/views/projectFront/laborManage/admissionPersons.vue @@ -8,11 +8,13 @@ --> - + - + @@ -30,11 +32,14 @@ {{ $t("message.quality.inquire") - }} + }} 刷新 + + 导出人员申请表 + @@ -47,9 +52,9 @@
- - + + @@ -59,6 +64,10 @@ + + @@ -194,13 +203,27 @@ - +
+ + +
+
+ {{ this.percentageTitle }} +
+ + +
+ - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/projectFront/laborManage/admissionPersons/detail.vue b/src/views/projectFront/laborManage/admissionPersons/detail.vue index 843090a6..22f94e54 100644 --- a/src/views/projectFront/laborManage/admissionPersons/detail.vue +++ b/src/views/projectFront/laborManage/admissionPersons/detail.vue @@ -236,7 +236,7 @@
劳动合同：
-
+
{{ item.name }}
@@ -244,7 +244,7 @@
保险：
-
+
{{ item.name }}
@@ -252,7 +252,7 @@
体检报告：
-
+
{{ item.name }}
@@ -458,7 +458,8 @@ export default { }, downloadFn(row) { // "http://42.180.188.17:11211/image/669b96b66b90a34a1aa4ec9c.jpg" - fetch(row.url).then((response) => { + const url = row.url.includes('http://') ? row.url : this.fileUrl + row.url; + fetch(url).then((response) => { // 处理响应 if (!response.ok) { throw new Error("导出失败"); diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue index 74366b99..fa941bb1 100644 --- a/src/views/projectFront/laborManage/personDetails.vue +++ b/src/views/projectFront/laborManage/personDetails.vue @@ -914,8 +914,8 @@ - - + + + + {{ workerInfo.workArea }} + + + + + @@ -2132,7 +2132,7 @@
-
+
安全分详情 @@ -2520,6 +2520,7 @@ export default { imgRadiolist: [], isSzProject: "", projectSn: "", + isEnableDeduct: 0, isNew: true, formRules: { personMail: [ @@ -2606,7 +2607,8 @@ export default { getProjectConfigListApi({ projectSn: this.projectSn }).then((res) => { // this.isSzProject = 1 this.isSzProject = res.result[0].isSzProject; //1是 0否 - // console.log(res.result[0].isSzProject) + this.isEnableDeduct = res.result[0].isEnableDeduct; //是否启用扣分 1是 0否 + console.log(res.result) }); }, handleCheckAllChangeGroup(val) { diff --git a/src/views/projectFront/laborManage/rosterNew.vue b/src/views/projectFront/laborManage/rosterNew.vue index 3c611b51..e03d7998 100644 --- a/src/views/projectFront/laborManage/rosterNew.vue +++ b/src/views/projectFront/laborManage/rosterNew.vue @@ -96,7 +96,21 @@ getInfoList(); key: 'hmc_batch_authorization', menuPath: '/project/labor/roster', }">批量授权门禁权限 - 批量导入 + + 批量导入 + + 手动录入 @@ -734,6 +748,10 @@ getInfoList(); +
+ 批量制卡 + 批量录入 +
@@ -755,6 +773,7 @@ import { getWorkerAdmissionPageApi, getWorkerAdmissionDetailPageApi, + batchEntryRecordApi } from "@/assets/js/api/laborPerson"; import { getProjectConfigListApi, @@ -894,6 +913,7 @@ export default { workerName: "", enterpriseName: "", }, + idCards: "", unitInfo: { certificateIssuingUnitName: "", pageNo: 1, @@ -903,6 +923,7 @@ export default { dataList: [], }, enteringType: -1, + enteringFileList: [], }; }, computed: { @@ -948,6 +969,9 @@ export default { }); } }, + headers() { + return { Authorization: this.$store.state.userInfo.token } + }, }, created() { this.projectSn = this.$store.state.projectSn; @@ -966,6 +990,17 @@ export default { this.mqttMSG(); }, methods: { + batchCardPrint() { + console.log(this.$refs.workerTable.selection); + batchEntryRecordApi({ + idCards:this.$refs.workerTable.selection.map(item => item.idCard).join(','), + }).then((res) => { + if(res.success) { + this.$message.success("批量录入成功"); + this.initData(); + } + }) + }, handleCheckAllChangeWorker() { // this.checkedCities = val ? cityOptions : []; console.log(this.$refs.workerTable); @@ -981,6 +1016,7 @@ export default { enteringDialog(type) { this.enteringType = type; if(type == 2) { + this.idCards = ''; this.clearWorkerAdmission(); this.getWorkerAdmissionPage(); } @@ -1050,6 +1086,19 @@ export default { this.enteringInfo.pageNo = 1; this.initData(); }, + // 导入成功 + handleImportSuccess(res) { + if (res.code == 200) { + this.$message.success(res.message); + this.idCards = res.result.idCards; + this.enteringDialog(1); + } else { + this.$message.error(res.message); + } + }, + handleBeforeUpload(file) { + console.log('=========', file) + }, initData() { let data = { enterpriseName: this.formInline.enterpriseName, @@ -1057,6 +1106,7 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize, projectSn: this.projectSn, + idCards: this.idCards, workerAdmissionId: this.unitInfo.unitActive, }; getWorkerAdmissionDetailPageApi(data).then((res) => { @@ -1602,6 +1652,12 @@ export default { return "yellow2"; } }, + tableRowClassNameDetail({ row, rowIndex }) { + console.log(row.isImport, "--------------------"); + if (row.isImport == 1) { + return "gray"; + } + }, async issueTeamEvent(id) { this.issueTeamDialog = true; this.whoId = id; @@ -1721,6 +1777,17 @@ export default { margin-left: 30px; } + .el-table { + width: 100%; + min-height: 450px; + max-height: calc(100% - 98px); + background-color: transparent; + overflow: auto; + /deep/ .gray { + background-color: #DCDCDC; + } + } + /deep/ .el-table__row { border-bottom: 1px solid #e6e6e6; td { @@ -1913,7 +1980,7 @@ export default { } .pagerBox { - margin-top: 0; + margin-top: 10px; } }