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

2022-08-24 20:06:47 +08:00
parent 9a8508951a 431c007110
commit 317f8cf2f2
12 changed files with 1002 additions and 220 deletions
@@ -54,6 +54,18 @@ ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`
 ALTER TABLE `project_laws_inventory_log`
 MODIFY COLUMN `log_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'log内容' AFTER `project_library_id`;

-- 2022-08-04 修改字段类型  生产环境已同步
+-- 2022-08-04 修改字段长度  生产环境已同步
 ALTER TABLE `dummy_inventory_info`
 MODIFY COLUMN `subtitle` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子标题' AFTER `wvta_id`;
+
+-- 2022-08-22 修改字段长度  生产环境未同步
+ALTER TABLE `project_laws_inventory`
+MODIFY COLUMN `subtitle` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子标题' AFTER `title`;
+
+-- 2022-08-22 修改字段长度  生产环境未同步
+ALTER TABLE `dummy_inventory_info`
+MODIFY COLUMN `serial_number` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号' AFTER `sys_org_code`;
+
+-- 2022-08-22 修改字段长度  生产环境未同步
+ALTER TABLE `project_laws_inventory`
+MODIFY COLUMN `serial_number` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号' AFTER `project_library_id`;
@@ -90,7 +90,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			this.batchInsertProblemKnowledgeBaseUserEO(problemKnowledgeBaseEO);
 		}else {
        	//如果展示权限是公开，则把该数据插入到搜索中心中。
-			//this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
 		}
 //		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
    }
@@ -236,11 +236,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			LambdaQueryWrapper<DummyInventoryInfoEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,projectLawsInventoryEO.getDummyInventoryBaseId());
 			List<DummyInventoryInfoEO> dummyInventoryInfoEOList = dummyInventoryInfoEOService.list(lambdaQueryWrapper);
+			List<DummyInventoryInfoEO> dummyInventoryInfoEOListNew  = new ArrayList<>();
 			if(dummyInventoryInfoEOList.size() != 0){
 				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
 				if(projectLawsInventoryEOList.size() ==0){
-					//此时法规清单中没有数据,直接将维护清单中的数据添加即可
+					//责任领域如果有多个,则需要拆分成多条
 					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
+						String dutyTerritory = dummyInventoryInfoEO.getDutyTerritory();
+						if(StringUtils.isNotBlank(dutyTerritory)){
+							for (String dutyTerritoryOne : dutyTerritory.split(",")) {
+								DummyInventoryInfoEO dummyInventoryInfoEONew = new DummyInventoryInfoEO();
+								BeanUtils.copyProperties(dummyInventoryInfoEO,dummyInventoryInfoEONew);
+								dummyInventoryInfoEONew.setDutyTerritory(dutyTerritoryOne);
+								dummyInventoryInfoEOListNew.add(dummyInventoryInfoEONew);
+							}
+						}else{
+							dummyInventoryInfoEOListNew.add(dummyInventoryInfoEO);
+						}
+					}
+
+					//此时法规清单中没有数据,直接将维护清单中的数据添加即可
+					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
 						ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
 						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
 						BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp);
@@ -253,7 +269,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}else{
 					//此时法规清单中有数据,再添加虚拟清单数据时,如果法规清单中已有要填加的虚拟清单数据,则数据以法规清单为准
 					List<ProjectLawsInventoryEO> projectLawsInventoryEOListTemp = new ArrayList<>();
-					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
+					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
 						List<ProjectLawsInventoryEO> collect = projectLawsInventoryEOList.stream()
 								.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList());
 						if(collect.size() != 0){
@@ -426,7 +442,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			Map<String, String> infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy);

 			//设置更新log
-			setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
+//			setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());


 			//验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程
@@ -1737,6 +1753,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 				inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.REJECTED.getValue());
 				queryWrapper.lambda().in(ProjectLawsInventoryEO::getInventoryAffirmStatus,inventoryAffirmStatusList);*/
+
+				String ids = (String) params.get("ids");
+				if(StringUtils.isNotEmpty(ids)){
+					List<String> projectLawsInventoryIdList = Arrays.asList(ids.split(","));
+					queryWrapper.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList);
+				}
+
 				queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
 				//查询当前项目下，清单状态为 未发起、拒绝状态的法规清单。
 				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
@@ -1751,7 +1774,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn

 				for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
 					//法规清单的责任领域
-					String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+					/*String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
 					if(StringUtils.isNotBlank(dutyTerritory)){
 						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = new ArrayList<>();
 						for (String s : dutyTerritory.split(",")) {
@@ -1828,102 +1851,185 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								}
 							}
 						}
-					}
+					}*/

