合并分支 'feature_dev_20221125_YW' 到 'master'

Feature dev 20221125 yw

查看合并请求 laws-nio/laws-weilai!259

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -73,4 +73,9 @@ INSERT INTO `laws_weilai`.`onl_cgform_field`(`id`, `cgform_head_id`, `db_field_n
 ALTER TABLE `laws_weilai`.`params_manifest_history`
     ADD COLUMN `references_col_name` varchar(255) NULL COMMENT '参数项清单的参考列名称' AFTER `project_version_id`;
 ALTER TABLE `laws_weilai`.`params_info_publish`
-    CHANGE COLUMN `version` `publish_version` int(11) NULL DEFAULT NULL COMMENT '发布时版本' AFTER `params_template_id`;
+    CHANGE COLUMN `version` `publish_version` int(11) NULL DEFAULT NULL COMMENT '发布时版本' AFTER `params_template_id`;
+
+
+-- 上报库历史表，增加备注字段  2022-12-12  未同步生产环境
+ALTER TABLE `laws_weilai`.`params_report_detail_log`
+    ADD COLUMN `remarks` varchar(4000) NULL COMMENT '备注' AFTER `params_report_detail_id`;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -581,12 +581,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 									  @RequestParam(value = "paramsReportId") String paramsReportId,
 									  @RequestParam(value = "paramsReportConfigId") String paramsReportConfigId,
 									  @RequestParam(value = "paramsReportConfigName") String paramsReportConfigName) {
-		boolean isSuccess = paramsCollectManifestEOService.addReferencesCol(paramsManifestId, paramsReportId, paramsReportConfigId, paramsReportConfigName);
+		return this.paramsCollectManifestEOService.addReferencesCol(paramsManifestId, paramsReportId, paramsReportConfigId, paramsReportConfigName);
-		if (isSuccess) {
-			return Result.OK("引用参考列成功！");
-		} else {
-			return Result.error("引用参考列失败！");
-		}
 	}
 
 	/**
@@ -653,15 +648,27 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
     }
 
 	/**
-	 *  撤回
+	 *  认证工程师-强制撤回
 	 *
 	 * @param paramsCollectManifestVO
 	 * @return
 	 */
-	@AutoLog(value = "参数项收集清单-强制撤回")
+	@AutoLog(value = "参数项收集清单-认证工程师-强制撤回")
-	@ApiOperation(value="参数项收集清单-强制撤回", notes="参数项收集清单-强制撤回")
+	@ApiOperation(value="参数项收集清单-认证工程师-强制撤回", notes="参数项收集清单-认证工程师-强制撤回")
 	@PostMapping(value = "/mandatoryWithdraw")
 	public Result<?> mandatoryWithdraw(ParamsCollectManifestVO paramsCollectManifestVO) {
 		return this.paramsCollectManifestEOService.mandatoryWithdraw(paramsCollectManifestVO);
 	}
+
+	/**
+	 * 认证工程师-分配填写人
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-认证工程师-分配填写人")
+	@ApiOperation(value="参数项收集清单-认证工程师-分配填写人", notes="参数项收集清单-认证工程师-分配填写人")
+	@PostMapping(value = "/certifiedEngineerUpdateDreBatch")
+	public Result<?> certifiedEngineerUpdateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		return this.paramsCollectManifestEOService.certifiedEngineerUpdateDreBatch(paramsCollectManifestVO);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java

@@ -183,11 +183,14 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	void checkDeadline();
 
 	// 认证工程师-引用参考列
-	boolean addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName);
+	Result<?> addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName);
 
 	// 认证工程师-更新参考列
 	boolean updateReferencesCol(List<Map<String, Object>> configDataList, String paramsManifestId);
 
 	// 认证工程师-强制撤回
 	Result<?>  mandatoryWithdraw(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 认证工程师-批量修改填写人
+	Result<?> certifiedEngineerUpdateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ZipUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -4975,7 +4976,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	}
 
 	@Override
-	public boolean addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName) {
+	public Result<?> addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName) {
 		// 获取清单参数项
 		ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO();
 		queryEO.setParamsManifestId(paramsManifestId);
@@ -5027,7 +5028,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		paramsManifestEOService.updateById(paramsManifestEO);
 
 		// 修改参数项 参考列
-		return  updateBatchById(updateEOList);
+		try {
+			updateBatchById(updateEOList);
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("修改参数项，参考列失败: " + ex.getMessage());
+			throw new JeroBootException("引用参考列失败！");
+		}
+
+		return Result.OK("引用参考列成功！");
 	}
 
 	@Override
@@ -5210,6 +5219,193 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return Result.OK("强制撤回成功！");
 	}
 
+	@Override
+	public Result<?> certifiedEngineerUpdateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getDre())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
+			throw new JeroBootException("参数不能为空！");
+		}
+		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
+		String dre = paramsCollectManifestVO.getDre();
+		String projectId = paramsCollectManifestVO.getProjectId();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		paramsManifestEO.setProjectName(projectInfo.getProjectName());
+
+		String[] paramsCollectManifestIdArr = paramsCollectManifestIds.split(",");
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+
+		LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsCollectManifestEO::getId, Arrays.asList(paramsCollectManifestIdArr))
+				.orderByAsc(ParamsCollectManifestEO::getDeadline).orderByAsc(ParamsCollectManifestEO::getNioNumber);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = this.list(queryWrapper);
+		Date deadline = paramsCollectManifestEOList.get(0).getDeadline();
+
+		// 存放数据的前后填写与工程接口人信息
+		List<Map<String,Object>> paramsCollectManifestMapList = new ArrayList<>();
+		for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
+			// 如果新分发的填写人和原填写人一致，直接跳过。
+			if(StringUtils.equals(dre,paramsCollectManifestEO.getDre())){
+				continue;
+			}
+
+			Map<String,Object> paramsCollectManifestMap = new HashMap<>();
+			paramsCollectManifestMap.put("paramsCollectManifestId",paramsCollectManifestEO.getId());
+			paramsCollectManifestMap.put("dreUpdateFront",paramsCollectManifestEO.getDre());
+			paramsCollectManifestMap.put("dreUpdateAfter",dre);
+			paramsCollectManifestMap.put("sdt",paramsCollectManifestEO.getSdt());
+			paramsCollectManifestMap.put("paramsCollectManifestEO",paramsCollectManifestEO);
+			paramsCollectManifestMapList.add(paramsCollectManifestMap);
+
+			ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+			updateEO.setId(paramsCollectManifestEO.getId());
+			updateEO.setDre(dre); // 设置填写人
+			updateEO.setState(CollectManifestStateEnum.WAIT_FILL.getValue()); // 设置状态为：待填写
+			updateEOList.add(updateEO);
+		}
+		if(CollectionUtils.isNotEmpty(updateEOList)){
+			this.updateBatchById(updateEOList);
+			// 发送变更消息
+			this.sendChangeMessage(paramsCollectManifestMapList,paramsManifestEO,projectInfo,dre,deadline);
+		}
+		return Result.OK("分配填写人成功！");
+	}
+
+	/**
+	 * 发送变更消息
+	 * @param paramsCollectManifestMapList
+	 * @param paramsManifestEO				清单信息
+	 * @param projectInfo
+	 * @param dre
+	 * @param deadline
+	 */
+	public void sendChangeMessage(List<Map<String,Object>> paramsCollectManifestMapList,ParamsManifestEO paramsManifestEO,ParamsManifestVO projectInfo,String dre,Date deadline){
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		if(CollectionUtils.isNotEmpty(paramsCollectManifestMapList)){
+			// 工程接口人
+			Map<String, List<Map<String,Object>>> sdtGroupMap = paramsCollectManifestMapList.stream().collect(Collectors.groupingBy((m -> (m.get("sdt").toString()))));
+			for (Map.Entry<String, List<Map<String, Object>>> sdtMap : sdtGroupMap.entrySet()) {
+				String sdtUserName = sdtMap.getKey();
+
+				String nioNumbers = "";
+				List<Map<String, Object>> value = sdtMap.getValue();
+				for (Map<String, Object> map : value) {
+					ParamsCollectManifestEO paramsCollectManifestEO = JSONObject.parseObject(JSONObject.toJSONString(map.get("paramsCollectManifestEO")), ParamsCollectManifestEO.class);
+					String nioNumber = paramsCollectManifestEO.getNioNumber();
+					nioNumbers += nioNumber + ",";
+				}
+
+				if(StringUtils.isNotEmpty(nioNumbers)){
+					nioNumbers = nioNumbers.substring(0,nioNumbers.length()-1);
+				}
+
+				String cnContentUpper = "您参与填写的参数 " + nioNumbers + "，已被 " + currentUser.getUsername() + " 重新分发给 " + dre + "请及时查看。";
+				String enContentUpper = "The parameter " + nioNumbers + " you distributed have been re-assigned to  " + currentUser.getUsername() + " by " + dre;
+
+				// 消息内容
+				SysUser sysUser = this.sysUserService.getUserByName(sdtUserName);
+				String[] thirdIds = new String[1];
+				thirdIds[0] = sysUser.getThirdId();
+				String urlParamsStr = parseUrlParams(paramsManifestEO);
+				String hrefFeishu = this.backUrl + "/ParameterItemCollection" + urlParamsStr;
+
+				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+				feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+				feishuMsgVo.setCnContentUpper(cnContentUpper);
+				feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+						"\n发起人: " + currentUser.getUsername());
+				feishuMsgVo.setEnContentUpper(enContentUpper);
+				feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+						"\nInitiator: " + currentUser.getUsername());
+				feishuMsgVo.setUrl(hrefFeishu);
+				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue());
+				try {
+					this.feishuService.sendCard(thirdIds, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+
+			// 修改前填写人
+			Map<String, List<Map<String,Object>>> dreUpdateFrontGroupMap = paramsCollectManifestMapList.stream().collect(Collectors.groupingBy((m -> (m.get("dreUpdateFront").toString()))));
+			for (Map.Entry<String, List<Map<String, Object>>> dreUpdateFrontMap : dreUpdateFrontGroupMap.entrySet()) {
+				String dreUpdateFront = dreUpdateFrontMap.getKey();
+
+				String nioNumbers = "";
+				List<Map<String, Object>> value = dreUpdateFrontMap.getValue();
+				for (Map<String, Object> map : value) {
+					ParamsCollectManifestEO paramsCollectManifestEO = JSONObject.parseObject(JSONObject.toJSONString(map.get("paramsCollectManifestEO")), ParamsCollectManifestEO.class);
+					String nioNumber = paramsCollectManifestEO.getNioNumber();
+					nioNumbers += nioNumber + ",";
+				}
+				if(StringUtils.isNotEmpty(nioNumbers)){
+					nioNumbers = nioNumbers.substring(0,nioNumbers.length()-1);
+				}
+
+				String cnContentUpper = "您参与填写的参数 " + nioNumbers + " 已被 "+ currentUser.getUsername() +" 撤回。";
+				String enContentUpper = "The parameter " + nioNumbers + " you filled in have been withdrawn by "+ currentUser.getUsername();
+
+				// 消息内容
+				SysUser sysUser = sysUserService.getUserByName(dreUpdateFront);
+				String[] thirdIds = new String[1];
+				thirdIds[0] = sysUser.getThirdId();
+				String urlParamsStr = parseUrlParams(paramsManifestEO);
+				String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+
+				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+				feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+				feishuMsgVo.setCnContentUpper(cnContentUpper);
+				feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+						"\n发起人: " + currentUser.getUsername());
+				feishuMsgVo.setEnContentUpper(enContentUpper);
+				feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+						"\nInitiator: " + currentUser.getUsername());
+				feishuMsgVo.setUrl(hrefFeishu);
+				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue());
+				try {
+					this.feishuService.sendCard(thirdIds, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			// 修改后填写人
+			Map<String, List<Map<String,Object>>> dreUpdateAfterGroupMap = paramsCollectManifestMapList.stream().collect(Collectors.groupingBy((m -> (m.get("dreUpdateAfter").toString()))));
+			for (Map.Entry<String, List<Map<String, Object>>> dreUpdateAfterMap : dreUpdateAfterGroupMap.entrySet()) {
+				String dreUpdateAfter = dreUpdateAfterMap.getKey();
+
+				// 消息内容
+				SysUser sysUser = sysUserService.getUserByName(dreUpdateAfter);
+				String[] thirdIds = new String[1];
+				thirdIds[0] = sysUser.getThirdId();
+				String urlParamsStr = parseUrlParams(paramsManifestEO);
+				String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+
+				FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+				feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+				feishuMsgVo.setCnContentUpper("您好，"+ currentUser.getUsername() +"向您分发了认证参数填写任务，请及时处理。");
+				feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+						"\n发起人: " + currentUser.getUsername() +
+						"\n截止时间: " + sdf.format(deadline));
+				feishuMsgVo.setEnContentUpper("Hello! "+ currentUser.getUsername() +" has assigned the task of filling in Homo Parameter to you. Please address it in a timely manner.");
+				feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+						"\nInitiator: " + currentUser.getUsername() +
+						"\nDue Date: " + sdf.format(deadline));
+				feishuMsgVo.setUrl(hrefFeishu);
+				feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue());
+				try {
+					this.feishuService.sendCard(thirdIds, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
+			}
+		}
+	}
+
 	private void deadlineDateMap(Map<String, List<String>> today, ParamsCollectManifestEO collectManifestEO, String thirdId) {
 		List<String> stringList = today.get(thirdId);
 		if (ObjectUtils.isEmpty(stringList)) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailLogEO.java

@@ -85,4 +85,8 @@ public class ParamsReportDetailLogEO implements Serializable {
     @TableField(exist = false)
     private String logContent;
 
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remarks;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailLogEOMapper.xml

@@ -13,6 +13,7 @@
         <result column="params_report_id" property="paramsReportId" />
         <result column="params_report_detail_id" property="paramsReportDetailId" />
         <result column="log_Content" property="logContent" />
+        <result column="remarks" property="remarks" />
     </resultMap>
 
     <select id="listByReportIdOrReportDetailId" resultMap="ParamsReportDetailLogEOResultMap">
@@ -29,7 +30,7 @@
     </select>
 
     <select id="pageInfo" resultMap="ParamsReportDetailLogEOResultMap">
-        select id, create_time, create_by, params_report_id, params_report_detail_id,
+        select id, create_time, create_by, params_report_id, params_report_detail_id,remarks,
         <if test="cut == 'cn'">
             log_cn_content as log_Content
         </if>
@@ -40,4 +41,4 @@
         where params_report_detail_id = #{paramsReportDetailId}
         order by create_time desc
     </select>
-</mapper>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -68,4 +70,7 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
 
 	// 引用参考列时的查询
 	List<ParamsReportConfigDataEO> listInfoForReferencesCol(String paramsReportId, String paramsReportConfigId);
+
+	// 导出参数项历史Log信息
+	void exportParamsReportDetailLog(String cut, XSSFWorkbook workbook, String sheetHistoryName, List<Map<String, Object>> allParamsInfoList, XSSFCellStyle headerCellStyle,XSSFCellStyle bodyCellStyle);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
@@ -38,6 +39,7 @@ import com.jero.modules.split.common.ReadExcel;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.ISysDictItemService;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.util.HSSFColor;
@@ -137,6 +139,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 
 		List<Map<String, Object>> listMap = new ArrayList<>();
 		list.forEach(collectManifestEO -> { // 参数收集清单
+
+			// 2022-12-12  上报库 参数项查看列表  备注设置为空。
+			collectManifestEO.setRemarks(null);
+
 			// 处理数据字典字段 中英文切换 认证类型，责任领域
 			List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
 			List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
@@ -596,8 +602,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			String fileName = fileOriName + ".xlsx";
 			// 设置表格相关属性
 			String sheetName = "参数项信息";
+			String sheetHistoryName = "历史记录";
 			if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
 				sheetName = "Params data";
+				sheetHistoryName = "historical Record";
 			}
 			XSSFSheet sheetItems = workbook.createSheet(sheetName);
 			String[] titles = getWorkbookTitleForExport(paramsReportDetailVO); // 获取表头
@@ -666,6 +674,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 
 			}
 
+			// 导出参数明细历史
+			this.exportParamsReportDetailLog(paramsReportDetailVO.getCut(), workbook, sheetHistoryName, allParamsInfoList,cellStyle1,cellStyle);
 			//下载关联文件内容
 			if (allRelevFileList != null && !allRelevFileList.isEmpty()) {
 				allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList());
@@ -710,6 +720,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			os.close(); // 后开先关
 			fis.close(); // 先开后关
 		} catch (Exception e) {
+			e.printStackTrace();
 			log.error(e.getMessage(), e);
 			if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
 				throw new JeroBootException("Failed to download file, please try again");
@@ -725,6 +736,79 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		}
 	}
 
+	@Override
+	public void exportParamsReportDetailLog(String cut, XSSFWorkbook workbook, String sheetHistoryName, List<Map<String, Object>> allParamsInfoList,XSSFCellStyle headerCellStyle,XSSFCellStyle bodyCellStyle) {
+		// 处理历史log sheet里面的数据
+		XSSFSheet sheetHistory = workbook.createSheet(sheetHistoryName);
+		String[] historyHeaderArr = new String[]{"NIO编号","操作详情","备注","操作时间"};
+		if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
+			historyHeaderArr = new String[]{"NIO Number", "Operation Details", "Comments", "Operation Time"};
+		}
+		XSSFRow historyRowFirst = sheetHistory.createRow(0);
+		for (int i = 0; i < historyHeaderArr.length; i++) {
+			XSSFCell cell = historyRowFirst.createCell(i);
+			XSSFRichTextString text = new XSSFRichTextString(historyHeaderArr[i]);
+			cell.setCellValue(text);
+			cell.setCellStyle(headerCellStyle);
+
+			// 设置单元格宽度
+			String[] ParamsValueArr =  new String[]{"操作详情","备注"};
+			if (CutEnum.EN.getValue().equals(cut)) {
+				ParamsValueArr = new String[]{"Operation Details","Comments"};
+			}
+
+			String historyHeaderStr = historyHeaderArr[i];
+			boolean widthFlag = false;
+			for (int i1 = 0; i1 < ParamsValueArr.length; i1++) {
+				if(StringUtils.equals(historyHeaderStr,ParamsValueArr[i1])){
+					widthFlag = true;
+				}
+			}
+			if(widthFlag){
+				sheetHistory.setColumnWidth(i, 80 * 256);
+			}else {
+				sheetHistory.setColumnWidth(i, 20 * 256);
+			}
+		}
+		// 查询历史log信息
+		List<String> detailIdList = allParamsInfoList.stream().map(e -> e.get("id").toString()).distinct().collect(Collectors.toList());
+		QueryWrapper<ParamsReportDetailLogEO> detailLogQueryWrap = new QueryWrapper<>();
+		detailLogQueryWrap.lambda().in(ParamsReportDetailLogEO::getParamsReportDetailId,detailIdList);
+		detailLogQueryWrap.orderByDesc("params_report_detail_id");
+		List<ParamsReportDetailLogEO> detailLogList = this.paramsReportDetailLogEOService.list(detailLogQueryWrap);
+		if (CollectionUtils.isNotEmpty(detailLogList)) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+			int historyRowNumber = 1;
+			for (int i = 0; i < detailLogList.size(); i++) {
+				String paramsReportDetailId = detailLogList.get(i).getParamsReportDetailId();
+
+				String nioNumber = allParamsInfoList.stream().filter(paramsInfo -> {
+					boolean flag = false;
+					if(StringUtils.equals(paramsInfo.get("id").toString(),paramsReportDetailId)){
+						flag = true;
+					}
+					return flag;
+				}).map(e -> e.get("nio_number").toString()).distinct().collect(Collectors.toList()).get(0);
+				String operatorDetails = detailLogList.get(i).getLogCnContent();
+				String operatorTime = sdf.format(detailLogList.get(i).getCreateTime());
+				if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+					operatorDetails = detailLogList.get(i).getLogEnContent();
+				}
+
+				XSSFRow row1 = sheetHistory.createRow(historyRowNumber);
+				row1.createCell(0).setCellValue(nioNumber);
+				row1.createCell(1).setCellValue(operatorDetails);
+				row1.createCell(2).setCellValue(detailLogList.get(i).getRemarks());
+				row1.createCell(3).setCellValue(operatorTime);
+				for (int j = 0; j < 4; j++) {
+					row1.getCell(j).setCellStyle(bodyCellStyle);
+				}
+				historyRowNumber ++;
+			}
+		}
+	}
+
 	@Override
 	public List<Map<String, String>> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO) {
 		String paramsManifestId = paramsReportDetailVO.getParamsManifestId();
@@ -1730,10 +1814,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			}
 			ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
 			if (logCnContent.toString().endsWith("，")) {
+				String ramarks = "";
+				if(map.get("remarks") != null){
+					ramarks = map.get("remarks").toString();
+				}
 				insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.lastIndexOf("，")));
 				insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logEnContent.lastIndexOf(",")));
 				insertLogEO.setParamsReportId(paramsManifestId);
 				insertLogEO.setParamsReportDetailId(paramsCollectManifestId);
+				insertLogEO.setRemarks(ramarks);
 				insertLogEOList.add(insertLogEO);
 			}
 		}

jero-web/src/common/lang/en-us.js

@@ -1367,4 +1367,5 @@ module.exports = {
   Referenceparametercolumn:'Reference Parameter Column',
   Updateparametercolumn:'Update The Parameter Column',
   columnfirst:'Reference the parameter column first',
+  columnforced:'Confirm a forced retraction?',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1468,4 +1468,5 @@ module.exports = {
   Referenceparametercolumn:'引用参数列',
   Updateparametercolumn:'更新参数列',
   columnfirst:'请先引用参数列',
+  columnforced:'确认强制撤回?',
 }

jero-web/src/components/AssignedByHomo/index.vue

@@ -0,0 +1,261 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading' @keyup.enter.native="searchQuery">
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='form'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24' style='margin-left: -66px'>
+          <a-col :span='9'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('name')" prop='paramsTemplateName'>
+              <a-input
+                v-model='form.realname' />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('FNumber')" prop='paramsTemplateName'>
+              <a-input
+                v-model='form.username' />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='6' style='margin-top: 5px;'>
+            <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <a-table
+      class='table-area'
+      ref='table'
+      size='middle'
+      rowKey='id'
+      :columns='columns'
+      :dataSource='areaTable'
+      :pagination='false'
+      :loading='loading'
+      :scroll='{x: 600}'
+      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+      @change='handleTableChange'>
+    </a-table>
+    <div class="page">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+    <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>
+    </div>
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      columns: [
+        {
+          title: this.$t('name'),
+          dataIndex: 'realname',
+          key: 'showArea',
+          align: 'center',
+          ellipsis: true
+        },
+        {
+          title: this.$t('FNumber'),
+          align: 'center',
+          dataIndex: 'username',
+          ellipsis: true
+        }
+      ],
+      newVisible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      rules: {},
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      pageNo: 1,
+      pageSize: 10
+    }
+  },
+  props: {
+    selectedRowKeysArray: {
+      type: String,
+      default: '',
+      require: true
+    }
+  },
+  mounted() {
+    this.loadData()
+  },
+  methods: {
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.loadData()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.loadData()
+    },
+    loadData() {
+      this.loading = true
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.form
+      }
+      if(this.form.username !== undefined) {
+        params.username = `*${this.form.username}*`
+      }
+      if(this.form.realname !== undefined) {
+        params.realname = `*${this.form.realname}*`
+      }
+      getAction(`params/collectManifest/drePage`, params).then(res => {
+        if (res.success) {
+          this.areaTable = [...res.result.records]
+          this.total = res.result.total
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.form = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisible', false)
+    },
+    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
+      this.selectedRowKeysDate = selectedRowKeysDate
+      this.selectedRowKeys = selectedRowKeys
+    },
+    handleTableChange(val) {
+    },
+    //新增
+    handleSubmit() {
+      let _this = this
+      if (this.selectedRowKeys.length == 0) {
+        this.$message.warning(this.$t('pleaseSelectData'))
+      } else if (this.selectedRowKeys.length > 1) {
+        this.$message.warning(this.$t('OnlyOneSelected'))
+      } else {
+        let param = {ids: this.selectedRowKeysArray, paramsManifestId:this.$route.query.id ,projectId: this.$route.query.projectId, dre:this.selectedRowKeysDate[0].username }
+        this.confirmLoading = true
+        axios({
+          url: '/jero-boot/params/collectManifest/certifiedEngineerUpdateDreBatch',
+          method: 'post',
+          data: param,
+          transformRequest: [function (data) {
+            let ret = ''
+            for (let it in data) {
+              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+            }
+            return ret
+          }],
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'X-Access-Token':_this.token
+          }
+        })
+          .then( (res) =>{
+            if (res.data.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              // 填写人
+              // 获取当前登陆人
+              this.confirmLoading = false
+              this.$emit('GetgetLoginUserType')
+              this.$emit('GetgetTableList')
+              this.$emit('areaVisibleAssignedbyflaghomo', false)
+            }else{
+              this.confirmLoading = false
+              _this.$message.warning(_this.$t('operationFailed'))
+            }
+          })
+          .catch( (error) =>{
+            this.confirmLoading = false
+            console.log(error);
+          });
+      }
+    }
+  }
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+  ::v-deep .page{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+  }
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>

jero-web/src/components/tableCollection/index.vue

@@ -55,18 +55,18 @@
          </span>
         <span slot="operationzr" slot-scope="record">
            <span v-if='currentPersonRole === "homo"'>
-<!--           认证工程师  -->
+<!--           责任领域  -->
            <span
              v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'>
              <span :title='record.dataValue'
-                   @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+                   @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined' || record.dataValue  == '')? '--': record.dataValue }}</span>
            </span>
              <span v-else>
-             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined' || record.dataValue  == '')? '--': record.dataValue }}</span>
            </span>
            </span>
            <span v-else>
-             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined' || record.dataValue  == '')? '--': record.dataValue }}</span>
            </span>
          </span>
 
@@ -489,8 +489,8 @@
                 console.log(res)
                 if (res.data.success) {
                   _this.$message.success(_this.$t('OperationSuccessful'))
-                  // this.$refs['ruleFormOne'].resetFields()
                   _this.areaVisiblezr = false
+                  this.$refs['ruleFormOne'].resetFields()
                   this.getLoginUserType()
                 } else {
                   _this.$message.warning(_this.$t('operationFailed'))

jero-web/src/components/tableCollection/index1.vue

@@ -34,6 +34,7 @@
                        :placeholder="$t('pleaseEnter')"
                        v-model="record.remarks"/>
         </span>
+<!--        历史记录-->
         <template slot="Operation" slot-scope="text, record">
           <a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button>
         </template>
@@ -183,6 +184,11 @@
             <span v-html="text"></span>
       </a-tooltip>
        </span>
+        <span slot="detailText" slot-scope="text,record">
+              <span class="text" :title="text">
+               {{text && text.length > 10?text.slice(0,9)+'...':text}}
+              </span>
+        </span>
       </a-table>
       <div class="page" v-if="dataSourcehistory.length > 0">
         <a-pagination
@@ -338,6 +344,14 @@
             ellipsis: true,
             scopedSlots: { customRender: 'content' }
           },
+          {
+            title: this.$t('remarks'),
+            dataIndex: 'remarks',
+            align: 'center',
+            ellipsis: true,
+            width: 180,
+            scopedSlots: { customRender: 'detailText' }
+          },
           {
             title: this.$t('OperationTime'),
             dataIndex: 'createTime',

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -177,6 +177,11 @@
                   <a-icon type="solution"/>
                   {{$t('Adjustareasofresponsibility')}}
                 </div>
+                <!--      认证工程师分配填写人-->
+                <div @click="assignedByHomo" class="operator-text-title" v-if='currentPersonRole == "homo" '>
+                  <a-icon type="copy"/>
+                  {{$t('Assignedby')}}
+                </div>
               </template>
 <!--              @click='morepop'-->
               <div class="operator-text" style="position: relative "  v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
@@ -309,6 +314,13 @@
                    @GetgetLoginUserType='GetgetLoginUserType'
                    @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
     </a-modal>
+    <!--  认证分配填写人--->
+    <a-modal v-model="areaVisibleAssignedbyhomo" :title="$t('Assignedby')" width='950px' :footer="null">
+      <assigned-by-homo v-if='areaVisibleAssignedbyhomo' :selectedRowKeysArray='selectedRowKeysArray'
+                   @GetgetTableList='GetgetTableList'
+                   @GetgetLoginUserType='GetgetLoginUserType'
+                   @areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo' @areaVisible='areaVisibleAssignedbyhomo = false'/>
+    </a-modal>
     <!--  下发收集--->
 <!--    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
       <task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
@@ -443,6 +455,10 @@
             <span v-else-if='jurisdiction === "SDTFPTXR"' class="text-wraning">
               '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
             </span>
+            <!--        分配填写人  -->
+            <span v-else-if='jurisdiction === "SDTFPTXRHOMO"' class="text-wraning">
+              '{{$t('completed')}}'
+            </span>
             <!--            引用参数-->
             <span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning">
               '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'
@@ -494,6 +510,7 @@
   import AdjustareaSofrespon from '@/components/AdjustareaSofrespon/index'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
   import AssignedBy from '@/components/AssignedBy/index'
+  import AssignedByHomo from '@/components/AssignedByHomo/index'
   import ImportFileOnlyList from '@/components/ImportFileOnlyListtag/index'
   import axios from 'axios'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -507,6 +524,7 @@
       ParameterLibraryAdd,
       parameterColumn,
       AssignedBy,
+      AssignedByHomo,
       AdjustareaSofrespon,
       ImportFileOnlyList,
       TaskCutOffTime,
@@ -688,6 +706,7 @@
         Dateline: {},
         areaVisibleFreeze: false, // 冻结配置
         areaVisibleAssignedby: false, // 分配填写人弹框
+        areaVisibleAssignedbyhomo: false, // 认证分配填写人弹框
         areaVisibleTaskCutOffTime: false, // 截至时间弹框
         OneclickCollection:false,
         parametercolumn:false,
@@ -1148,6 +1167,27 @@
         }
         return flag
       },
+      // 认证工程师 分配填写人 权限
+      // 仅仅状态为 待填写 可以分配填写人
+      sdtJurisdictionAssignedhomo() {
+        // 定义开关 0为没有权限  1为有权限
+        this.NotSelectedRowKeysValue = []
+        let flag = 1
+        if (this.selectedRowKeysValue.length == 0) {
+          flag = 2
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.selectedRowKeysValue.forEach((item, index) => {
+            console.log(item.state)
+            if (item.state !== '待填写' && item.state !== 'To be filled') {
+              this.NotSelectedRowKeysValue.push(item)
+              flag = 0
+            }
+          })
+        }
+        console.log(flag)
+        return flag
+      },
       // 填写人 提交 权限
       // 仅仅状态为 待填写 认证工程师退回 可以提交
       dreJurisdictionSubmit() {
@@ -1340,7 +1380,6 @@
       },
       // 引用参数列
       Referenceparametercolumn() {
-        console.log(1111)
         this.parametercolumn = true
       },
       Updateparametercolumn() {
@@ -1348,16 +1387,20 @@
         console.log(data)
         let referencesCol = []
         let postDate = []
+        let colunmnFlag = ''
         data.forEach((item,index) => {
-          if(!item.dutyTerritory){
+          if(!item.referencesCol){
-            this.$message.warning(this.$t('columnfirst'))
+            this.colunmnFlag = true
-            return
           }
           referencesCol.push({
             referencesCol: item.referencesCol,
             id: item.id
           })
         })
+        if(this.colunmnFlag){
+          this.$message.warning(this.$t('columnfirst'))
+          return
+        }
         for (let i = 0; i < referencesCol.length; i++) {
           let postDateobj = {}
           let itemIn = Object.keys(referencesCol[i])
@@ -1665,48 +1708,55 @@
         })
         let _this = this
         let param = { ids: _array.join(',') }
-        this.textLoading = true
         let url = ''
         if(this.currentPersonRole == 'homo'){
           url = '/jero-boot/params/collectManifest/mandatoryWithdraw'
         }else{
           url = '/jero-boot/params/collectManifest/withdraw'
         }
-        axios({
+        this.$confirm({
-          url: url,
+          title: this.$t('columnforced'),
-          method: 'post',
+          content: '',
-          data: param,
+          onOk:
-          transformRequest: [function(data) {
+            async () => {
-            let ret = ''
+              this.textLoading = true
-            for (let it in data) {
+              axios({
-              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                url: url,
+                method: 'post',
+                data: param,
+                transformRequest: [function(data) {
+                  let ret = ''
+                  for (let it in data) {
+                    ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                  }
+                  return ret
+                }],
+                headers: {
+                  'Content-Type': 'application/x-www-form-urlencoded',
+                  'X-Access-Token': _this.token
+                }
+              })
+                .then((res) => {
+                  if (res.data.success) {
+                    this.textLoading = false
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.GetgetTableList()
+                    _this.selectedRowKeysValue = []
+                  } else {
+                    this.textLoading = false
+                    _this.$message.warning(_this.$t('operationFailed'))
+                  }
+                })
+                .catch((error) => {
+                  this.textLoading = false
+                })
             }
-            return ret
-          }],
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'X-Access-Token': _this.token
-          }
         })
-          .then((res) => {
-            if (res.data.success) {
-              this.textLoading = false
-              _this.$message.success(_this.$t('OperationSuccessful'))
-              _this.GetgetTableList()
-              _this.selectedRowKeysValue = []
-            } else {
-              this.textLoading = false
-              _this.$message.warning(_this.$t('operationFailed'))
-            }
-          })
-          .catch((error) => {
-            this.textLoading = false
-          })
       },
       // 分配填写人
       assignedBy() {
-        // 工程接口人
+          let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned()
-        let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned()
+          // 工程接口人
         if (sdtJurisdictionAssigned == 1) {
           this.areaVisibleAssignedby = true
         } else if (sdtJurisdictionAssigned == 0) {
@@ -1714,10 +1764,26 @@
           this.jurisdiction = 'SDTFPTXR'
         }
       },
+      // 认证分配填写人
+      assignedByHomo() {
+        let sdtJurisdictionAssigned = this.sdtJurisdictionAssignedhomo()
+        // 工程接口人
+        if (sdtJurisdictionAssigned == 1) {
+          this.areaVisibleAssignedbyhomo = true
+        } else if (sdtJurisdictionAssigned == 0) {
+          this.visibleoperationFailed = true
+          this.jurisdiction = 'SDTFPTXRHOMO'
+        }
+      },
+
       // 分配填写人确定后弹框关闭
       areaVisibleAssignedbyflag(val) {
         this.areaVisibleAssignedby = val
       },
+      // 认证分配填写人确定后弹框关闭
+      areaVisibleAssignedbyflaghomo(val) {
+        this.areaVisibleAssignedbyhomo = val
+      },
       // 截止时间
       // TaskCutOffTimeLibrary() {
       //   let dreTaskCutOffTimeLibrary = this.dreTaskCutOffTimeLibrary()

jero-web/src/views/projectManagement/dialog/parametercolumn.vue

@@ -252,7 +252,7 @@
         this.loadData()
       },
       handleCancel() {
-        this.$emit('areaVisible', false)
+        this.$emit('drawerhandleCancel', false)
       },
       onSelectChange(selectedRowKeys, selectedRowKeysDate) {
         this.selectedRowKeysDate = selectedRowKeysDate