From a76dc4c48f200ffe01fe8ebec354e1697e33400a Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 28 Mar 2025 17:09:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pro/admissionRequest/index.vue | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/views/pro/admissionRequest/index.vue b/src/views/pro/admissionRequest/index.vue index 80868cd..acbc7a8 100644 --- a/src/views/pro/admissionRequest/index.vue +++ b/src/views/pro/admissionRequest/index.vue @@ -212,7 +212,14 @@ - +
@@ -783,6 +790,7 @@ export default { personClose() { this.personBasicOpen = false this.formPerson.fileList = [] + this.onCloseDialog() }, before() { this.active-- @@ -801,7 +809,7 @@ export default { }, importExcel: debounce(function () { - this.loading = true + // this.loading = true let data = [] for (let i = 1; i < this.excelData.length; i++) { data.push(this.excelData[i]) @@ -823,7 +831,7 @@ export default { this.formPerson.fileList = [] this.excelData = [] this.getSubPersonList() - this.loading = false + // this.loading = false } else { this.errorCode = response.msg this.active = 3 @@ -1049,6 +1057,12 @@ export default { } }) }, + + // 关闭导入弹框 + onCloseDialog() { + this.excelData = [] + this.active = 1 + }, }, } From 2d8fc3ef40db724b4480da9ee2d8e0f7d8da6ded Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 28 Mar 2025 17:15:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/flow/auditRecord.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/flow/auditRecord.vue b/src/views/flow/auditRecord.vue index 95288bf..e688590 100644 --- a/src/views/flow/auditRecord.vue +++ b/src/views/flow/auditRecord.vue @@ -53,8 +53,8 @@ export default { if (hasDoubleAt) { this.approvalItems = res.data.map(item => ({ ...item, - // reason: item.reason.split('@@')[4] || '', - reason: item.reason.replaceAll('@', ''), + reason: item.reason.split('@@')[4] || '', + // reason: item.reason.replaceAll('@', ''), })) } else { this.approvalItems = res.data From aff59d97bed0dc9c3f7fb35f74bc35a3489275d2 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 28 Mar 2025 17:52:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/apply/list/subPersonEnterList.vue | 206 ++++++++------- src/views/pro/apply/list/subPersonOutList.vue | 240 +++++++++--------- .../list/consPersonOutApprovalList.vue | 234 ++++++++--------- 3 files changed, 338 insertions(+), 342 deletions(-) diff --git a/src/views/pro/apply/list/subPersonEnterList.vue b/src/views/pro/apply/list/subPersonEnterList.vue index ee6eef6..38a6973 100644 --- a/src/views/pro/apply/list/subPersonEnterList.vue +++ b/src/views/pro/apply/list/subPersonEnterList.vue @@ -29,15 +29,10 @@ - + - + 搜索 重置 @@ -58,22 +53,22 @@ @@ -99,9 +94,17 @@ @@ -109,14 +112,11 @@ - + -
+
-
+
@@ -178,10 +169,11 @@ import { selectFile } from '@/api/tool/select' export default { components: { - bnsKkFilePreview, bnsFileListTabs, + bnsKkFilePreview, + bnsFileListTabs, BnsPersonApprovalTabs, bnsConsPersonDetailsTabs, - bnsGenerateWorkCardTabs + bnsGenerateWorkCardTabs, }, data() { return { @@ -191,12 +183,12 @@ export default { name: undefined, status: '1', admissionDate: undefined, - departureDate: undefined + departureDate: undefined, }, personList: [], - proOptions: [],//工程下拉选项 - consOptions: [],//承包商下拉选项 - subOptions: [],//分包商拉选项 + proOptions: [], //工程下拉选项 + consOptions: [], //承包商下拉选项 + subOptions: [], //分包商拉选项 personTotal: 0, loading: false, constructionPersonnelOpen: false, @@ -206,43 +198,38 @@ export default { kkFilePreview: { filePreviewUrl: '', fileName: '', - showDownloadButton: false + showDownloadButton: false, }, statusDict: [ { value: '1', - label: '待审批' + label: '待审批', }, { value: '2', - label: '审批中' + label: '审批中', }, { value: '3', - label: '已通过' + label: '已通过', }, { value: '4', - label: '已驳回' + label: '已驳回', }, { value: '5', - label: '已撤销' - } + label: '已撤销', + }, ], auditStatusDict: { - '1': - '待审批', - '2': - '审批中', - '3': - '已通过', - '4': - '已驳回', - '5': - '已撤销' + 1: '待审批', + 2: '审批中', + 3: '已通过', + 4: '已驳回', + 5: '已撤销', }, - lookFaceFile:'' + lookFaceFile: '', } }, created() { @@ -266,13 +253,13 @@ export default { 1: '体检文件', 2: '保险文件', 3: '特殊工种文件', - 4: '其他文件' + 4: '其他文件', } selectFile({ classification: 9, uuid: row.uuid, informationType: informationType, - fromType: 2 + fromType: 2, }).then(response => { console.log(response) if (response.data.length === 0) { @@ -282,7 +269,7 @@ export default { this.kkFilePreview = { filePreviewUrl: response.data[0].filePath, fileName: response.data[0].fileName, - showDownloadButton: false + showDownloadButton: false, } this.documentPreview = true } else { @@ -295,7 +282,7 @@ export default { //获取工程下拉选项 getProOption() { const params = { - id: '' + id: '', } getProOptions(params).then(res => { this.proOptions = res.data @@ -304,7 +291,7 @@ export default { //获取承包商下拉选项 getConsOption() { const params = { - id: '' + id: '', } getConsOptions(params).then(res => { this.consOptions = res.data @@ -313,7 +300,7 @@ export default { //获取分包商下拉选项 getSubOption() { const params = { - id: '' + id: '', } getSubOptions(params).then(res => { this.subOptions = res.data @@ -330,11 +317,11 @@ export default { consUuid: this.$store.state.user.userType === '00' ? '' : consUuid, type: '入场', enterType: '业主-分包审核', - ...this.personQueryParams + ...this.personQueryParams, } getList(params).then(res => { this.personList = res.rows - this.total = res.total + this.personTotal = res.total this.loading = false }) }, @@ -350,52 +337,63 @@ export default { name: undefined, status: undefined, admissionDate: undefined, - departureDate: undefined + departureDate: undefined, } this.getList() }, //审核 handleApprove(row) { - this.$router.push('/system/subManagement-personApproval-auth/personApproval/' + encryptCBC(JSON.stringify({ - uuid: row.uuid, - taskId: row.taskId, - procInstId: row.procInsId, - contUuid: row.contUuid, - consUuid: row.consUuid, - subUuid: row.subUuid, - showType: 2, - isExamine: true, - btnShow: true, - finalCheck: row.finalCheck - }))) + this.$router.push( + '/system/subManagement-personApproval-auth/personApproval/' + + encryptCBC( + JSON.stringify({ + uuid: row.uuid, + taskId: row.taskId, + procInstId: row.procInsId, + contUuid: row.contUuid, + consUuid: row.consUuid, + subUuid: row.subUuid, + showType: 2, + isExamine: true, + btnShow: true, + finalCheck: row.finalCheck, + }) + ) + ) }, //查看 handleView(row) { - this.$router.push('/system/subManagement-personApproval-auth/personApproval/' + encryptCBC(JSON.stringify({ - uuid: row.uuid, - taskId: row.taskId, - procInstId: row.procInsId, - contUuid: row.contUuid, - consUuid: row.consUuid, - subUuid: row.subUuid, - showType: 1, - isExamine: false, - btnShow: false, - finalCheck: row.finalCheck - }))) + this.$router.push( + '/system/subManagement-personApproval-auth/personApproval/' + + encryptCBC( + JSON.stringify({ + uuid: row.uuid, + taskId: row.taskId, + procInstId: row.procInsId, + contUuid: row.contUuid, + consUuid: row.consUuid, + subUuid: row.subUuid, + showType: 1, + isExamine: false, + btnShow: false, + finalCheck: row.finalCheck, + }) + ) + ) }, //审核记录 handleAuditRecord(row) { - this.$router.push("/flow/auditRecord/" + encryptCBC(JSON.stringify({ - taskId: row.taskId, - checkType:'2' - }))); - } - } + this.$router.push( + '/flow/auditRecord/' + + encryptCBC( + JSON.stringify({ + taskId: row.taskId, + checkType: '2', + }) + ) + ) + }, + }, } - - - + diff --git a/src/views/pro/apply/list/subPersonOutList.vue b/src/views/pro/apply/list/subPersonOutList.vue index 74bf242..151c0b1 100644 --- a/src/views/pro/apply/list/subPersonOutList.vue +++ b/src/views/pro/apply/list/subPersonOutList.vue @@ -29,15 +29,10 @@ - + - + 搜索 重置 @@ -58,22 +53,22 @@ @@ -99,52 +94,43 @@ - + - + -
+
-
+
@@ -177,11 +163,12 @@ import bnsFileListTabs from '@/components/pro-tabs/bns-file-list-tabs.vue' import bnsKkFilePreview from '@/components/pro-tabs/bns-kkFile-preview.vue' export default { components: { - bnsKkFilePreview, bnsFileListTabs, + bnsKkFilePreview, + bnsFileListTabs, BnsPersonApprovalDetailsTabs, BnsPersonApprovalTabs, bnsConsPersonDetailsTabs, - bnsGenerateWorkCardTabs + bnsGenerateWorkCardTabs, }, data() { return { @@ -191,13 +178,13 @@ export default { name: undefined, status: '1', admissionDate: undefined, - departureDate: undefined + departureDate: undefined, }, statusDict: [], personList: [], - proOptions: [],//工程下拉选项 - consOptions: [],//承包商下拉选项 - subOptions: [],//分包商拉选项 + proOptions: [], //工程下拉选项 + consOptions: [], //承包商下拉选项 + subOptions: [], //分包商拉选项 personTotal: 0, loading: true, constructionPersonnelOpen: false, @@ -207,16 +194,16 @@ export default { kkFilePreview: { filePreviewUrl: '', fileName: '', - showDownloadButton: false + showDownloadButton: false, }, - auditStatusDict:{ - "1" : "待审批", - "2" : "审批中", - "3" : "已通过", - "4" : "已驳回", - "5" : "已撤销" + auditStatusDict: { + 1: '待审批', + 2: '审批中', + 3: '已通过', + 4: '已驳回', + 5: '已撤销', }, - lookFaceFile:'' + lookFaceFile: '', } }, created() { @@ -231,7 +218,7 @@ export default { indexContinuous, lookFaceFile, hideSensitiveInfo, - updateStatus(status){ + updateStatus(status) { return this.auditStatusDict[status] }, /** 文件查看按钮操作 */ @@ -241,13 +228,13 @@ export default { 1: '体检文件', 2: '保险文件', 3: '特殊工种文件', - 4: '其他文件' + 4: '其他文件', } selectFile({ classification: 9, uuid: row.uuid, informationType: informationType, - fromType: 2 + fromType: 2, }).then(response => { console.log(response) if (response.data.length === 0) { @@ -257,7 +244,7 @@ export default { this.kkFilePreview = { filePreviewUrl: response.data[0].filePath, fileName: response.data[0].fileName, - showDownloadButton: false + showDownloadButton: false, } this.documentPreview = true } else { @@ -268,9 +255,9 @@ export default { }) }, //获取工程下拉选项 - getProOption(){ + getProOption() { const params = { - id: '' + id: '', } getProOptions(params).then(res => { this.proOptions = res.data @@ -279,105 +266,116 @@ export default { getStatus() { const params = { dictType: 'sys_approval_state', - dictValue: '' + dictValue: '', } dictTableOption(params).then(response => { - this.statusDict = response.data; - }); + this.statusDict = response.data + }) }, //获取承包商下拉选项 - getConsOption(){ + getConsOption() { const params = { - id: '' + id: '', } getConsOptions(params).then(res => { this.consOptions = res.data }) }, //获取分包商下拉选项 - getSubOption(){ + getSubOption() { const params = { - id: '' + id: '', } getSubOptions(params).then(res => { this.subOptions = res.data }) }, - getList(){ + getList() { const proId = this.$store.state.user.thisIds.proId, consUuid = this.$store.state.user.thisIds.consUuid, - userType= this.$store.state.user.userType - console.log(proId,consUuid) + userType = this.$store.state.user.userType + console.log(proId, consUuid) const params = { - proId : proId, - consUuid : consUuid, + proId: proId, + consUuid: consUuid, type: '出场', - userType:userType, + userType: userType, enterType: '业主-分包审核', - ...this.personQueryParams + ...this.personQueryParams, } getList(params).then(res => { this.personList = res.rows - this.total = res.total + this.personTotal = res.total this.loading = false }) }, //查询按钮 - handleQueryPerson(){ + handleQueryPerson() { this.personQueryParams.pageNum = 1 this.getList() }, //重置按钮 - resetQueryPerson(){ - this.loading = true; - this.resetForm("personQueryForm"); - this.handleQueryPerson(); + resetQueryPerson() { + this.loading = true + this.resetForm('personQueryForm') + this.handleQueryPerson() }, //审核 - handleApprove(row){ - this.$router.push("/system/subManagement-personApproval-auth/personApproval/" + encryptCBC(JSON.stringify({ - uuid:row.uuid, - taskId:row.taskId, - procInstId:row.procInsId, - contUuid:row.contUuid, - consUuid:row.consUuid, - subUuid:row.subUuid, - showType:2, - isExamine:true, - btnShow:true, - finalCheck: row.finalCheck, - auditType:'出场' - }))); + handleApprove(row) { + this.$router.push( + '/system/subManagement-personApproval-auth/personApproval/' + + encryptCBC( + JSON.stringify({ + uuid: row.uuid, + taskId: row.taskId, + procInstId: row.procInsId, + contUuid: row.contUuid, + consUuid: row.consUuid, + subUuid: row.subUuid, + showType: 2, + isExamine: true, + btnShow: true, + finalCheck: row.finalCheck, + auditType: '出场', + }) + ) + ) }, //查看 - handleView(row){ - this.$router.push("/system/subManagement-personApproval-auth/personApproval/" + encryptCBC(JSON.stringify({ - uuid:row.uuid, - taskId:row.taskId, - procInstId:row.procInsId, - contUuid:row.contUuid, - consUuid:row.consUuid, - subUuid:row.subUuid, - showType:1, - isExamine:false, - btnShow:false, - finalCheck: row.finalCheck, - auditType:'出场' - }))); + handleView(row) { + this.$router.push( + '/system/subManagement-personApproval-auth/personApproval/' + + encryptCBC( + JSON.stringify({ + uuid: row.uuid, + taskId: row.taskId, + procInstId: row.procInsId, + contUuid: row.contUuid, + consUuid: row.consUuid, + subUuid: row.subUuid, + showType: 1, + isExamine: false, + btnShow: false, + finalCheck: row.finalCheck, + auditType: '出场', + }) + ) + ) }, //审核记录 - handleAuditRecord(row){ - this.$router.push("/flow/auditRecord/" + encryptCBC(JSON.stringify({ - taskId: row.taskId, - checkType:'2' - }))); + handleAuditRecord(row) { + this.$router.push( + '/flow/auditRecord/' + + encryptCBC( + JSON.stringify({ + taskId: row.taskId, + checkType: '2', + }) + ) + ) }, - } + }, } - - - + diff --git a/src/views/pro/approval/list/consPersonOutApprovalList.vue b/src/views/pro/approval/list/consPersonOutApprovalList.vue index dc2e2bd..aafbefa 100644 --- a/src/views/pro/approval/list/consPersonOutApprovalList.vue +++ b/src/views/pro/approval/list/consPersonOutApprovalList.vue @@ -4,8 +4,10 @@ @@ -22,15 +24,10 @@ - + - + 搜索 重置 @@ -50,22 +47,22 @@ @@ -91,64 +88,55 @@ - + - + -
+
-
+
@@ -158,7 +146,7 @@ import { hideSensitiveInfo, indexContinuous, lookFaceFile } from '@/utils/bonus' import bnsConsPersonDetailsTabs from '@/components/pro-tabs/bns-cons-person-details-tabs.vue' import bnsGenerateWorkCardTabs from '@/components/pro-tabs/bns-generate-work-card-tabs.vue' -import {getProOptions, getConsOptions, getList} from '@/api/pro/subManagement/approval/personApproval' +import { getProOptions, getConsOptions, getList } from '@/api/pro/subManagement/approval/personApproval' import BnsPersonApprovalTabs from '@/components/pro-tabs/bns-person-approval-tabs.vue' import BnsPersonApprovalDetailsTabs from '@/components/pro-tabs/bns-person-approval-details-tabs.vue' import { dictTableOption, selectFile } from '@/api/tool/select' @@ -168,11 +156,12 @@ import bnsFileListTabs from '@/components/pro-tabs/bns-file-list-tabs.vue' import bnsKkFilePreview from '@/components/pro-tabs/bns-kkFile-preview.vue' export default { components: { - bnsKkFilePreview, bnsFileListTabs, + bnsKkFilePreview, + bnsFileListTabs, BnsPersonApprovalDetailsTabs, BnsPersonApprovalTabs, bnsConsPersonDetailsTabs, - bnsGenerateWorkCardTabs + bnsGenerateWorkCardTabs, }, data() { return { @@ -185,28 +174,28 @@ export default { consName: undefined, }, personList: [], - proOptions: [],//工程下拉选项 - consOptions: [],//承包商下拉选项 + proOptions: [], //工程下拉选项 + consOptions: [], //承包商下拉选项 //审核类型下拉选 statusDict: [], personTotal: 0, loading: false, constructionPersonnelOpen: false, - auditStatusDict:{ - "1" : "待审批", - "2" : "审批中", - "3" : "已通过", - "4" : "已驳回", - "5" : "已撤销" + auditStatusDict: { + 1: '待审批', + 2: '审批中', + 3: '已通过', + 4: '已驳回', + 5: '已撤销', }, - lookFaceFile:'', + lookFaceFile: '', document: false, documentPreview: false, fileList: [], kkFilePreview: { filePreviewUrl: '', fileName: '', - showDownloadButton: false + showDownloadButton: false, }, } }, @@ -221,22 +210,22 @@ export default { indexContinuous, lookFaceFile, hideSensitiveInfo, - updateStatus(status){ + updateStatus(status) { return this.auditStatusDict[status] }, //获取工程下拉选项 - getProOption(){ + getProOption() { const params = { - id: '' + id: '', } getProOptions(params).then(res => { this.proOptions = res.data }) }, //获取承包商下拉选项 - getConsOption(){ + getConsOption() { const params = { - id: '' + id: '', } getConsOptions(params).then(res => { this.proOptions = res.data @@ -246,11 +235,11 @@ export default { getStatus() { const params = { dictType: 'sys_approval_state', - dictValue: '' + dictValue: '', } dictTableOption(params).then(response => { - this.statusDict = response.data; - }); + this.statusDict = response.data + }) }, /** 文件查看按钮操作 */ handleShow(row, informationType) { @@ -259,13 +248,13 @@ export default { 1: '体检文件', 2: '保险文件', 3: '特殊工种文件', - 4: '其他文件' + 4: '其他文件', } selectFile({ classification: 9, uuid: row.uuid, informationType: informationType, - fromType: 2 + fromType: 2, }).then(response => { console.log(response) if (response.data.length === 0) { @@ -275,7 +264,7 @@ export default { this.kkFilePreview = { filePreviewUrl: response.data[0].filePath, fileName: response.data[0].fileName, - showDownloadButton: false + showDownloadButton: false, } this.documentPreview = true } else { @@ -286,79 +275,90 @@ export default { }) }, /** 人员出场查询 */ - getList(){ + getList() { const proId = this.$store.state.user.thisIds.proId const consUuid = this.$store.state.user.thisIds.consUuid const supUuid = this.$store.state.user.thisIds.supUuid const userType = this.$store.state.user.userType const params = { - proId : proId, - consUuid : consUuid, + proId: proId, + consUuid: consUuid, supUuid: supUuid, - userType:userType, + userType: userType, type: '出场', enterType: '承包审核', - ...this.personQueryParams + ...this.personQueryParams, } getList(params).then(res => { this.personList = res.rows - this.total = res.total + this.personTotal = res.total this.loading = false }) }, //查询按钮 - handleQueryPerson(){ - this.personQueryParams.pageNum = 1; - this.getList(); + handleQueryPerson() { + this.personQueryParams.pageNum = 1 + this.getList() }, //重置按钮 - resetQueryPerson(){ - this.resetForm("personQueryForm"); - this.handleQueryPerson(); + resetQueryPerson() { + this.resetForm('personQueryForm') + this.handleQueryPerson() }, //审核 - handleApprove(row){ - this.$router.push("/system/subManagement-personApproval-auth/personApproval/" + encryptCBC(JSON.stringify({ - uuid:row.uuid, - taskId:row.taskId, - procInstId:row.procInsId, - contUuid:row.contUuid, - consUuid:row.consUuid, - showType:2, - isExamine:true, - btnShow:true, - finalCheck: row.finalCheck, - auditType:'出场' - }))); + handleApprove(row) { + this.$router.push( + '/system/subManagement-personApproval-auth/personApproval/' + + encryptCBC( + JSON.stringify({ + uuid: row.uuid, + taskId: row.taskId, + procInstId: row.procInsId, + contUuid: row.contUuid, + consUuid: row.consUuid, + showType: 2, + isExamine: true, + btnShow: true, + finalCheck: row.finalCheck, + auditType: '出场', + }) + ) + ) }, //查看 - handleView(row){ - this.$router.push("/system/subManagement-personApproval-auth/personApproval/" + encryptCBC(JSON.stringify({ - uuid:row.uuid, - taskId:row.taskId, - procInstId:row.procInsId, - contUuid:row.contUuid, - consUuid:row.consUuid, - showType:1, - isExamine:false, - btnShow:false, - finalCheck: row.finalCheck, - auditType:'出场' - }))); + handleView(row) { + this.$router.push( + '/system/subManagement-personApproval-auth/personApproval/' + + encryptCBC( + JSON.stringify({ + uuid: row.uuid, + taskId: row.taskId, + procInstId: row.procInsId, + contUuid: row.contUuid, + consUuid: row.consUuid, + showType: 1, + isExamine: false, + btnShow: false, + finalCheck: row.finalCheck, + auditType: '出场', + }) + ) + ) }, //审核记录 - handleAuditRecord(row){ - this.$router.push("/flow/auditRecord/" + encryptCBC(JSON.stringify({ - taskId: row.taskId, - checkType:'2' - }))); + handleAuditRecord(row) { + this.$router.push( + '/flow/auditRecord/' + + encryptCBC( + JSON.stringify({ + taskId: row.taskId, + checkType: '2', + }) + ) + ) }, - } + }, } - - - + From c8357b81bff1f3c4c28f8506320ff35603d3cf73 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 31 Mar 2025 10:43:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../testQuestionsStore/questionDetails.vue | 90 +++++---- src/views/pro/admissionRequest/index.vue | 72 ++++--- src/views/pro/apply/consEnterApply.vue | 68 ++++--- src/views/pro/apply/supervisorEnterApply.vue | 189 +++++++++--------- 4 files changed, 223 insertions(+), 196 deletions(-) diff --git a/src/views/educationalTraining/resourceAdministration/testQuestionsStore/questionDetails.vue b/src/views/educationalTraining/resourceAdministration/testQuestionsStore/questionDetails.vue index 39f80b6..6159d2c 100644 --- a/src/views/educationalTraining/resourceAdministration/testQuestionsStore/questionDetails.vue +++ b/src/views/educationalTraining/resourceAdministration/testQuestionsStore/questionDetails.vue @@ -576,56 +576,62 @@ export default { this.uploadData = [] for (let i = 0; i < jsonData.length; i++) { if ( - StrUtil.isBlank(jsonData[i][1]) || - StrUtil.isBlank(jsonData[i][2]) || - StrUtil.isBlank(jsonData[i][3]) || - StrUtil.isBlank(jsonData[i][4]) || - StrUtil.isBlank(jsonData[i][5]) + jsonData[i].length > 0 && + (StrUtil.isBlank(jsonData[i][1]) || + StrUtil.isBlank(jsonData[i][2]) || + StrUtil.isBlank(jsonData[i][3]) || + StrUtil.isBlank(jsonData[i][4]) || + StrUtil.isBlank(jsonData[i][5])) ) { this.errorLine.push(jsonData[i][0]) } else { - const answers = jsonData[i][3].split('|@|') - const questionOptionArr = jsonData[i][2].split('|@|') - mappedAnswers = answers.map(answer => { - return answer - .split('.') - .map(letter => letter.charCodeAt(0) - 65) - .join('.') - }) - for (let j = 0; j < mappedAnswers.length; j++) { - if (mappedAnswers[j] >= questionOptionArr.length) { - if (i !== 0) { - this.errorCorrectAnswers.push(jsonData[i][0]) + if (jsonData[i].length > 0) { + const answers = jsonData[i][3].split('|@|') + const questionOptionArr = jsonData[i][2].split('|@|') + mappedAnswers = answers.map(answer => { + return answer + .split('.') + .map(letter => letter.charCodeAt(0) - 65) + .join('.') + }) + for (let j = 0; j < mappedAnswers.length; j++) { + if (mappedAnswers[j] >= questionOptionArr.length) { + if (i !== 0) { + this.errorCorrectAnswers.push(jsonData[i][0]) + } } } } } - const rowData = { - questionId: jsonData[i][0], - content: jsonData[i][1], - questionAnswerVoList: jsonData[i][2], - correctAnswer: jsonData[i][3], - analysis: jsonData[i][4], - questionType: jsonData[i][5], + + if (jsonData[i].length > 0) { + const rowData = { + questionId: jsonData[i][0], + content: jsonData[i][1], + questionAnswerVoList: jsonData[i][2], + correctAnswer: jsonData[i][3], + analysis: jsonData[i][4], + questionType: jsonData[i][5], + } + this.excelData.push(rowData) + const rowDatas = { + questionId: jsonData[i][0], + content: jsonData[i][1], + questionAnswerVoList: [], + correctAnswer: mappedAnswers.join(','), + analysis: jsonData[i][4], + questionType: this.questionType[jsonData[i][5]], + } + let arr = jsonData[i][2].split('|@|') + console.log('arr', arr) + for (let j = 0; j < arr.length; j++) { + rowDatas.questionAnswerVoList.push({ + options: arr[j], + sort: j, + }) + } + this.uploadData.push(rowDatas) } - this.excelData.push(rowData) - const rowDatas = { - questionId: jsonData[i][0], - content: jsonData[i][1], - questionAnswerVoList: [], - correctAnswer: mappedAnswers.join(','), - analysis: jsonData[i][4], - questionType: this.questionType[jsonData[i][5]], - } - let arr = jsonData[i][2].split('|@|') - console.log('arr', arr) - for (let j = 0; j < arr.length; j++) { - rowDatas.questionAnswerVoList.push({ - options: arr[j], - sort: j, - }) - } - this.uploadData.push(rowDatas) } console.log('excelData：', this.excelData) if (this.excelData.length > 999) { diff --git a/src/views/pro/admissionRequest/index.vue b/src/views/pro/admissionRequest/index.vue index acbc7a8..0b548e5 100644 --- a/src/views/pro/admissionRequest/index.vue +++ b/src/views/pro/admissionRequest/index.vue @@ -892,46 +892,54 @@ export default { this.errorLine = [] let uuid = StrUtil.generateSimpleUUID() for (let i = 0; i < jsonData.length; i++) { + console.log('jsonData', jsonData) if ( - StrUtil.isBlank(jsonData[i][1]) || - StrUtil.isBlank(jsonData[i][2]) || - StrUtil.isBlank(jsonData[i][3]) || - StrUtil.isBlank(jsonData[i][4]) || - StrUtil.isBlank(jsonData[i][5]) || - StrUtil.isBlank(jsonData[i][6]) || - StrUtil.isBlank(jsonData[i][7]) || - StrUtil.isBlank(jsonData[i][8]) || - StrUtil.isBlank(jsonData[i][9]) || - StrUtil.isBlank(jsonData[i][10]) + jsonData[i].length > 0 && + (StrUtil.isBlank(jsonData[i][1]) || + StrUtil.isBlank(jsonData[i][2]) || + StrUtil.isBlank(jsonData[i][3]) || + StrUtil.isBlank(jsonData[i][4]) || + StrUtil.isBlank(jsonData[i][5]) || + StrUtil.isBlank(jsonData[i][6]) || + StrUtil.isBlank(jsonData[i][7]) || + StrUtil.isBlank(jsonData[i][8]) || + StrUtil.isBlank(jsonData[i][9]) || + StrUtil.isBlank(jsonData[i][10])) ) { this.errorLine.push(jsonData[i][0]) + + console.log('this.errorLine', this.errorLine) } else { - if (jsonData[i][10] === '特殊工种' && StrUtil.isBlank(jsonData[i][11])) { + if (jsonData[i].length > 0 && jsonData[i][10] === '特殊工种' && StrUtil.isBlank(jsonData[i][11])) { this.errorLine.push(jsonData[i][0]) + console.log('this.errorLine', this.errorLine) } } - const rowData = { - arg0: jsonData[i][0], - arg1: jsonData[i][1], - arg2: jsonData[i][2], - arg3: jsonData[i][3], - arg4: jsonData[i][4], - arg5: jsonData[i][5], - arg6: jsonData[i][6], - arg7: jsonData[i][7], - arg8: jsonData[i][8], - arg9: jsonData[i][9], - arg10: jsonData[i][10], - arg11: jsonData[i][11], - uuid: uuid, - personType: jsonData[i][10] === '特殊工种' ? '1' : jsonData[i][10] === '普通职工' ? '2' : '0', - sex: jsonData[i][2] === '男' ? '0' : '1', + + if (jsonData[i].length > 0) { + const rowData = { + arg0: jsonData[i][0], + arg1: jsonData[i][1], + arg2: jsonData[i][2], + arg3: jsonData[i][3], + arg4: jsonData[i][4], + arg5: jsonData[i][5], + arg6: jsonData[i][6], + arg7: jsonData[i][7], + arg8: jsonData[i][8], + arg9: jsonData[i][9], + arg10: jsonData[i][10], + arg11: jsonData[i][11], + uuid: uuid, + personType: jsonData[i][10] === '特殊工种' ? '1' : jsonData[i][10] === '普通职工' ? '2' : '0', + sex: jsonData[i][2] === '男' ? '0' : '1', + } + const isDuplicate = this.excelData.some(item => item.arg4 === rowData.arg4) + if (isDuplicate) { + this.errorPhone.push(rowData.arg4) + } + this.excelData.push(rowData) } - const isDuplicate = this.excelData.some(item => item.arg4 === rowData.arg4) - if (isDuplicate) { - this.errorPhone.push(rowData.arg4) - } - this.excelData.push(rowData) } if (this.excelData.length > 999) { this.$message.warning('数据量大于1000行') diff --git a/src/views/pro/apply/consEnterApply.vue b/src/views/pro/apply/consEnterApply.vue index 9a88d02..ef87220 100644 --- a/src/views/pro/apply/consEnterApply.vue +++ b/src/views/pro/apply/consEnterApply.vue @@ -2143,45 +2143,49 @@ export default { let uuid = StrUtil.generateSimpleUUID() for (let i = 0; i < jsonData.length; i++) { if ( - StrUtil.isBlank(jsonData[i][1]) || - StrUtil.isBlank(jsonData[i][2]) || - StrUtil.isBlank(jsonData[i][3]) || - StrUtil.isBlank(jsonData[i][4]) || - StrUtil.isBlank(jsonData[i][5]) || - StrUtil.isBlank(jsonData[i][6]) || - StrUtil.isBlank(jsonData[i][7]) || - StrUtil.isBlank(jsonData[i][8]) || - StrUtil.isBlank(jsonData[i][9]) || - StrUtil.isBlank(jsonData[i][10]) + jsonData[i].length > 0 && + (StrUtil.isBlank(jsonData[i][1]) || + StrUtil.isBlank(jsonData[i][2]) || + StrUtil.isBlank(jsonData[i][3]) || + StrUtil.isBlank(jsonData[i][4]) || + StrUtil.isBlank(jsonData[i][5]) || + StrUtil.isBlank(jsonData[i][6]) || + StrUtil.isBlank(jsonData[i][7]) || + StrUtil.isBlank(jsonData[i][8]) || + StrUtil.isBlank(jsonData[i][9]) || + StrUtil.isBlank(jsonData[i][10])) ) { this.errorLine.push(jsonData[i][0]) } else { - if (jsonData[i][10] === '特殊工种' && StrUtil.isBlank(jsonData[i][11])) { + if (jsonData[i][10] === '特殊工种' && StrUtil.isBlank(jsonData[i][11]) && jsonData[i].length > 0) { this.errorLine.push(jsonData[i][0]) } } - const rowData = { - arg0: jsonData[i][0], - arg1: jsonData[i][1], - arg2: jsonData[i][2], - arg3: jsonData[i][3], - arg4: jsonData[i][4], - arg5: jsonData[i][5], - arg6: jsonData[i][6], - arg7: jsonData[i][7], - arg8: jsonData[i][8], - arg9: jsonData[i][9], - arg10: jsonData[i][10], - arg11: jsonData[i][11], - uuid: uuid, - personType: jsonData[i][10] === '特殊工种' ? '1' : jsonData[i][10] === '普通职工' ? '2' : '0', - sex: jsonData[i][2] === '男' ? '0' : '1', + + if (jsonData[i].length > 0) { + const rowData = { + arg0: jsonData[i][0], + arg1: jsonData[i][1], + arg2: jsonData[i][2], + arg3: jsonData[i][3], + arg4: jsonData[i][4], + arg5: jsonData[i][5], + arg6: jsonData[i][6], + arg7: jsonData[i][7], + arg8: jsonData[i][8], + arg9: jsonData[i][9], + arg10: jsonData[i][10], + arg11: jsonData[i][11], + uuid: uuid, + personType: jsonData[i][10] === '特殊工种' ? '1' : jsonData[i][10] === '普通职工' ? '2' : '0', + sex: jsonData[i][2] === '男' ? '0' : '1', + } + const isDuplicate = this.excelData.some(item => item.arg4 === rowData.arg4) + if (isDuplicate) { + this.errorPhone.push(rowData.arg4) + } + this.excelData.push(rowData) } - const isDuplicate = this.excelData.some(item => item.arg4 === rowData.arg4) - if (isDuplicate) { - this.errorPhone.push(rowData.arg4) - } - this.excelData.push(rowData) } if (this.excelData.length > 999) { this.$message.warning('数据量大于1000行') diff --git a/src/views/pro/apply/supervisorEnterApply.vue b/src/views/pro/apply/supervisorEnterApply.vue index 029afb9..64dfebc 100644 --- a/src/views/pro/apply/supervisorEnterApply.vue +++ b/src/views/pro/apply/supervisorEnterApply.vue @@ -981,8 +981,12 @@ export default { uuid: this.$store.state.user.thisIds.uuid, parentUuid: this.$store.state.user.thisIds.parentUuid, } - if (this.formData.enterpriseQualificationFiles.length === 0 || this.formData.securityAgreementFiles.length === 0 || - this.formData.supervisionPlanningFiles.length === 0 || this.formData.implementationRulesFiles.length === 0) { + if ( + this.formData.enterpriseQualificationFiles.length === 0 || + this.formData.securityAgreementFiles.length === 0 || + this.formData.supervisionPlanningFiles.length === 0 || + this.formData.implementationRulesFiles.length === 0 + ) { this.$message({ message: '请先上传企业资质、安全协议书、监理规划、实施细则文件！', type: 'error', @@ -997,7 +1001,7 @@ export default { if (response.msg === '部分人员文件不存在，请先仔细核对，上传相关文件！') { this.$message({ message: '部分人员文件不存在，请先仔细核对，上传相关文件！', - type: 'error' + type: 'error', }) // return false isReturn = true @@ -1005,77 +1009,78 @@ export default { } catch (error) { this.$message({ message: '文件检查失败，请稍后重试！', - type: 'error' + type: 'error', }) // return false } } - if(isReturn) return - this.$refs[formName].validate(valid => { - if (submitType === '提交' && !valid) { - return this.$modal.msgError('请完善全部上传信息') - } - console.log(this.formData) - const reqData = new FormData() - this.formData.proId = this.$store.state.user.thisIds.proId - this.formData.supId = this.$store.state.user.thisIds.supId - this.formData.supUuid = this.$store.state.user.thisIds.supUuid - this.formData.uuid = this.$store.state.user.thisIds.uuid - this.formData.delFileIds = this.delFileIds.join(',') - this.formData.submitType = submitType - reqData.append('params', JSON.stringify(this.formData)) + if (isReturn) return + this.$refs[formName].validate(valid => { + if (submitType === '提交' && !valid) { + return this.$modal.msgError('请完善全部上传信息') + } + console.log(this.formData) + const reqData = new FormData() + this.formData.proId = this.$store.state.user.thisIds.proId + this.formData.supId = this.$store.state.user.thisIds.supId + this.formData.supUuid = this.$store.state.user.thisIds.supUuid + this.formData.uuid = this.$store.state.user.thisIds.uuid + this.formData.delFileIds = this.delFileIds.join(',') + this.formData.submitType = submitType + reqData.append('params', JSON.stringify(this.formData)) - // 使用 Promise.all 并行处理文件数据获取，提高效率 - Promise.all([ - this.getFileData(this.formData.enterpriseQualificationFiles), - this.getFileData(this.formData.securityAgreementFiles), - this.getFileData(this.formData.supervisionPlanningFiles), - this.getFileData(this.formData.implementationRulesFiles), - ]).then( - ([ - enterpriseQualificationFiles, - securityAgreementFiles, - supervisionPlanningFiles, - implementationRulesFiles, - ]) => { - if (!enterpriseQualificationFiles || enterpriseQualificationFiles.length === 0) { - reqData.append('enterpriseQualificationFiles', new Blob()) - } else { - enterpriseQualificationFiles.forEach(item => reqData.append('enterpriseQualificationFiles', item)) - } - if (!securityAgreementFiles || securityAgreementFiles.length === 0) { - reqData.append('securityAgreementFiles', new Blob()) - } else { - securityAgreementFiles.forEach(item => reqData.append('securityAgreementFiles', item)) - } - if (!supervisionPlanningFiles || supervisionPlanningFiles.length === 0) { - reqData.append('supervisionPlanningFiles', new Blob()) - } else { - supervisionPlanningFiles.forEach(item => reqData.append('supervisionPlanningFiles', item)) - } - if (!implementationRulesFiles || implementationRulesFiles.length === 0) { - reqData.append('implementationRulesFiles', new Blob()) - } else { - implementationRulesFiles.forEach(item => reqData.append('implementationRulesFiles', item)) - } - addSupervisoryApply(reqData) - .then(response => { - if (submitType === '提交') { - this.submitApply() - } else { - this.loading = false - this.$modal.msgSuccess('保存成功') - this.$tab.closePage() - } - }) - .catch(error => { - // 增加错误处理 - this.loading = false - this.$modal.msgError('提交失败') - }) - }) - }) + // 使用 Promise.all 并行处理文件数据获取，提高效率 + Promise.all([ + this.getFileData(this.formData.enterpriseQualificationFiles), + this.getFileData(this.formData.securityAgreementFiles), + this.getFileData(this.formData.supervisionPlanningFiles), + this.getFileData(this.formData.implementationRulesFiles), + ]).then( + ([ + enterpriseQualificationFiles, + securityAgreementFiles, + supervisionPlanningFiles, + implementationRulesFiles, + ]) => { + if (!enterpriseQualificationFiles || enterpriseQualificationFiles.length === 0) { + reqData.append('enterpriseQualificationFiles', new Blob()) + } else { + enterpriseQualificationFiles.forEach(item => reqData.append('enterpriseQualificationFiles', item)) + } + if (!securityAgreementFiles || securityAgreementFiles.length === 0) { + reqData.append('securityAgreementFiles', new Blob()) + } else { + securityAgreementFiles.forEach(item => reqData.append('securityAgreementFiles', item)) + } + if (!supervisionPlanningFiles || supervisionPlanningFiles.length === 0) { + reqData.append('supervisionPlanningFiles', new Blob()) + } else { + supervisionPlanningFiles.forEach(item => reqData.append('supervisionPlanningFiles', item)) + } + if (!implementationRulesFiles || implementationRulesFiles.length === 0) { + reqData.append('implementationRulesFiles', new Blob()) + } else { + implementationRulesFiles.forEach(item => reqData.append('implementationRulesFiles', item)) + } + addSupervisoryApply(reqData) + .then(response => { + if (submitType === '提交') { + this.submitApply() + } else { + this.loading = false + this.$modal.msgSuccess('保存成功') + this.$tab.closePage() + } + }) + .catch(error => { + // 增加错误处理 + this.loading = false + this.$modal.msgError('提交失败') + }) + } + ) + }) }, /** * 提交审批 @@ -1383,32 +1388,36 @@ export default { let uuid = StrUtil.generateSimpleUUID() for (let i = 0; i < jsonData.length; i++) { if ( - StrUtil.isBlank(jsonData[i][1]) || - StrUtil.isBlank(jsonData[i][2]) || - StrUtil.isBlank(jsonData[i][3]) || - StrUtil.isBlank(jsonData[i][4]) || - StrUtil.isBlank(jsonData[i][5]) || - StrUtil.isBlank(jsonData[i][6]) + jsonData[i].length > 0 && + (StrUtil.isBlank(jsonData[i][1]) || + StrUtil.isBlank(jsonData[i][2]) || + StrUtil.isBlank(jsonData[i][3]) || + StrUtil.isBlank(jsonData[i][4]) || + StrUtil.isBlank(jsonData[i][5]) || + StrUtil.isBlank(jsonData[i][6])) ) { this.errorLine.push(jsonData[i][0]) } - const rowData = { - arg0: jsonData[i][0], - arg1: jsonData[i][1], - arg2: jsonData[i][2], - arg3: jsonData[i][3], - arg4: jsonData[i][4], - arg5: jsonData[i][5], - arg6: jsonData[i][6], - uuid: uuid, - personType: jsonData[i][6] === '监理负责人' ? '1' : '2', - sex: jsonData[i][2] === '男' ? '0' : '1', + + if (jsonData[i].length > 0) { + const rowData = { + arg0: jsonData[i][0], + arg1: jsonData[i][1], + arg2: jsonData[i][2], + arg3: jsonData[i][3], + arg4: jsonData[i][4], + arg5: jsonData[i][5], + arg6: jsonData[i][6], + uuid: uuid, + personType: jsonData[i][6] === '监理负责人' ? '1' : '2', + sex: jsonData[i][2] === '男' ? '0' : '1', + } + const isDuplicate = this.excelData.some(item => item.arg5 === rowData.arg5) + if (isDuplicate) { + this.errorPhone.push(rowData.arg5) + } + this.excelData.push(rowData) } - const isDuplicate = this.excelData.some(item => item.arg5 === rowData.arg5) - if (isDuplicate) { - this.errorPhone.push(rowData.arg5) - } - this.excelData.push(rowData) } if (this.excelData.length > 999) { this.$message.warning('数据量大于1000行') From 30994514a57c07c8c1f9c6a614b16e11ef005903 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 31 Mar 2025 11:12:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pro-tabs/bns-timeline-tabs.vue | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/components/pro-tabs/bns-timeline-tabs.vue b/src/components/pro-tabs/bns-timeline-tabs.vue index fcb486b..d1513bf 100644 --- a/src/components/pro-tabs/bns-timeline-tabs.vue +++ b/src/components/pro-tabs/bns-timeline-tabs.vue @@ -10,7 +10,7 @@
-1) return 'currentGary' + if (item.auditStatus == 4 && this.endAuditingIndex < 0) return 'currentLight' } }, @@ -232,7 +233,13 @@ export default { watch: { items: { handler: function (val) { - console.log('=----------------', val) + console.log('=----------------items9996', val) + + const endIndex = val.findIndex(item => item.status === '终审通过') + this.endAuditingIndex = endIndex + if (endIndex > -1) { + this.auditRecordList = val.slice(0, endIndex + 1) + } }, deep: true, }, @@ -267,6 +274,10 @@ export default { code: 1, num: 0, assignNum: 0, + + // 3.31更改bug新增 + auditRecordList: [], + endAuditingIndex: -1, } }, mounted() { @@ -428,6 +439,18 @@ export default { border-radius: 5px; background: #f56c6c; } +.currentGary { + /* Add any specific styles for the highlighted state */ + padding: 8px; + /* border: 1px solid green; */ + width: 50%; + text-align: center; + height: 50px; + font-size: 14px; + margin-top: 2px; + border-radius: 5px; + background: rgb(153, 153, 153); +} .currentLight { /* Add any specific styles for the highlighted state */ padding: 8px; From 3435d267e573f4123bf6d3af856d409c093f9b6f Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 31 Mar 2025 11:16:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pro-tabs/bns-timeline-tabs.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/pro-tabs/bns-timeline-tabs.vue b/src/components/pro-tabs/bns-timeline-tabs.vue index d1513bf..3d7dfe4 100644 --- a/src/components/pro-tabs/bns-timeline-tabs.vue +++ b/src/components/pro-tabs/bns-timeline-tabs.vue @@ -225,8 +225,8 @@ export default { return (item, index) => { if (item.auditStatus == 1 || item.auditStatus == 3) return '√' if (item.auditStatus == 2) return 'X' - if (item.auditStatus == null) return '' - if (item.auditStatus == 4) return '?' + if (item.auditStatus == null || this.endAuditingIndex > -1) return '' + if (item.auditStatus == 4 && this.endAuditingIndex < 0) return '?' } }, },