diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 68a77aaf5..e2ca5fee7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,13 +1,13 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), - LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), - DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Check"), - ATTESTATION_START_TIME("认证开始","Certification start"), - ATTESTATION_END_TIME("认证结束"," Certification end"), - VERIFY_DEADLINE("验证符合性确认","Verification compliance confirmation deadline"), + LIST_CONFIRMATION("清单确认"," Checklist confirmation"), + LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"), + DESIGN_DEADLINE("设计符合性","Design compliance"), + PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), + ATTESTATION_START_TIME("认证开始","Certification begins"), + ATTESTATION_END_TIME("认证结束"," End of certification"), + VERIFY_DEADLINE("验证符合性","Verify compliance"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index edf6d31e5..df6a21678 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -153,12 +153,14 @@ public class InventoryAffirmJob implements Job { + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + projectYearNameInfoEO.getYearName() + + "&targetMarket=" + projectLibraryBase.getTargetMarket(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -188,12 +190,14 @@ public class InventoryAffirmJob implements Job { + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName(); + + projectYearNameInfoEO.getYearName() + + "&targetMarket=" + projectLibraryBase.getTargetMarket(); //系统内部跳转链接 String href = "" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 7afe0b528..bdec38953 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1280,12 +1280,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); @@ -6034,12 +6036,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 4f49c8528..737553a5e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -363,12 +363,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0e901fa6d..41b87f1a5 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -945,5 +945,6 @@ module.exports = { ConfirmQuestion: 'Confirm Question', disableInput: 'Disable input', taskConfirmationDeadline: 'Task Confirmation Deadline', - OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' + OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', + taskConfirmationResponsiblePerson:'Task confirmation of responsible person', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index a0b80bb3f..aa9ca6c43 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -951,4 +951,5 @@ module.exports = { OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', disableInput:'禁止输入', taskConfirmationDeadline:'任务确认截止时间', + taskConfirmationResponsiblePerson:'责任人任务确认', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 10218429b..81bd4cca4 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -215,9 +215,13 @@ :title="$t('viewFile')" :width="500" :visible="visible" - @ok="visible=false" @cancel="visible=false" > +

{{ item.fileName }}

diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index 035bf7a3b..cfbefa921 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -16,7 +16,7 @@ - {{$t('agree')}} + {{$t('accept')}} {{$t('disagree')}} diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 35702349f..68b7dca7e 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -126,7 +126,7 @@ if (this.$route.query.taskDefinitionKey == 'dreqr') { this.titleName = this.$t('engineerReply') } else { - this.titleName = this.$t('confirmationEngineeringInterfacePerson') + this.titleName = this.$t('taskConfirmationResponsiblePerson') } this.queryTaskDetailByTask(function() { _this.queryProjectLawsInventoryInfo() @@ -195,17 +195,17 @@ this.$message.success(this.$t('OperationSuccessful')) if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') { if (value.flag == 0) { - if (this.queryProject.verifyDeliverableType) { + if (this.queryProject.verifyRemark) { this.startProcessDesign(this.queryBy, 4) } - if (this.queryProject.prehomoDeliverableType) { + if (this.queryProject.prehomoRemark) { this.startProcessDesign(this.queryBy, 3) } - if (this.queryProject.designDeliverableType) { + if (this.queryProject.designRemark) { this.startProcessDesign(this.queryBy, 2) } - if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType && - !this.queryProject.designDeliverableType) { + if (!this.queryProject.verifyRemark && !this.queryProject.prehomoRemark && + !this.queryProject.designRemark) { setTimeout(() => { this.loading = false window.close() diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 426453fad..cf0bb743c 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -320,15 +320,18 @@ putAction(this.url.dreSubmit, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - // this.$router.push({ - // path: '/ProjectDetails', - // query: this.$route.query - // }) - setTimeout(() => { - this.loading = false - window.close() - }, 1000) + this.$router.push({ + path: '/ProjectDetails', + query: { + type:'103', + ...this.$route.query + } + }) + // setTimeout(() => { + // this.loading = false + // window.close() + // }, 1000) } else { this.loading = false this.$message.warning(this.$t('operationFailed')) @@ -347,10 +350,6 @@ if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.edit() - // this.$router.push({ - // path: '/ProjectDetails', - // query: this.$route.query - // }) } else { this.loading = false this.$message.warning(this.$t('operationFailed')) @@ -366,7 +365,13 @@ if (res.success) { setTimeout(() => { this.loading = false - window.close() + this.$router.push({ + path: '/ProjectDetails', + query: { + type:'103', + ...this.$route.query + } + }) }, 1000) } }) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 813e3e071..b8ad627a7 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1319,36 +1319,39 @@ if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'Rejected') && this.dataSource[i].inventoryAffirmStatus == 'Accepted') { if (this.dataSource[i].engineeringInterfacePerson) { - if ((this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId - && this.dataSource[i].verifyInitiatorId && this.dataSource[i].verifyDeliverableType) || - (!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId - && !this.dataSource[i].verifyInitiatorId && !this.dataSource[i].verifyDeliverableType)) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) - return + if (this.dataSource[i].verifyRemark) { + if (this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId + && this.dataSource[i].verifyInitiatorId) { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) + return + } } - if ((this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId - && this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) || - (!this.dataSource[i].prehomoDueDate && !this.dataSource[i].prehomoDutyId - && !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) - return + + if (this.dataSource[i].prehomoRemark) { + if (this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId + && this.dataSource[i].prehomoInitiatorId) { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) + return + } } - if ((this.dataSource[i].designDueDate && this.dataSource[i].designDutyId - && this.dataSource[i].designInitiatorId && this.dataSource[i].designDeliverableType) || - (!this.dataSource[i].designDueDate && !this.dataSource[i].designDutyId - && !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) - return + + if (this.dataSource[i].designRemark) { + if (this.dataSource[i].designDueDate && this.dataSource[i].designDutyId + && this.dataSource[i].designInitiatorId) { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) + return + } } + } else { isTrue = false this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty')) @@ -1596,7 +1599,7 @@ let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) } else if (fileSuffix == '.docx') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') @@ -1614,7 +1617,7 @@ let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id+'&userName='+this.userInfo().username)) + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id + '&userName=' + this.userInfo().username)) } else if (fileSuffix == '.docx') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') @@ -1622,12 +1625,12 @@ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') } else { - downloadFile('/sys/common/downLoadFile', name, { id: id ,userName:this.userInfo().username}) + downloadFile('/sys/common/downLoadFile', name, { id: id, userName: this.userInfo().username }) } }, download(item) { - downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id ,userName:this.userInfo().username}) + downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) }, clickButtonToUpload(item, num) {