diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java index a5b7e0c93..1bc4ce42e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java @@ -33,4 +33,10 @@ public interface SysDictItemMapper extends BaseMapper { */ @Update("update sys_dict_item set del_flag = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") public void updateDictDelFlag(@Param("flag") int delFlag, @Param("id") String id); + + +/**根据code查数据字典具体值*/ + @Select("SELECT sdi.item_value FROM sys_dict_item as sdi LEFT JOIN sys_dict as sd ON sdi.dict_id =sd.id " + + "WHERE sd.dict_code =#{dictCode} order by sort_order asc, item_value asc") + public List selectItemValueByDictCode(String dictCode); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index dc732cd80..9e3784076 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -66,13 +66,13 @@ public class ProjectRelatedPersonnelController extends JeroController add(@Validated @RequestBody ProjectRelatedPersonnel projectRelatedPersonnel) { projectRelatedPersonnelService.add(projectRelatedPersonnel); return Result.OK("添加成功！"); - } + }*/ /** * 编辑 @@ -117,16 +117,16 @@ public class ProjectRelatedPersonnelController extends JeroController queryById(@RequestParam(name="projectId",required=true) String projectId) { - List projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectId(projectId); + @AutoLog(value = "项目库-相关人员维护表-通过id查询") + @ApiOperation(value="项目库-相关人员维护表-通过id查询", notes="项目库-相关人员维护表-通过id查询") + @GetMapping(value = "/queryId") + public Result queryById(@RequestParam(name="id",required=true) String id) { + List projectRelatedPersonnel = projectRelatedPersonnelService.queryById(id); if(projectRelatedPersonnel==null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 4f80924c6..ff8c3555a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -46,15 +46,11 @@ public class ProjectLibraryBase implements Serializable { private java.lang.String studioEngineer; @TableField(exist = false) private java.lang.String studioEngineerName; - @TableField(exist = false) - private java.lang.String studioEngineerEnName; /**认证工程师*/ private java.lang.String certificationEngineer; @TableField(exist = false) private java.lang.String certificationEngineerName; - @TableField(exist = false) - private java.lang.String certificationEngineerEnName; /**车型平台*/ @Dict(dicCode = "vehicle_platform") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index ab2f6b1c0..bbfb9df16 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -41,32 +41,25 @@ public class ProjectRelatedPersonnel implements Serializable { private java.lang.String dutyTerritory; /**法规工程师*/ - @Excel(name = "法规工程师", width = 15,orderNum = "2") + @Excel(name = "法规工程师", width = 30,orderNum = "2") private java.lang.String lawEngineer; @TableField(exist = false) private java.lang.String lawEngineerName; - @TableField(exist = false) - private java.lang.String lawEngineerEnName; - /**工程接口人*/ - @Excel(name = "工程接口人", width = 15,orderNum = "3") + @Excel(name = "工程接口人", width = 30,orderNum = "3") private java.lang.String engineeringInterfacePerson; @TableField(exist = false) private java.lang.String engineeringInterfacePersonName; - @TableField(exist = false) - private java.lang.String engineeringInterfacePersonEnName; /**认证工程师*/ - @Excel(name = "认证工程师", width = 15,orderNum = "4") + @Excel(name = "认证工程师", width = 30,orderNum = "4") private java.lang.String certificationEngineer; @TableField(exist = false) private java.lang.String certificationEngineerName; - @TableField(exist = false) - private java.lang.String certificationEngineerEnName; /**备注*/ - @Excel(name = "备注", width = 15,orderNum = "5") + @Excel(name = "备注", width = 50,orderNum = "5") private java.lang.String remark; /**创建人*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DictCodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DictCodeEnum.java new file mode 100644 index 000000000..d05612a55 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DictCodeEnum.java @@ -0,0 +1,30 @@ +package com.jero.modules.project.enums; + +public enum DictCodeEnum { + + DUTY_TERRITORY("责任领域","duty_territory"), + ; + String name; + String value; + + DictCodeEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + 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/ProjectRelatedPersonnelMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java index 763b57e52..ede78379e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java @@ -17,5 +17,5 @@ public interface ProjectRelatedPersonnelMapper extends BaseMapper queryPageList(IPage page, Map params); - List queryByProjectId(String projectId); + List queryById(String id); } 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 f96d02fcd..e3a07ba6d 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 @@ -29,8 +29,7 @@ plb.target_market, plb.project_status, plb.studio_engineer, - studiouser.realname as studio_engineer_name, - studiouser.username as studio_engineer_en_name, + studiouser.username as studio_engineer_name, plb.certification_engineer, plb.vehicle_platform, plb.digital_platform, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml index d777e24ad..63c8d1611 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml @@ -19,8 +19,6 @@ prp.project_id, prp.duty_territory, prp.law_engineer, - lawuser.username, - enguser.username, prp.engineering_interface_person, prp.certification_engineer, prp.remark, @@ -32,11 +30,8 @@ - SELECT FROM project_related_personnel AS prp - LEFT JOIN sys_user AS lawuser ON prp.law_engineer = lawuser.id - LEFT JOIN sys_user AS enguser ON prp.engineering_interface_person = enguser.id - prp.project_id=#{projectId} + prp.id=#{id} order by prp.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index f76291225..73dd4ce1e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -50,10 +50,10 @@ public interface IProjectRelatedPersonnelService extends IService queryByProjectId(String projectId); + List queryById(String id); /** * 列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 48b2554a1..f9c406904 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.enums.DictCodeEnum; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.system.entity.SysUser; @@ -37,6 +38,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl sysDictItemValueList = sysDictItemMapper.selectItemValueByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); + //新建相关人员表里的责任领域数据 + if (CollectionUtils.isNotEmpty(sysDictItemValueList)) { + for (String sysDictItemValue : sysDictItemValueList) { + projectRelatedPersonnelService.setDutyTerritoryValue(sysDictItemValue,projectLibraryBase.getId()); + } + } + } /** @@ -136,41 +151,30 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl sysUsers = new ArrayList<>(); //认证工程师多个id查询 - List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); - if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) { - certificationEngineerIdList=certificationEngineerIdList.stream().distinct().collect(Collectors.toList()); - QueryWrapper userqueryWrapper = new QueryWrapper<>(); - userqueryWrapper.in("id ", certificationEngineerIdList); - sysUsers = sysUserMapper.selectList(userqueryWrapper); - } + if (StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) { + List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) { + certificationEngineerIdList = certificationEngineerIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", certificationEngineerIdList); + sysUsers = sysUserMapper.selectList(userqueryWrapper); + } - if(CollectionUtils.isNotEmpty(sysUsers)) { + if (CollectionUtils.isNotEmpty(sysUsers)) { String certificationEngineerId = projectLibraryBase.getCertificationEngineer(); - String certificationEngineerName=null; - String certificationEngineerEnName=null; - StringBuilder certificationName=new StringBuilder(); - - for (String data:certificationEngineerIdList){ + String certificationEngineerName = null; + + for (String data : certificationEngineerIdList) { if (StringUtils.isNotEmpty(certificationEngineerId)) { certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId())) - .map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(",")); - certificationEngineerEnName = sysUsers.stream().filter(e -> data.equals(e.getId())) .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + } - - certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" "); - } - projectLibraryBase.setCertificationEngineerName(certificationName.toString()); - + projectLibraryBase.setCertificationEngineerName(certificationEngineerName); } - StringBuilder studioCnName= new StringBuilder(projectLibraryBase.getStudioEngineerName()); - StringBuilder studioEnName= new StringBuilder(projectLibraryBase.getStudioEngineerEnName()); - String studioName = studioCnName.append("(").append(studioEnName).append(")").toString(); - projectLibraryBase.setStudioEngineerName(studioName); + } } - - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 320cf3ffe..ec88e2505 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -42,7 +42,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl ids) { - removeByIds(ids); - } + public void deleteByIds(List ids) { + removeByIds(ids); + } /** - * 通过projectId查询 + * 通过id查询 * - * @param projectId + * @param id * @return */ @Override - public List queryByProjectId(String projectId) { - List records = projectRelatedPersonnelMapper.queryByProjectId(projectId); + public List queryById(String id) { + List records = projectRelatedPersonnelMapper.queryById(id); disposeData(records); return records; } - /** + /** * 列表查询 * * @return @@ -135,91 +145,75 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl lawEngineerUsers = new ArrayList<>(); - List lawEngineerIdList = Arrays.asList(projectRelatedPersonnel.getLawEngineer().split(",")); - if (CollectionUtils.isNotEmpty(lawEngineerIdList)) { - lawEngineerIdList = lawEngineerIdList.stream().distinct().collect(Collectors.toList()); - QueryWrapper userqueryWrapper = new QueryWrapper<>(); - userqueryWrapper.in("id ", lawEngineerIdList); - lawEngineerUsers = sysUserMapper.selectList(userqueryWrapper); - } - if(CollectionUtils.isNotEmpty(lawEngineerUsers)) { - String lawEngineerId = projectRelatedPersonnel.getLawEngineer(); - String lawEngineerName = null; - String lawEngineerEnName = null; - StringBuilder certificationName = new StringBuilder(); - - for (String data : lawEngineerIdList) { - if (StringUtils.isNotEmpty(lawEngineerId)) { - lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId())) - .map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(",")); - lawEngineerEnName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId())) - .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); - } - - certificationName.append(lawEngineerName).append("(").append(lawEngineerEnName).append(")").append(" "); - + if (StringUtils.isNotEmpty(projectRelatedPersonnel.getLawEngineer())){ + List lawEngineerIdList = Arrays.asList(projectRelatedPersonnel.getLawEngineer().split(",")); + if (CollectionUtils.isNotEmpty(lawEngineerIdList)) { + lawEngineerIdList = lawEngineerIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", lawEngineerIdList); + lawEngineerUsers = sysUserMapper.selectList(userqueryWrapper); } - projectRelatedPersonnel.setLawEngineerName(certificationName.toString()); - } + if(CollectionUtils.isNotEmpty(lawEngineerUsers)) { + String lawEngineerId = projectRelatedPersonnel.getLawEngineer(); + String lawEngineerName = null; + + for (String data : lawEngineerIdList) { + if (StringUtils.isNotEmpty(lawEngineerId)) { + lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + } + } + projectRelatedPersonnel.setLawEngineerName(lawEngineerName); + } + } //工程接口人 List engineeringInterfacePersonUsers = new ArrayList<>(); - List engineeringInterfacePersonIdList = Arrays.asList(projectRelatedPersonnel.getEngineeringInterfacePerson().split(",")); - if (CollectionUtils.isNotEmpty(engineeringInterfacePersonIdList)) { - engineeringInterfacePersonIdList = engineeringInterfacePersonIdList.stream().distinct().collect(Collectors.toList()); - QueryWrapper userqueryWrapper = new QueryWrapper<>(); - userqueryWrapper.in("id ", engineeringInterfacePersonIdList); - engineeringInterfacePersonUsers = sysUserMapper.selectList(userqueryWrapper); - } - if(CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) { - String engineeringInterfacePersonId = projectRelatedPersonnel.getEngineeringInterfacePerson(); - String engineeringInterfacePersonName = null; - String engineeringInterfacePersonEnName = null; - StringBuilder certificationName = new StringBuilder(); + if (StringUtils.isNotEmpty(projectRelatedPersonnel.getEngineeringInterfacePerson())) { + List engineeringInterfacePersonIdList = Arrays.asList(projectRelatedPersonnel.getEngineeringInterfacePerson().split(",")); + if (CollectionUtils.isNotEmpty(engineeringInterfacePersonIdList)) { + engineeringInterfacePersonIdList = engineeringInterfacePersonIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", engineeringInterfacePersonIdList); + engineeringInterfacePersonUsers = sysUserMapper.selectList(userqueryWrapper); + } + if (CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) { + String engineeringInterfacePersonId = projectRelatedPersonnel.getEngineeringInterfacePerson(); + String engineeringInterfacePersonName = null; - for (String data : engineeringInterfacePersonIdList) { - if (StringUtils.isNotEmpty(engineeringInterfacePersonId)) { - engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId())) - .map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(",")); - engineeringInterfacePersonEnName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId())) - .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + for (String data : engineeringInterfacePersonIdList) { + if (StringUtils.isNotEmpty(engineeringInterfacePersonId)) { + engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + } } - - certificationName.append(engineeringInterfacePersonName).append("(").append(engineeringInterfacePersonEnName).append(")").append(" "); - + projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName); } - projectRelatedPersonnel.setEngineeringInterfacePersonName(certificationName.toString()); } //认证工程师 List certificationEngineerUsers = new ArrayList<>(); - List certificationEngineerIdList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineer().split(",")); - if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) { - certificationEngineerIdList=certificationEngineerIdList.stream().distinct().collect(Collectors.toList()); - QueryWrapper userqueryWrapper = new QueryWrapper<>(); - userqueryWrapper.in("id ", certificationEngineerIdList); - certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper); - } - if(CollectionUtils.isNotEmpty(certificationEngineerUsers)) { - String certificationEngineerId = projectRelatedPersonnel.getCertificationEngineer(); - String certificationEngineerName=null; - String certificationEngineerEnName=null; - StringBuilder certificationName=new StringBuilder(); - - for (String data:certificationEngineerIdList){ - if (StringUtils.isNotEmpty(certificationEngineerId)) { - certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId())) - .map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(",")); - certificationEngineerEnName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId())) - .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); - } - - certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" "); - + if (StringUtils.isNotEmpty(projectRelatedPersonnel.getCertificationEngineer())){ + List certificationEngineerIdList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineer().split(",")); + if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) { + certificationEngineerIdList=certificationEngineerIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", certificationEngineerIdList); + certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper); } - projectRelatedPersonnel.setCertificationEngineerName(certificationName.toString()); + if(CollectionUtils.isNotEmpty(certificationEngineerUsers)) { + String certificationEngineerId = projectRelatedPersonnel.getCertificationEngineer(); + String certificationEngineerName = null; + for (String data : certificationEngineerIdList) { + if (StringUtils.isNotEmpty(certificationEngineerId)) { + certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId())) + .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + } + } + projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName); + } } } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0a5a7eb63..3ff638c59 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -682,4 +682,7 @@ module.exports = { taskList:'Task list', TaskParameterCollection:'Task parameter collection', nonConformance:'Non conformance', + deadlineForConfirmationOfDesignCompliance:'Deadline for confirmation of design compliance', + prehomoConfirmationDeadline:'Prehomo confirmation deadline', + verificationComplianceConfirmationDeadline:'Verification compliance confirmation deadline', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c4cbd700f..580ae40f0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -686,4 +686,7 @@ module.exports = { taskList:'任务清单', TaskParameterCollection:'任务参数收集', nonConformance:'未符合项', + deadlineForConfirmationOfDesignCompliance:'设计符合性确认截止时间', + prehomoConfirmationDeadline:'PreHomo确认截止时间', + verificationComplianceConfirmationDeadline:'验证符合性确认截止时间', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index a6c39e507..f909ade5a 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -8,16 +8,18 @@ {{$t('standard')}} + v-model="queryParam.serialNumber">
-
+
{{$t('areaOfResponsibility')}}
- +
@@ -164,7 +166,7 @@ align: 'center', dataIndex: 'CurrentProjectStatusEvaluation', scopedSlots: { customRender: 'CurrentProjectStatusEvaluation' } - }, + } ], selectedRowKeys: [], queryParam: {}, @@ -188,9 +190,9 @@ handleExport() { }, - CertificationDirectory(){ + CertificationDirectory() { - }, + } } } @@ -198,66 +200,6 @@ + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 1e939dfed..18a63d9b1 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -198,8 +198,8 @@ - - {{ item.text || item.label }} + + {{ item.name }} @@ -218,11 +218,11 @@ - - - {{ item.text || item.label }} + + {{ item.name}} @@ -239,11 +239,11 @@ - - - {{ item.text || item.label }} + + {{ item.name }} @@ -569,14 +569,30 @@ rules: {}, formInline: {}, regulatoryEngineerList: [], + engineeringInterfacePersonList: [], + certificationEngineerList: [], disabled: false } }, mounted() { }, methods: { + queryPersonByProject(row) { + let query = { + projectId: this.$route.query.id, + dutyTerritory: row.dutyTerritory + } + getAction(this.url.queryPersonByProject, query).then((res) => { + if (res.success) { + this.regulatoryEngineerList = res.result.lawEngineerList + this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList + this.certificationEngineerList = res.result.certificationEngineerList + } + }) + }, editModel(item) { this.visible = true + this.queryPersonByProject(item) this.$nextTick(() => { this.rules = {} this.formInline = item @@ -680,7 +696,7 @@ }, handleSubmit() { this.$refs.ruleForm.validate(valid => { - if (valid){ + if (valid) { let formInline = JSON.parse(JSON.stringify(this.formInline)) Object.keys(formInline).forEach(res => { if (formInline[res] && formInline[res] instanceof Array) { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 791bd289f..e9264c76c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -163,6 +163,7 @@
+ 0) { + this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, handleAdd() { this.$refs.addModelRef.addModel() diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index f78686ef1..aa2f7db5c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -69,6 +69,7 @@