diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 009b2f163..c66e7ce3d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -86,7 +86,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String inventoryAffirmStatus; @TableField(exist = false) - @Excel(name = "清单确认状态", width = 20) + // @Excel(name = "清单确认状态", width = 20) @ApiModelProperty(value = "清单确认状态名称") private String inventoryAffirmStatusName;//清单确认状态名称 @@ -96,7 +96,7 @@ public class ProjectLawsInventoryEO implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "任务发布状态名称") - @Excel(name = "任务确认状态", width = 20) + // @Excel(name = "任务确认状态", width = 20) private String taskAffirmStatusName;//任务发布状态名称 /**适用地区*/ @@ -274,7 +274,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认") +// @Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认") @ApiModelProperty(value = "prehomo确认-1") ////@Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -289,7 +289,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-交付物模板名称*/ @TableField(exist = false) - @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认") +// @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认") private String prehomoDeliverableTemplateName; /**prehomo确认-发起人角色*/ @@ -305,7 +305,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoInitiatorId; /**prehomo确认-发起人名称*/ - @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认") +// @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认") @TableField(exist = false) private String prehomoInitiatorName; @@ -322,12 +322,12 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoDutyId; /**prehomo确认-责任人名称*/ - @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认") +// @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认") @TableField(exist = false) private String prehomoDutyName; /**prehomo确认-截止时间*/ - @Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认") +// @Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "prehomo确认-截止时间") @@ -337,7 +337,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String prehomoDueDateString; //prehomo确认-交付物说明 - @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认") +// @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认") private String prehomoRemark; /**验证符合性确认-交付物类型*/ @@ -488,12 +488,14 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "设计符合性确认-流程状态") private String designFlowStatus; @TableField(exist = false) + @Excel(name = "流程状态", width = 20,groupName = "设计符合性确认") private String designFlowStatusName; /**验证符合性确认-流程状态*/ @ApiModelProperty(value = "验证符合性确认-流程状态") private String verifyFlowStatus; @TableField(exist = false) + @Excel(name = "流程状态", width = 20,groupName = "验证符合性确认") private String verifyFlowStatusName; /**验证符合性确认-流程实例id*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java index 9653db607..d380e7c48 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java @@ -85,7 +85,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String inventoryAffirmStatus; @TableField(exist = false) - @Excel(name = "List Confirmation Status", width = 30) +// @Excel(name = "List Confirmation Status", width = 30) @ApiModelProperty(value = "清单确认状态名称") private String inventoryAffirmStatusName;//清单确认状态名称 @@ -95,7 +95,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "任务发布状态名称") - @Excel(name = "Task Confirmation Status", width = 30) +// @Excel(name = "Task Confirmation Status", width = 30) private String taskAffirmStatusName;//任务发布状态名称 /**适用地区*/ @@ -245,7 +245,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check") +// @Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check") @ApiModelProperty(value = "prehomo确认-1") @Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -256,7 +256,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { /**prehomo确认-交付物模板名称*/ @TableField(exist = false) - @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check") +// @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check") private String prehomoDeliverableTemplateName; /**prehomo确认-发起人角色*/ @@ -269,7 +269,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoInitiatorId; /**prehomo确认-发起人名称*/ - @Excel(name = "Reviewer", width = 25,groupName = "Pre-homo Check") +// @Excel(name = "Reviewer", width = 25,groupName = "Pre-homo Check") @TableField(exist = false) private String prehomoInitiatorName; @@ -283,12 +283,12 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoDutyId; /**prehomo确认-责任人名称*/ - @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check") +// @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check") @TableField(exist = false) private String prehomoDutyName; /**prehomo确认-截止时间*/ - @Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check") +// @Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "prehomo确认-截止时间") @@ -297,7 +297,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String prehomoDueDateString; //prehomo确认-交付物说明 - @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check") +// @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check") private String prehomoRemark; /**验证符合性确认-交付物类型*/ @@ -411,5 +411,14 @@ public class ProjectLawsInventoryEOEn implements Serializable { @ApiModelProperty(value = "调取虚拟清单,虚拟清单中维护数据为空时,进行二次确认") private String flag; + /**设计符合性确认-流程状态*/ + @TableField(exist = false) + @Excel(name = "Process Status", width = 25,groupName = "Design Compliance Check") + private String designFlowStatusName; + + /**验证符合性确认-流程状态*/ + @TableField(exist = false) + @Excel(name = "Process Status", width = 25,groupName = "Validation Compliance Check") + private String verifyFlowStatusName; } 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 984e31674..3709ca323 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 @@ -3732,11 +3732,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 1) { + this.$message.warning(this.$t('onlyOnePersonCanBeSelected')) + return + } + } if (this.userIds && this.userIds.length > 0) { this.submitLoading = true this.$emit('SelectedByForm', this.userIds.join(',')) @@ -131,11 +141,13 @@ this.confirmLoading = true postAction('sys/user/queryDepartUserTreeList', { departId: this.departId, - json: gData + json: gData, + flag:'1' }).then((res) => { this.confirmLoading = false if (res.success) { this.gData = res.result + this.gData = [...this.gData] this.defaultExpandedKeys = [this.departId] this.visibleTree = true } else { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index daaef057c..463a8fa54 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -399,7 +399,8 @@ - + diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 4a68009ff..ce68da751 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -502,6 +502,39 @@ + + + + + + {{ $t('See') }} + + + {{ $t('download') }} + + + + {{ $t('dataLoading') }} {{ $t('Submitting') }} @@ -1357,7 +1390,7 @@ this.$message.warning(this.$t('OnlyOneSelected')) } else { let serialNumber = this.selectedRowKeysList[0].serialNumber - downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('compliancereport') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') }) + downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') }) } }, @@ -2503,7 +2536,30 @@ }, viewFileClick(item) { this.$refs.viewFileModelRef.clickButtonToUpload(item) - } + }, + pdfPreview(fileQuery) { + let fileName = fileQuery.fileName + let index1 = fileName.lastIndexOf('.') + 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)) + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else { + downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) + } + }, + download(item) { + downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) + }, } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 230759ce6..67f882593 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -88,7 +88,8 @@ - +