-					for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
-						if(StringUtils.equals(projectRelatedPersonnel.getDutyTerritory(),projectLawsInventoryEO.getDutyTerritory())){
-//							//法规工程师
-//							if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
-//								String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
-//								if(StringUtils.isNotEmpty(userId)){
-//									projectLawsInventoryEO.setRegulationOwnerId(userId);
-//								}
-//							}
-//
-//							//认证工程师
-//							if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
-//								String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
-//								if(StringUtils.isNotEmpty(userId)){
-//									projectLawsInventoryEO.setHomologationEngineerId(userId);
-//								}
-//							}
-//
-//							//项目接口人
-//							if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
-//								String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel,studioEngineer);
-//								if(StringUtils.isNotEmpty(userId)){
-//									projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
-//								}
-//							}
+					String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+					if(StringUtils.isNotEmpty(dutyTerritory)){
+						List<ProjectRelatedPersonnel> projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> {
+							boolean flag = false;
+							for (String duty : dutyTerritory.split(",")) {
+								if(StringUtils.equals(duty,relatedPersonnel.getDutyTerritory())){
+									flag = true;
+								}
+							}
+							return flag;
+						}).collect(Collectors.toList());
+
+						if(CollectionUtils.isNotEmpty(projectRelatedPersonnelTempList)){
+
+							LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+
+							//法规工程师
+							if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
+								String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer);
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setRegulationOwnerId(userId);
+								}
+							}else {
+								String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getRegulationOwnerId());
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setRegulationOwnerId(userId);
+								}else {
+									updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerId,null);
+								}
+							}
+
+							//认证工程师
+							if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
+								String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer);
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setHomologationEngineerId(userId);
+								}
+							}else {
+								String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getHomologationEngineerId());
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setHomologationEngineerId(userId);
+								}else {
+									updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerId,null);
+								}
+							}
+
+							//项目接口人
+							if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
+								String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList,studioEngineer);
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
+								}
+							}else {
+								String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getEngineeringInterfacePerson());
+								if(StringUtils.isNotEmpty(userId)){
+									projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
+								}else {
+									updateWrapper.set(ProjectLawsInventoryEO::getEngineeringInterfacePerson,null);
+								}
+							}

 							//设计符合性确认
 							//发起人角色
-							if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
-								String designInitiator = projectLawsInventoryEO.getDesignInitiator();
-								if(StringUtils.isNotEmpty(designInitiator)){
-									String userId = ToGetAUserId(designInitiator, projectRelatedPersonnel,studioEngineer);
+							String designInitiator = projectLawsInventoryEO.getDesignInitiator();
+							if(StringUtils.isNotEmpty(designInitiator)){
+								if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
+									String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList,studioEngineer);
 									if(StringUtils.isNotEmpty(userId)){
 										projectLawsInventoryEO.setDesignInitiatorId(userId);
 									}
-								}
-							}
-							//责任人角色
-							if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignDutyId())){
-								String designDuty = projectLawsInventoryEO.getDesignDuty();
-								if(StringUtils.isNotEmpty(designDuty)){
-									String userId = ToGetAUserId(designDuty, projectRelatedPersonnel,studioEngineer);
+								}else {
+									String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getDesignInitiatorId());
 									if(StringUtils.isNotEmpty(userId)){
-										projectLawsInventoryEO.setDesignDutyId(userId);
+										projectLawsInventoryEO.setDesignInitiatorId(userId);
+									}else {
+										updateWrapper.set(ProjectLawsInventoryEO::getDesignInitiatorId,null);
 									}
 								}
 							}

-							//prehomo确认
-							//发起人角色
-							if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
-								String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator();
-								if(StringUtils.isNotEmpty(prehomoInitiator)){
-									String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnel,studioEngineer);
+							//责任人角色
+							String designDuty = projectLawsInventoryEO.getDesignDuty();
+							if(StringUtils.isNotEmpty(designDuty)){
+								if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignDutyId())){
+									String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList,studioEngineer);
 									if(StringUtils.isNotEmpty(userId)){
-										projectLawsInventoryEO.setPrehomoInitiatorId(userId);
+										projectLawsInventoryEO.setDesignDutyId(userId);
+									}
+								}else {
+									String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getDesignDutyId());
+									if(StringUtils.isNotEmpty(userId)){
+										projectLawsInventoryEO.setDesignDutyId(userId);
+									}else {
+										updateWrapper.set(ProjectLawsInventoryEO::getDesignDutyId,null);
 									}
 								}
 							}
-							if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
-								//责任人角色
-								String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty();
-								if(StringUtils.isNotEmpty(prehomoDuty)){
-									String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnel,studioEngineer);
+
+
+							//prehomo确认
+							//发起人角色
+							String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator();
+							if(StringUtils.isNotEmpty(prehomoInitiator)){
+								if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
+									String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnelTempList,studioEngineer);
+									if(StringUtils.isNotEmpty(userId)){
+										projectLawsInventoryEO.setPrehomoInitiatorId(userId);
+									}
+								}else {
+									String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getPrehomoInitiatorId());
+									if(StringUtils.isNotEmpty(userId)){
+										projectLawsInventoryEO.setPrehomoInitiatorId(userId);
+									}else {
+										updateWrapper.set(ProjectLawsInventoryEO::getPrehomoInitiatorId,null);
+									}
+								}
+							}
+
+							//责任人角色
+							String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty();
+							if(StringUtils.isNotEmpty(prehomoDuty)){
+								if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
+									String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnelTempList,studioEngineer);
 									if(StringUtils.isNotEmpty(userId)){
 										projectLawsInventoryEO.setPrehomoDutyId(userId);
 									}
+								}else {
+									String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getPrehomoDutyId());
+									if(StringUtils.isNotEmpty(userId)){
+										projectLawsInventoryEO.setPrehomoDutyId(userId);
+									}else {
+										updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDutyId,null);
+									}
 								}
 							}

 							//验证符合性确认
-							if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
-								//发起人角色
-								String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator();
-								if(StringUtils.isNotEmpty(verifyInitiator)){
-									String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnel,studioEngineer);
+							//发起人角色
+							String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator();
+							if(StringUtils.isNotEmpty(verifyInitiator)){
+								if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
+									String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnelTempList,studioEngineer);
 									if(StringUtils.isNotEmpty(userId)){
 										projectLawsInventoryEO.setVerifyInitiatorId(userId);
 									}
-								}
-							}
-							if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyDutyId())){
-								//责任人角色
-								String verifyDuty = projectLawsInventoryEO.getVerifyDuty();
-								if(StringUtils.isNotEmpty(verifyDuty)){
-									String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnel,studioEngineer);
+								}else {
+									String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getVerifyInitiatorId());
 									if(StringUtils.isNotEmpty(userId)){
-										projectLawsInventoryEO.setVerifyDutyId(userId);
+										projectLawsInventoryEO.setVerifyInitiatorId(userId);
+									}else {
+										updateWrapper.set(ProjectLawsInventoryEO::getVerifyInitiatorId,null);
 									}
 								}
 							}
