diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index aaae03a61..521c8f85e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -115,7 +115,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl baseIdList = Arrays.asList(dummyInventoryBaseEO.getId().split(",")); + List baseEOList = listByIds(baseIdList); List createByNameList =new ArrayList<>(); if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) { createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(",")); @@ -124,14 +125,19 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl 1) { + this.$message.warning(this.$t('onlyOnePersonCanBeSelected')) + return + } else if (this.userName.length == 0) { + this.$message.warning(this.$t('pleaseSelectPersonFirst')) + return + } let query = { id: this.tableKey, createBy: this.userName.join(',') diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 152e4189d..3b845cad6 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -70,6 +70,7 @@ + @@ -103,6 +104,7 @@ isDisplayNum: '', textTitle: '', isTrue: true, + loading: false, url: { logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '', @@ -224,10 +226,14 @@ postAction('/project/projectRelatedPersonnel/page', query).then((res) => { if (res.success) { let dataSource = res.result || [] + console.log(dataSource) dataSource.forEach(res => { - this.engineeringInterfacePerson += res.engineeringInterfacePerson + ',' + if (res.engineeringInterfacePerson || res.certificationEngineer || res.lawEngineer) { + this.engineeringInterfacePerson += res.engineeringInterfacePerson + ',' + res.certificationEngineer + ',' + res.lawEngineer + ',' + } }) - if (this.engineeringInterfacePerson.includes(this.userInfo().id)) { + if (this.engineeringInterfacePerson.includes(this.userInfo().id) || + this.$route.query.studioEngineer == this.userInfo().id) { this.isTrue = true } else { this.isTrue = false @@ -235,8 +241,10 @@ this.$nextTick(() => { this.textColor(0) }) + this.loading = false } else { this.textColor(0) + this.loading = false } }) }, @@ -264,6 +272,7 @@ .doc-detail { background: #fff; height: 100%; + position: relative; .Virtual-detail-header { width: 100%;