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 9b8c9ac10..029bd88d1 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 @@ -495,20 +495,20 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl msgMap = new HashMap<>(); if ("1".equals(operation)) { - if (! ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)) { + if (! (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) + || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); - + msgMapList.add(msgMap); } } else if ("2".equals(operation)) { - if (!(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) + if (!(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(roleCode) || ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); - + msgMapList.add(msgMap); } } - msgMapList.add(msgMap); } return getMsg(msgMapList, cut, operation); diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index d32d78d9d..73673f51d 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -217,7 +217,7 @@ }, { title: this.$t('feedbackTime'), - dataIndex: 'createTime', + dataIndex: 'updateTime', align: 'center', ellipsis: true, width: 160 diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 4f7b2c2a4..7aa780bb2 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -553,7 +553,7 @@ } postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { if (res.success) { - if(res.result == []){ + if(res.result.length == 0){ this.$refs.batchModelRef.getData(this.selectedRowKeys) }else{ this.NotSelectedNoEngineerValue = res.result @@ -587,7 +587,7 @@ } postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { if (res.success) { - if(res.result == []){ + if(res.result.length == 0){ this.$refs.batchChangeModelRef.getData(this.selectionRowsArray) }else{ this.NotSelectedNoEngineerValue = res.result