+
+							//责任人角色
+							String verifyDuty = projectLawsInventoryEO.getVerifyDuty();
+							if(StringUtils.isNotEmpty(verifyDuty)){
+								if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyDutyId())){
+									String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnelTempList,studioEngineer);
+									if(StringUtils.isNotEmpty(userId)){
+										projectLawsInventoryEO.setVerifyDutyId(userId);
+									}
+								}else {
+									String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getVerifyDutyId());
+									if(StringUtils.isNotEmpty(userId)){
+										projectLawsInventoryEO.setVerifyDutyId(userId);
+									}else {
+										updateWrapper.set(ProjectLawsInventoryEO::getVerifyDutyId,null);
+									}
+								}
+							}
+							updateWrapper.eq(ProjectLawsInventoryEO::getId,projectLawsInventoryEO.getId());
+							super.update(projectLawsInventoryEO, updateWrapper);
 						}
 					}
-					this.baseMapper.updateById(projectLawsInventoryEO);
+					//this.baseMapper.updateById(projectLawsInventoryEO);
 				}
 			}else {
 				throw new JeroBootException("当前项目中，未找到相关维护人员信息");
@@ -1946,14 +2052,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	/**
 	 * 获取一个用户的id
 	 * @param roleCode
-	 * @param projectRelatedPersonnel
+	 * @param projectRelatedPersonnelList
 	 * @return
 	 */
-	public String ToGetAUserId(String roleCode,ProjectRelatedPersonnel projectRelatedPersonnel,String studioEngineer){
+	public String ToGetAUserId(String roleCode,List<ProjectRelatedPersonnel> projectRelatedPersonnelList,String studioEngineer){
 		String resultUserId = "";
 		//法规工程师
 		if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
-			String lawEngineer = projectRelatedPersonnel.getLawEngineer();
+			String lawEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.joining(","));
 			if(StringUtils.isNotEmpty(lawEngineer)){
 				String[] lawEngineerArr = lawEngineer.split(",");
 				if(lawEngineerArr.length == 1){
@@ -1963,7 +2075,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 		//认证工程师
 		if(StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
-			String certificationEngineer = projectRelatedPersonnel.getCertificationEngineer();
+			String certificationEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.joining(","));
 			if(StringUtils.isNotEmpty(certificationEngineer)){
 				String[] certificationEngineerArr = certificationEngineer.split(",");
 				if(certificationEngineerArr.length == 1){
@@ -1973,7 +2091,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 		//工程接口人
 		if(StringUtils.equals(roleCode,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())){
-			String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePerson();
+			String engineeringInterfacePerson = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.joining(","));
 			if(StringUtils.isNotEmpty(engineeringInterfacePerson)){
 				String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(",");
 				if(engineeringInterfacePersonArr.length == 1){
@@ -2485,14 +2609,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			this.saveBatch(projectLawsInventoryEOList);

 			//更新log
-			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-			String username = sysUser.getUsername();
-			String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
-			String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
-			String contentLog = username+"复制了“"+serialNumber+"”";
-			String enContentLog =  username+" copied “"+serialNumber+"”";
-			projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
-			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
+//			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//			String username = sysUser.getUsername();
+//			String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
+//			String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
+//			String contentLog = username+"复制了“"+serialNumber+"”";
+//			String enContentLog =  username+" copied “"+serialNumber+"”";
+//			projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
+//			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
 			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
 		}

@@ -2557,10 +2681,53 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){
 					projectLawsInventoryEOTemp.setVerifyDueDate(projectLawsInventoryEO.getVerifyDueDate());
 				}
+
+				//================================批量设置人员===================================================
+				//法规工程师id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){
+					projectLawsInventoryEOTemp.setRegulationOwnerId(projectLawsInventoryEO.getRegulationOwnerId());
+				}
+				//认证工程师id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){
+					projectLawsInventoryEOTemp.setHomologationEngineerId(projectLawsInventoryEO.getHomologationEngineerId());
+				}
+				//工程接口人id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())){
+					projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLawsInventoryEO.getEngineeringInterfacePerson());
+				}
+				//设计符合性流程发起人id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
+					projectLawsInventoryEOTemp.setDesignInitiatorId(projectLawsInventoryEO.getDesignInitiatorId());
+				}
+				//设计符合性流程责任人id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){
+					projectLawsInventoryEOTemp.setDesignDutyId(projectLawsInventoryEO.getDesignDutyId());
+				}
+				//Pre-homo确认流程发起人id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
+					projectLawsInventoryEOTemp.setPrehomoInitiatorId(projectLawsInventoryEO.getPrehomoInitiatorId());
+				}
+				//Pre-homo确认责任人id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
+					projectLawsInventoryEOTemp.setPrehomoDutyId(projectLawsInventoryEO.getPrehomoDutyId());
+				}
+				//验证符合性流程发起人id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
+					projectLawsInventoryEOTemp.setVerifyInitiatorId(projectLawsInventoryEO.getVerifyInitiatorId());
+				}
+				//验证符合性流程责任人id
+				if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){
+					projectLawsInventoryEOTemp.setVerifyDutyId(projectLawsInventoryEO.getVerifyDutyId());
+				}
 				projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
 			}

 			this.updateBatchById(projectLawsInventoryEOList);
+
+			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
+				//更新三个符合性流程中的处理人。
+				this.updateFlowInfo(projectLawsInventory);
+			});
 //			for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) {
 //				LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
 //				updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId());
