diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java index aaa0124f4..3f12952e8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java @@ -1272,7 +1272,9 @@ public class ProjectLawsInventoryEOEditServiceImpl { params.put("contentEn", contentEn); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); params.put("endTime", endTime); - params.put("userIdList", userIdList); + List userIdListArr = new ArrayList<>(); + userIdListArr.add(userIdList); + params.put("userIdList", userIdListArr); params.put("serialNumbers", projectLawsInventoryEO.getSerialNumber()); String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index a76a38c4e..fdac5a6b0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -560,7 +560,7 @@ - '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' + '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'{{$t('or')}}'{{$t('alteration')}}' @@ -1685,6 +1685,7 @@ // 填写人 引用参数 权限 // 仅仅状态为 待填写 认证工程师退回 可以引用参数 dreJurisdictionreferenceParameter() { + console.log(123) this.NotSelectedRowKeysValue = [] let flag = 1 if (this.selectedRowKeysValue.length == 0) { @@ -1692,7 +1693,8 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') { + if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' + && item.state !== 'Rejected by homo engineer' && item.state !== '变更' && item.state !== 'Modify') { this.NotSelectedRowKeysValue.push(item) flag = 0 }