diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 7187296a0..f875ee776 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -198,7 +198,7 @@ public class ParamsReportEOController extends JeroController { @TableField(exist = false) private String brandText; + @TableField(exist = false) + private String brandTextEn; @Override public int compareTo(ProjectLibraryBase o) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProcessControlButtonTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProcessControlButtonTypeEnum.java new file mode 100644 index 000000000..2f73bcb1d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProcessControlButtonTypeEnum.java @@ -0,0 +1,34 @@ +package com.jero.modules.project.enums; + +public enum ProcessControlButtonTypeEnum { + + LawsOpinionGather("法规意见收集","LawsOpinionGather"), + LawsTechnologyEvaluation("法规技术评估","LawsTechnologyEvaluation"); + + String label; + String value; + + ProcessControlButtonTypeEnum() { + } + + ProcessControlButtonTypeEnum(String label, String value) { + this.label = label; + this.value = value; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index f394e4d62..26e42dd5a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -52,7 +52,8 @@ plb.sort, plb.flag, plb.brand, - sdi.item_text brandText + sdi.item_text brandText, + sdi.en_name brandTextEn from project_library_base as plb left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id @@ -227,6 +228,11 @@ and plb.project_status like concat('%',#{projectLibraryBase.projectStatus},'%') + + + and plb.brand = #{projectLibraryBase.brand} + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java index 7bbcd028e..eb0ad17e7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java @@ -73,4 +73,11 @@ public interface IProjectUserPermissionService extends IService for (NcrTrackVO trackVO : infoList) { String projectName = trackVO.getProjectName(); String yearName = trackVO.getYearName(); - String market = getMarket(targetMarketList, trackVO); + String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut()); String projectVersion = trackVO.getProjectVersion(); if(StringUtils.isNotBlank(projectVersion)){ trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion); @@ -296,7 +296,7 @@ public class NcrTrackServiceImpl extends ServiceImpl } } - private String getMarket(List targetMarketList, NcrTrackVO trackVO) { + private String getMarket(List targetMarketList, NcrTrackVO trackVO,String cut) { //目标市场 List dictModelList = new ArrayList<>(); for (String s : trackVO.getTargetMarket().split(",")) { @@ -308,7 +308,7 @@ public class NcrTrackServiceImpl extends ServiceImpl if(dictModelList.size() != 0){ StringBuilder sb = new StringBuilder(); for (DictModel dictModel : dictModelList) { - if(CutEnum.CN.getValue().equals(trackVO.getCut())){ + if(CutEnum.CN.getValue().equals(cut)){ sb.append(dictModel.getText()+","); }else{ sb.append(dictModel.getTextEn()+","); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 77c0e4c95..a63cbbc76 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -4,23 +4,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ConditionAssessmentEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskInventoryEO; -import com.jero.modules.project.enums.CertificationProgressEnum; -import com.jero.modules.project.enums.CurrentProjectStatusEnum; -import com.jero.modules.project.enums.InventoryAffirmStatusEnum; -import com.jero.modules.project.enums.ReviewResultEnum; -import com.jero.modules.project.enums.TaskAffirmStatusEnum; +import com.jero.modules.project.enums.*; +import com.jero.modules.project.mapper.ProjectUserPermissionMapper; import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectStatusBoardService; import com.jero.modules.project.vo.TimeNodeVO; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.mapper.SysRoleMapper; +import com.jero.modules.system.service.IProjectUserBrandService; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import lombok.SneakyThrows; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,6 +51,14 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService private ProjectTaskInventoryEOServiceImpl projectTaskInventoryEOService; @Autowired private SysDictItemServiceImpl sysDictItemServiceImpl; + @Autowired + private SysRoleMapper sysRoleMapper; + @Autowired + private ProjectUserPermissionMapper projectUserPermissionMapper; + @Autowired + private IProjectUserBrandService projectUserBrandService; + @Autowired + private ISysUserService sysUserService; /** @@ -153,6 +163,26 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService */ @Override public List> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId()); + Set projectIds = new HashSet<>(); + //根据项目用户权限表筛选有权访问的项目 + Set permissionProjectIds = projectUserPermissionMapper.queryProjectIdsByUserId(loginUser.getId()); + if (ObjectUtils.isNotEmpty(permissionProjectIds)) { + projectIds.addAll(permissionProjectIds); + } + if (isViewer > 0) { + //如果是Viewer，根据配置的品牌筛选可访问的项目 + List brandTypes = projectUserBrandService.queryBrandByUserId(loginUser.getId()); + if (ObjectUtils.isNotEmpty(brandTypes)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("brand",brandTypes); + if (ObjectUtils.isNotEmpty(projectLibraryBaseService.list(queryWrapper))) { + projectIds.addAll(projectLibraryBaseService.list(queryWrapper).stream().map(ProjectLibraryBase::getId).collect(Collectors.toSet())); + } + } + } + if(StringUtils.isNotBlank(projectLibraryBase.getProjectName())){ projectLibraryBase.setProjectName(projectLibraryBase.getProjectName().replace("*","")); } @@ -163,6 +193,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService // //项目库信息 // List projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper); List projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase); + if (!sysUserService.isAdministrator()) { + projectLibraryBaseList = projectLibraryBaseList.stream().filter(project -> projectIds.contains(project.getId())).collect(Collectors.toList()); + } List> result = new ArrayList<>(); if(projectLibraryBaseList.size() != 0){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java index 846e78d28..e780f242b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java @@ -3,10 +3,18 @@ package com.jero.modules.project.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService; import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.PermissionDescriptionEnum; +import com.jero.modules.project.enums.ProcessControlButtonTypeEnum; import com.jero.modules.project.enums.ProjectUserLocationEnum; import com.jero.modules.project.mapper.ProjectUserPermissionMapper; import com.jero.modules.project.service.*; @@ -16,6 +24,7 @@ import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; import com.jero.modules.wkflow.enums.FlowTypeEnum; import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient; import org.apache.commons.lang3.ObjectUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,7 +58,12 @@ public class ProjectUserPermissionServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("laws_technology_evaluation_id", id); + List flowDetailEOS = lawsTechnologyEvaluationFlowDetailEOService.list(queryWrapper); + if (ObjectUtils.isEmpty(flowDetailEOS)) { + return false; + } + boolean eva = true; + if (ObjectUtils.isEmpty(flowDetailEOS.get(0).getEvaluatorId()) || (ObjectUtils.isNotEmpty(flowDetailEOS.get(0).getEvaluatorId()) && !flowDetailEOS.get(0).getEvaluatorId().contains(currentUser.getId()))) { + eva = false; + } + if (!lawsTechnologyEvaluationEO.getCreateBy().equals(currentUser.getUsername()) + && !eva + && viewer) { + hasProcessControlButton = false; + } + + } else { + hasProcessControlButton = false; + } + return hasProcessControlButton; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java index a5f2ab504..1acaeddfb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java @@ -40,5 +40,6 @@ public class SarFileSplitItemsEO implements Serializable { private String sMenuId; List itemsCondi; + private String zhan3Shi4Shun4Xu4;// 展示顺序字段 } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml index 6512e6f1e..b1dc4e2b1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml @@ -105,7 +105,7 @@ insert into sar_file_split_items (id, info_id, items_num, items_name, menu_id, creation_user, creation_time, modify_time, - modify_user, iterms_conditions) + modify_user, iterms_conditions,zhan3_shi4_shun4_xu4) values ( #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, @@ -113,7 +113,7 @@ #{item.menuId, jdbcType=VARCHAR}, #{item.creationUser, jdbcType=VARCHAR}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, - #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB} + #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB},#{item.zhan3Shi4Shun4Xu4, jdbcType=VARCHAR} ) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 130f6b31f..057370c9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -409,6 +409,9 @@ public class FileSpiltService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); // sarFileSplitMenuEODao.insertForeach(treeList); @@ -674,6 +677,9 @@ public class FileSpiltService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -906,6 +912,9 @@ public class FileSpiltService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -1110,6 +1119,9 @@ public class FileSpiltService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -1311,6 +1323,9 @@ public class FileSpiltService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -1570,6 +1585,9 @@ public class FileSpiltService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -1762,6 +1780,9 @@ public class FileSpiltService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -2001,6 +2022,9 @@ public class FileSpiltService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitPdfService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitPdfService.java index 79ddc5648..2a09bf3d4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitPdfService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitPdfService.java @@ -240,6 +240,9 @@ public class FileSplitPdfService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -461,6 +464,9 @@ public class FileSplitPdfService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -687,6 +693,9 @@ public class FileSplitPdfService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -889,6 +898,9 @@ public class FileSplitPdfService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -1062,6 +1074,9 @@ public class FileSplitPdfService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -1284,6 +1299,9 @@ public class FileSplitPdfService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -1476,6 +1494,9 @@ public class FileSplitPdfService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { @@ -1663,6 +1684,9 @@ public class FileSplitPdfService { } if (treeList.size() > 0 && messageList.size() > 0) { sarFileSplitMenuEOMapper.insertForeach(treeList); + for (int i = 0; i < messageList.size(); i++) { + messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); } else { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 8f1ae24e8..c52321365 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -8,7 +8,7 @@ {{$route.query.serialNumber +' '+$t('evaluationResults')}} -
+
@@ -92,7 +92,7 @@ total: 0, pageSize: 10, pageNo: 1, - flag:'', + flag:false, dataSource: [], formInline: {}, administrators:false, @@ -163,10 +163,7 @@ }) } getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsOpinionGather',id : this.$route.query.id}).then((res) => { - if (res.success) { this.flag = res - } else { - } }) }, methods: { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index a84ab50ee..7653a3873 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -8,7 +8,7 @@ {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
-
+
{{$t('initiateSupplementaryProcess')}} @@ -96,7 +96,7 @@ return { queryParam: {}, dataSource: [], - flag:'', + flag:false, userInfoQuery: {}, administrators: false, url: { @@ -182,10 +182,7 @@ }) } getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsTechnologyEvaluation',id : this.$route.query.id}).then((res) => { - if (res.success) { this.flag = res - } else { - } }) }, methods: { diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 1de4b6044..2b09ddc41 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -298,10 +298,11 @@ export default { }, //虚拟清单名称事件 entryNameClick(item) { - this.$router.push({ - path: '/ParameterTemplateList', + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', query: item }) + window.open(newUrl.href, '_blank') }, searchQuery() { this.pageNo = 1 diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index 4f4da31a3..78582aaf1 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -145,13 +145,13 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' ellipsis: true, scopedSlots: { customRender: 'msgTitile' } }, - { - title: this.$t('Sponsor'), - align: 'left', - ellipsis: true, - dataIndex: 'initiator', - width: 200 - }, + // { + // title: this.$t('Sponsor'), + // align: 'left', + // ellipsis: true, + // dataIndex: 'initiator', + // width: 200 + // }, { title: this.$t('MessageType'), align: 'left',