@@ -2716,15 +2883,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String enContentIndexStart = enContentLog.substring(0,enContentLog.indexOf("“"));
 			String enContent= enContentLog.substring(enContentIndexStart.length()+1,enContentLog.length());

-			if(StringUtils.isNotBlank(content)){
-				contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
-				projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
-			}
+//			if(StringUtils.isNotBlank(content)){
+//				contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
+//				projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
+//			}

-			if(StringUtils.isNotBlank(enContent)){
-				enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
-				projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
-			}
+//			if(StringUtils.isNotBlank(enContent)){
+//				enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
+//				projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
+//			}
 		}
 	}

@@ -4248,9 +4415,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag,null);
-			updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
-			updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
-			updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
+			//updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
+			//updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
+			//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate,null);
 			super.update(projectLawsInventoryEO, updateWrapper);
@@ -4429,12 +4596,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn

 			//子标题
 			if(StringUtils.isNotBlank(subtitle)){
-				if(subtitle.length() > 100){
+				if(subtitle.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
-						message = errorMsg + "子标题不能超过100个字符, ";
+						message = errorMsg + "子标题不能超过300个字符, ";
 					}else{
-						message = errorMsg + " Subheadings cannot be checked more than 100 characters, ";
+						message = errorMsg + " Subheadings cannot be checked more than 300 characters, ";
 					}
 					msgList.add(message);
 				}
@@ -7062,4 +7229,86 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 		return sysRoles;
 	}
+
+	/**
+	 * 获取一个用户的id
+	 * 	      例如：如果法规工程师不是空，判断当前这个法规工程师，是否在这个责任领域的数组里，
+	 * 	      1、如果在的话，不用管他；
+	 * 	      2、如果只有一个人，则把这个用户设置进来；
+	 * 	      3、如果不在，判断这个责任领域下是否有多个法规工程师，如果是，则把这个法规工程师设置为空；
+	 *
+	 * @param roleCode					角色编码
+	 * @param projectRelatedPersonnelList	相关人员对象数组
+	 * @param studioEngineer			studioCode
+	 * @param engineersId				现有的工程师id
+	 * @return
+	 */
+	public String ToGetAUserId(String roleCode,List<ProjectRelatedPersonnel> projectRelatedPersonnelList,String studioEngineer,String engineersId){
+		String resultUserId = "";
+		//法规工程师
+		if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
+			String lawEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.joining(","));
+			if(StringUtils.isNotEmpty(lawEngineer)){
+				if(!StringUtils.contains(lawEngineer,engineersId)){
+					String[] lawEngineerArr = lawEngineer.split(",");
+					if(lawEngineerArr.length == 1){
+						resultUserId = lawEngineer;
+					}
+				}else {
+					resultUserId = engineersId;
+				}
+			}
+		}
+		//认证工程师
+		if(StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
+			String certificationEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.joining(","));
+			if(StringUtils.isNotEmpty(certificationEngineer)){
+				if(!StringUtils.contains(certificationEngineer,engineersId)){
+					String[] certificationEngineerArr = certificationEngineer.split(",");
+					if(certificationEngineerArr.length == 1){
+						resultUserId = certificationEngineer;
+					}
+				}else {
+					resultUserId = engineersId;
+				}
+			}
+		}
+		//工程接口人
+		if(StringUtils.equals(roleCode,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())){
+			String engineeringInterfacePerson = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
+				boolean flag = false;
+				if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
+					flag = true;
+				}
+				return flag;
+			}).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.joining(","));
+			if(StringUtils.isNotEmpty(engineeringInterfacePerson)){
+				if(!StringUtils.contains(engineeringInterfacePerson,engineersId)){
+					String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(",");
+					if(engineeringInterfacePersonArr.length == 1){
+						resultUserId = engineeringInterfacePerson;
+					}
+				}else {
+					resultUserId = engineersId;
+				}
+			}
+		}
+		//studio
+		if(StringUtils.equals(roleCode,ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
+			resultUserId = studioEngineer;
+		}
+		return resultUserId;
+	}
 }
