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', + }) + ) + ) }, - } + }, } - - - +