WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
wangzhijiang
2022-08-23 10:10:59 +08:00
parent f73f3efbcb 00c164bb48
commit 35efbcea00
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+5 -5
View File
@@ -495,20 +495,20 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
Map<String, String> msgMap = new HashMap<>(); Map<String, String> msgMap = new HashMap<>();
if ("1".equals(operation)) { 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()); msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber());
msgMapList.add(msgMap);
} }
} else if ("2".equals(operation)) { } 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.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)
|| ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) {
msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber());
msgMapList.add(msgMap);
} }
} }
msgMapList.add(msgMap);
} }
return getMsg(msgMapList, cut, operation); return getMsg(msgMapList, cut, operation);
jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
+1 -1
View File
@@ -217,7 +217,7 @@
}, },
{ {
title: this.$t('feedbackTime'), title: this.$t('feedbackTime'),
dataIndex: 'createTime', dataIndex: 'updateTime',
align: 'center', align: 'center',
ellipsis: true, ellipsis: true,
width: 160 width: 160
jero-web/src/views/projectManagement/components/TaskList.vue
+2 -2
View File
@@ -553,7 +553,7 @@
} }
postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
if (res.success) { if (res.success) {
if(res.result == []){ if(res.result.length == 0){
this.$refs.batchModelRef.getData(this.selectedRowKeys) this.$refs.batchModelRef.getData(this.selectedRowKeys)
}else{ }else{
this.NotSelectedNoEngineerValue = res.result this.NotSelectedNoEngineerValue = res.result
@@ -587,7 +587,7 @@
} }
postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
if (res.success) { if (res.success) {
if(res.result == []){ if(res.result.length == 0){
this.$refs.batchChangeModelRef.getData(this.selectionRowsArray) this.$refs.batchChangeModelRef.getData(this.selectionRowsArray)
}else{ }else{
this.NotSelectedNoEngineerValue = res.result this.NotSelectedNoEngineerValue = res.result