@@ -569,6 +569,8 @@ module.exports = {
  mergeTerms: 'Determine Merger Terms',
  documentSplitTemplate: 'Document Split Template',
  batSetting: 'Batch Setting',
+  batchSettingInformation:'Batch Setting Information',
+  batchSettingPersonnel:'Batch Setting Personnel',
  selectDirectoryTerms: 'Please Select the directory location to add terms',
  StandardBreakdown: 'Standard Breakdown',
  OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file',
@@ -713,9 +715,9 @@ module.exports = {

  confirmationOfRegulationsList: 'Regulation List Confirmation',
  regulatoryTaskConfirmation: 'Regulation Task Confirmation',
-  certificationStart: 'Homo Test Completion',
-  preHomoCompletion: 'Pre-Homo Completion',
-  certificationEnd: 'Type Approval',
+  certificationStart: 'Homo Completion',
+  preHomoCompletion: 'Pre-Homo Confirmation',
+  certificationEnd: 'Homo KO',
  directoryName: 'Catalogue Name',
  batch: 'Batch',
  uploadTime: 'Upload Time',
@@ -1269,6 +1271,10 @@ module.exports = {
  source:'Source',
  sourceEn:'Source (English)',
  onlyone:'Only one merge delimiter can be entered',
+  theInconsistentSameResponsibility:'The selected data responsibility fields are inconsistent; Please select the same responsibility',
+  taskConfirmedPersonnelCannotBeSetBatch:'When the task confirmation status is to be confirmed, personnel cannot be set in batch',
+  theSelectedDataResponsibilityFieldCannotEmpty:'The selected data responsibility field cannot be empty',
+  theTaskConfirmationStatusCannot:'Only the list confirmation status is "reject" or "accept" and the task confirmation status cannot be "data to be confirmed"',
  BatchMaintenanceProgress:'Batch Maintenance Progress',
  BatchChangeStatus:'Batch Change Status',
  CollectinguthenticationParameters:'Collecting Authentication Parameters',
@@ -576,6 +576,8 @@ module.exports = {
  mergeTerms: '确定合并条款',
  documentSplitTemplate: '文档拆分模板',
  batSetting: '批量设置',
+  batchSettingInformation:'批量设置信息',
+  batchSettingPersonnel:'批量设置人员',
  selectDirectoryTerms: '请选择添加条款的目录位置',
  selectDirectorylocation: '请选择添加文件夹的目录位置',
  OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
@@ -1371,6 +1373,10 @@ module.exports = {
  source: '来源',
  sourceEn: '来源(英文)',
  onlyone:'只能输入一个合并分隔符',
+  theInconsistentSameResponsibility:'所选的数据责任领域不一致；请选择相同的责任领域',
+  taskConfirmedPersonnelCannotBeSetBatch:'任务确认状态为待确认时无法批量设置人员',
+  theSelectedDataResponsibilityFieldCannotEmpty:'所选数据责任领域不能为空',
+  theTaskConfirmationStatusCannot:'只能变更清单确认状态为拒绝或接受、及任务确认状态不能为待确认的数据',
  BatchMaintenanceProgress:'批量维护进度',
  BatchChangeStatus:'批量修改状态',
  CollectinguthenticationParameters:'认证参数收集',
@@ -99,11 +99,14 @@
            title: this.$t('targetMarket'),
            value: 'targetMarket_dictText'
          },
-          {},
+          {
+            title: this.$t('subtitle'),
+            value: 'subtitle'
+          },
          {
            title: this.$t('standard'),
            value: 'serialNumber',
-            type:'4',
+            type: '4'
          },
          {
            title: this.$t('title'),
@@ -325,7 +328,7 @@
            this.$router.push({
              path: '/ProjectDetails',
              query: {
-                type:'103',
+                type: '103',
                ...this.$route.query
              }
            })
@@ -375,7 +378,7 @@
              this.$router.push({
                path: '/ProjectDetails',
                query: {
-                  type:'103',
+                  type: '103',
                  ...this.$route.query
                }
              })
@@ -1,6 +1,6 @@
 <template>
  <a-modal
-    :title="$t('batSetting')"
+    :title="$t('batchSettingInformation')"
    :width="1200"
    :visible="visible"
    :confirm-loading="confirmLoading"
@@ -35,11 +35,11 @@
                                  :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'attestation_type'"/>
-<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
-<!--                                 @input="handleInput('attestationType')"-->
-<!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
-<!--                                 :type="'select'"-->
-<!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
+              <!--                                 @input="handleInput('attestationType')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
            </a-form-model-item>
          </div>
        </a-col>
@@ -69,7 +69,7 @@
                                  :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'attestation_rank'"/>
-<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
              <!--                                 @input="handleInput('attestationRank')"-->
              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
              <!--                                 :type="'select'"-->
@@ -0,0 +1,418 @@
+<template>
+  <a-modal
+    :title="$t('batchSettingPersonnel')"
+    :width="1000"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text"
+                    :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="formInline.regulationOwnerId">
+                <a-select-option v-for="(item, key) in regulatoryEngineerList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
+                        class="box-input"
+                        allowClear
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.homologationEngineerId">
+                <a-select-option v-for="(item, key) in certificationEngineerList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
+              <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                        class="box-input"
+                        allowClear
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="formInline.engineeringInterfacePerson">
+                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('confirmationOfDesignConformity')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.designInitiatorId">
+                <a-select-option v-for="(item, key) in designInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.designDutyId">
+                <a-select-option v-for="(item, key) in designDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('PrehomoConfirmation')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.prehomoInitiatorId">
+                <a-select-option v-for="(item, key) in prehomoInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.prehomoDutyId">
+                <a-select-option v-for="(item, key) in prehomoDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="header-text">
+        &nbsp;{{$t('verificationAndConformityconfirmation')}}
+      </div>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.verifyInitiatorId">
+                <a-select-option v-for="(item, key) in verifyInitiatorList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        class="box-input"
+                        allowClear
+                        v-model="formInline.verifyDutyId">
+                <a-select-option v-for="(item, key) in verifyDutyList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+
+  export default {
+    name: 'batchSettingPersonnel',
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        regulatoryEngineerList: [],
+        certificationEngineerList: [],
+        engineeringInterfacePersonList: [],
+        designInitiatorList: [],
+        designDutyList: [],
+        prehomoInitiatorList: [],
+        prehomoDutyList: [],
+        verifyInitiatorList: [],
+        verifyDutyList: [],
+        formInline: {},
+        rules: {},
+        ids: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      edit(data, content) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+          this.queryPersonByProject(content[0].dutyTerritory)
+        })
+      },
+      queryPersonByProject(row) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row
+        }
+        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 //认证工程师
+            this.designInitiatorList = res.result.allPersonList || []
+            this.designDutyList = res.result.allPersonList || []
+            this.prehomoInitiatorList = res.result.allPersonList || []
+            this.prehomoDutyList = res.result.allPersonList || []
+            this.verifyInitiatorList = res.result.allPersonList || []
+            this.verifyDutyList = res.result.allPersonList || []
+          }
+        })
+      },
+      handleOk() {
+        let ids = JSON.parse(JSON.stringify(this.ids))
+        let query = {
+          ids: ids.join(','),
+          ...this.formInline
+        }
+        this.confirmLoading = true
+        postAction(this.url.setBatch, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batchSettingPersonnelForm')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 104px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .header-text {
+    font-size: 16px;
+    font-weight: bold;
+    margin-left: 15px;
+    /*border-bottom: 1px #d9d9d9 dashed;*/
+    height: 30px;
+    margin-bottom: 30px;
+  }
+</style>
@@ -808,7 +808,10 @@
    </a-spin>
    <div class="drawer-bootom-button">
      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      <a-button @click="handleSubmit" v-if="formInline.roleCodeIndex == 0" type="primary" :loading="confirmLoading">
+        {{$t('submit')}}
+      </a-button>
+      <a-button @click="handleSubmit" v-else type="primary" :loading="confirmLoading">{{$t('confirm')}}</a-button>
    </div>
    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
  </a-drawer>
@@ -134,7 +134,11 @@
            </div>
            <div class="operator-text-title" @click="batSettingClick">
              <a-icon type="setting"/>
-              {{ $t('batSetting') }}
+              {{ $t('batchSettingInformation') }}
+            </div>
+            <div class="operator-text-title" @click="batchSettingPersonnelClick">
+              <a-icon type="setting"/>
+              {{ $t('batchSettingPersonnel') }}
            </div>
            <div class="operator-text-title" @click="questionClick">
              <a-icon type="apartment"/>
@@ -184,7 +188,7 @@
        </div>
        <div class="operator-text" @click="batSettingClick" v-if="isRoleSwitching">
          <a-icon type="setting"/>
-          {{ $t('batSetting') }}
+          {{ $t('batchSettingInformation') }}
        </div>
        <div class="operator-text"
             v-if="roleSwitchingList.length > 1"
@@ -432,6 +436,7 @@
    <JLoading :loading="JLoading">{{$t('dataLoading')}}</JLoading>
    <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
    <listOfRegulationsView ref="listOfRegulationsViewRef"/>
+    <batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
  </a-card>
 </template>

@@ -445,6 +450,7 @@
  import resultReportedUpload from './resultReportedUpload'
  import listOfRegulationsView from './listOfRegulationsView'
  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import batchSettingPersonnel from './batchSettingPersonnel'
  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
  import moment from 'moment'
  import { mapGetters } from 'vuex'
@@ -462,6 +468,7 @@
      globalAdvancedQuery,
      fixedPlate,
      resultReportedUpload,
+      batchSettingPersonnel,
      listOfRegulationsView
    },
    data() {
@@ -1145,6 +1152,47 @@
          this.$message.warning(this.$t('selectLeastOne'))
        }
      },
+      batchSettingPersonnelClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let isTrue
+          let content = []
+          for (let i = 0; i < this.dataSource.length; i++) {
+            for (let j = 0; j < selectedRowKeys.length; j++) {
+              if (this.dataSource[i].id == selectedRowKeys[j]) {
+                content.push(this.dataSource[i])
+              }
+            }
+          }
+          for (let i = 0; i < content.length; i++) {
+            if (!content[i].dutyTerritory_dictText) {
+              this.$message.warning(this.$t('theSelectedDataResponsibilityFieldCannotEmpty'))
+              return
+            }
+            for (let j = 1; j < content.length; j++) {
+              if (content[i].dutyTerritory_dictText != content[j].dutyTerritory_dictText || !content[i].dutyTerritory_dictText) {
+                this.$message.warning(this.$t('theInconsistentSameResponsibility'))
+                return
+              }
+            }
+          }
+          for (let i = 0; i < content.length; i++) {
+            if (content[i].roleCode == '0' &&
+              content[i].taskAffirmStatus != 'List to confirm') {
+              isTrue = true
+            } else {
+              isTrue = false
+              this.$message.warning(this.$t('taskConfirmedPersonnelCannotBeSetBatch'))
+              return
+            }
+          }
+          if (isTrue) {
+            this.$refs.batchSettingPersonnelRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), content)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
      questionClick() {
        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -1215,11 +1263,15 @@
              if (this.dataSource[i].id == selectedRowKeys[j]) {
                if (this.dataSource[i].taskAffirmStatus == 'Accepted' ||
                  (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
-                  (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
+                  (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
+                  (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
+                  (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
+                  (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started') ||
+                  (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
                  isTrue = true
                } else {
                  isTrue = false
-                  this.$message.warning(this.$t('onlyTheDataWhoseStatusNotInitiatedAcceptedChanged'))
+                  this.$message.warning(this.$t('theTaskConfirmationStatusCannot'))
                  return
                }
              }
@@ -2072,19 +2124,27 @@

      bringInRelevantPersonnelClick() {
        let _this = this
-        this.$confirm({
-          content: _this.$t('confirmBringInRelevantPersonnel'),
-          onOk() {
-            getAction(_this.url.matchRelevantPeople, { projectLibraryId: _this.$route.query.id }).then((res) => {
-              if (res.success) {
-                _this.$message.success(_this.$t('OperationSuccessful'))
-                _this.getList()
-              } else {
-                _this.$message.warning(_this.$t('operationFailed'))
-              }
-            })
-          }
-        })
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$confirm({
+            content: _this.$t('confirmBringInRelevantPersonnel'),
+            onOk() {
+              let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+              getAction(_this.url.matchRelevantPeople, {
+                ids: selectedRowKeys.join(','),
+                projectLibraryId: _this.$route.query.id
+              }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
      },

      resultReportedClick(val) {
@@ -2306,13 +2366,14 @@
  ::v-deep .ant-card-body {
    padding: 24px 24px 0 24px;
  }
+
  ::v-deep .ant-table-row:first-child {
    background: #fff!important;
    opacity: 0.9;
  }

  ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
  }
 </style>
 <style>
@@ -30,45 +30,48 @@
        <div class="box-top-content" style="position: relative">
          <!--        <div id="main"></div>-->
          <!--        <div class="axis-tip"></div>-->
-          <div class="box-top-content-left">
-            <div class="box-top-content-left-text" :title="item.projectName"
-                 v-for="(item,index) in timeData" :key="index">
-              {{item.projectName}}
-            </div>
+          <div class="box-top-content-right-top">
+            <div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div>
          </div>
-          <div class="box-top-content-right">
-            <div class="box-top-content-right-top">
-              <div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div>
+          <div style="overflow:visible;">
+            <div class="box-top-content-left">
+              <div class="box-top-content-left-text" :title="item.projectName"
+                   v-for="(item,index) in timeData" :key="index">
+                {{item.projectName}}
+              </div>
            </div>
-            <div class="box-top-content-right-bottom">
-              <div class="process-content" v-for="(item,index) in timeData" :key="index">
-                <div class="process-content-right-xian"></div>
-                <div class="process-content-content" :style="val.left"
-                     v-for="(val,indexOne) in item.data[0]" :key="indexOne">
+            <div class="box-top-content-right">
+              <div class="box-top-content-right-bottom">
+                <div class="process-content" v-for="(item,index) in timeData" :key="index">
+                  <div class="process-content-right-xian"></div>
+                  <div class="process-content-content" :style="val.left"
+                       v-for="(val,indexOne) in item.data[0]" :key="indexOne">

-                  <div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div>
-                  <div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}}</div>
-                  <a-tooltip placement="topLeft">
-                    <template slot="title">
-                      <span>{{val.time.slice(0,11)}}</span>
-                    </template>
-                    <img v-if="val.status == 1" src="../../../../assets/done.svg" class="process-content-left" alt="">
-                    <img v-else-if="val.status == 2" src="../../../../assets/open.svg"
-                         class="process-content-left"
-                         alt="">
-                    <img v-else-if="val.status == 3" src="../../../../assets/inprogress.svg"
-                         class="process-content-left"
-                         alt="">
-                  </a-tooltip>
-                  <!--                  <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
+                    <div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div>
+                    <div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}}
+                    </div>
+                    <a-tooltip placement="topLeft">
+                      <template slot="title">
+                        <span>{{val.time.slice(0,11)}}</span>
+                      </template>
+                      <img v-if="val.status == 1" src="../../../../assets/done.svg" class="process-content-left" alt="">
+                      <img v-else-if="val.status == 2" src="../../../../assets/open.svg"
+                           class="process-content-left"
+                           alt="">
+                      <img v-else-if="val.status == 3" src="../../../../assets/inprogress.svg"
+                           class="process-content-left"
+                           alt="">
+                    </a-tooltip>
+                    <!--                  <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
+                  </div>
+                </div>
+                <div class="box-top-content-right-xian"></div>
+                <div class="box-top-content-right-text">
+                  {{handlingTime}}
                </div>
              </div>
-              <div class="box-top-content-right-xian"></div>
-              <div class="box-top-content-right-text">
-                {{handlingTime}}
-              </div>
-            </div>

+            </div>
          </div>
          <JLoading :loading="loadingMain">{{this.$t('dataLoading')}}</JLoading>
        </div>
@@ -299,8 +302,8 @@
          let num = Math.ceil(clientWidthOne / 31) * parseInt(this.handlingTime.slice(8, 10))
          timeList.forEach((res, index) => {
            if (res.slice(0, 7) == this.handlingTime.slice(0, 7)) {
-              contentRightText[0].style = 'left:' + ((clientWidthOne * index + num) - 24) + 'px;' + 'display:block'
-              contentRightXian[0].style = 'left:' + ((clientWidthOne * index + num) + 10) + 'px;' + 'display:block'
+              contentRightText[0].style = 'left:' + ((clientWidthOne * index + num) - 28) + 'px;' + 'display:block'
+              contentRightXian[0].style = 'left:' + ((clientWidthOne * index + num) + 6) + 'px;' + 'display:block'
            }
          })

@@ -384,7 +387,7 @@
    width: 100%;
    height: calc(100vh - 160px);
    margin-bottom: 20px;
-    padding: 25px 50px 10px 20px;
+    padding: 0 50px 10px 20px;
    box-sizing: border-box;
    overflow: auto;
  }
@@ -417,12 +420,13 @@
    width: 300px;
    margin-top: -4px;
    margin-right: 20px;
+    margin-bottom: 10px;
  }

  .box-top-content-left {
    width: 140px;
    float: left;
-    padding-top: 100px;
+    padding-top: 68px;
    margin-right: 20px;
  }

@@ -447,6 +451,12 @@
    display: flex;
    flex-direction: row;
    justify-content: space-between;
+    position: sticky;
+    top: 0;
+    background: #fff;
+    z-index: 100;
+    padding-top: 25px;
+    padding-left: 160px;
  }

  .box-top-content-right-top-text {
@@ -506,7 +516,8 @@
        left: 50%;
        transform: translate(-50%, -50%);
      }
-      .process-content-right-button{
+
+      .process-content-right-button {
        font-size: 12px;
        color: #040B29;
        width: 75px;
@@ -518,6 +529,7 @@
        left: 50%;
        transform: translate(-50%, -50%);
      }
+
      .process-content-right-button {
        width: 75px;
        font-size: 12px;
@@ -555,5 +567,6 @@
    font-weight: bold;
    font-size: 14px;
    width: 100px;
+    z-index: 101;
  }
 </style>
@@ -56,45 +56,47 @@
      <div class="box-top-content" style="position: relative">
        <!--        <div id="main"></div>-->
        <!--        <div class="axis-tip"></div>-->
-        <div class="box-top-content-left">
-          <div class="box-top-content-left-text" :title="item.projectName"
-               v-for="(item,index) in timeData" :key="index">
-            {{item.projectName}}
-          </div>
+        <div class="box-top-content-right-top">
+          <div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div>
        </div>
-        <div class="box-top-content-right">
-          <div class="box-top-content-right-top">
-            <div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div>
+        <div style="overflow:visible;">
+          <div class="box-top-content-left">
+            <div class="box-top-content-left-text" :title="item.projectName"
+                 v-for="(item,index) in timeData" :key="index">
+              {{item.projectName}}
+            </div>
          </div>
-          <div class="box-top-content-right-bottom">
-            <div class="process-content" v-for="(item,index) in timeData" :key="index">
-              <div class="process-content-right-xian"></div>
-              <div class="process-content-content" :style="val.left"
-                   v-for="(val,indexOne) in item.data[0]" :key="indexOne">
-                <div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div>
-                <div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}}</div>
-                <a-tooltip placement="topLeft">
-                  <template slot="title">
-                    <span>{{val.time.slice(0,11)}}</span>
-                  </template>
-                  <img v-if="val.status == 1" src="../../../assets/done.svg" class="process-content-left"
-                       alt="">
-                  <img v-else-if="val.status == 2" src="../../../assets/open.svg"
-                       class="process-content-left"
-                       alt="">
-                  <img v-else-if="val.status == 3" src="../../../assets/inprogress.svg" class="process-content-left"
-                       alt="">
-                </a-tooltip>
+          <div class="box-top-content-right">
+            <div class="box-top-content-right-bottom">
+              <div class="process-content" v-for="(item,index) in timeData" :key="index">
+                <div class="process-content-right-xian"></div>
+                <div class="process-content-content" :style="val.left"
+                     v-for="(val,indexOne) in item.data[0]" :key="indexOne">
+                  <div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div>
+                  <div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}}
+                  </div>
+                  <a-tooltip placement="topLeft">
+                    <template slot="title">
+                      <span>{{val.time.slice(0,11)}}</span>
+                    </template>
+                    <img v-if="val.status == 1" src="../../../assets/done.svg" class="process-content-left"
+                         alt="">
+                    <img v-else-if="val.status == 2" src="../../../assets/open.svg"
+                         class="process-content-left"
+                         alt="">
+                    <img v-else-if="val.status == 3" src="../../../assets/inprogress.svg" class="process-content-left"
+                         alt="">
+                  </a-tooltip>

-                <!--                <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
+                  <!--                <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
+                </div>
+              </div>
+              <div class="box-top-content-right-xian"></div>
+              <div class="box-top-content-right-text">
+                {{handlingTime}}
              </div>
            </div>
-            <div class="box-top-content-right-xian"></div>
-            <div class="box-top-content-right-text">
-              {{handlingTime}}
-            </div>
          </div>
-
        </div>
        <JLoading :loading="loadingMain">{{this.$t('dataLoading')}}</JLoading>
      </div>
@@ -308,8 +310,8 @@
      },
      getTimeline() {
        let query = {
-          startTime: this.startTime || this.getNewDate('before',6),
-          endTime: this.endTime || this.getNewDate('after',5),
+          startTime: this.startTime || this.getNewDate('before', 6),
+          endTime: this.endTime || this.getNewDate('after', 5),
          ...this.queryParam
        }
        this.loadingMain = true
@@ -341,8 +343,8 @@
      },
      getTimelineList(time) {
        let query = {
-          startTime: this.startTime || this.getNewDate('before',6),
-          endTime: this.endTime || this.getNewDate('after',5),
+          startTime: this.startTime || this.getNewDate('before', 6),
+          endTime: this.endTime || this.getNewDate('after', 5),
          ...this.queryParam
        }
        getAction(this.url.timelineList, query).then((res) => {
@@ -529,7 +531,7 @@
    width: 100%;
    height: 500px;
    margin-bottom: 20px;
-    padding: 20px 58px 20px 10px;
+    padding: 0 58px 20px 10px;
    box-sizing: border-box;
    overflow: auto;
  }
@@ -572,7 +574,7 @@
  .box-top-content-left {
    width: 140px;
    float: left;
-    padding-top: 100px;
+    padding-top: 57px;
    margin-right: 20px;
  }

@@ -597,6 +599,12 @@
    display: flex;
    flex-direction: row;
    justify-content: space-between;
+    position: sticky;
+    top: 0;
+    background: #fff;
+    z-index: 100;
+    padding-top: 20px;
+    padding-left: 160px;
  }

  .box-top-content-right-top-text {
@@ -620,7 +628,7 @@

  .box-top-content-right-bottom {
    position: relative;
-    padding-top: 60px;
+    padding-top: 50px;
  }

  .process-content {
@@ -657,18 +665,20 @@
        left: 50%;
        transform: translate(-50%, -50%);
      }
-     .process-content-right-button{
-       font-size: 12px;
-       color: #040B29;
-       width: 75px;
-       background: #fff;
-       display: inline-block;
-       overflow: hidden;
-       position: absolute;
-       top: 12px;
-       left: 50%;
-       transform: translate(-50%, -50%);
-     }
+
+      .process-content-right-button {
+        font-size: 12px;
+        color: #040B29;
+        width: 75px;
+        background: #fff;
+        display: inline-block;
+        overflow: hidden;
+        position: absolute;
+        top: 12px;
+        left: 50%;
+        transform: translate(-50%, -50%);
+      }
+
      .process-content-right-button {
        width: 75px;
        font-size: 12px;
@@ -706,5 +716,6 @@
    font-weight: bold;
    font-size: 14px;
    width: 100px;
+    z-index: 101;
  }
 </style>