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

2022-08-23 01:57:06 +08:00
parent e91af998ec d285aa91c7
commit 3e6213ee94
31 changed files with 1401 additions and 564 deletions
@@ -928,7 +928,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Responsible Fi
 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Filled by' WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6';
 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Eng. Interface' WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b';

-- 国家国旗表 增加旗帜  2022-08-16
+-- 国家国旗表 增加旗帜  2022-08-16 已同步生产环境
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('14', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '/jero-boot/nationalFlag/GCC.png');
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('15', NULL, NULL, NULL, NULL, NULL, '巴西', 'Brazil', NULL, '/jero-boot/nationalFlag/Brazil.png');
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('16', NULL, NULL, NULL, NULL, NULL, '德国', 'Germany', NULL, '/jero-boot/nationalFlag/Germany.png');
@@ -946,15 +946,15 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti
 -- 删除之前的3中国香港 和8海湾地区
 delete from country_national_flag where id in ('3','8');

-- 法规流程历史表增加字段 审批意见 2022-08-16
+-- 法规流程历史表增加字段 审批意见 2022-08-16 已同步生产环境
 ALTER TABLE `laws_weilai`.`laws_process_history`
    ADD COLUMN `approval_opinion` varchar(2000) NULL COMMENT '审批意见' AFTER `flow_type`;

--- 用户表 删除工号唯一索引 2022-08-18
+--- 用户表 删除工号唯一索引 2022-08-18 已同步生产环境
 ALTER TABLE `laws_weilai`.`sys_user`
 DROP INDEX `uniq_sys_user_work_no`;


-- 工作流 流程表增加流程名称 英文字段  2022-08-19
+-- 工作流 流程表增加流程名称 英文字段  2022-08-19 已同步生产环境
 ALTER TABLE `laws_weilai_wkflow`.`bus_process_name`
    ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称（英文）' AFTER `PROJECT_LAWS_INVENTORY_ID`;
@@ -772,6 +772,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			OnlCgformField onlCgformField = fieldList.get(i);
 			Map<String, Object> map = new HashMap<>();
 			String dbFieldName = onlCgformField.getDbFieldName();
+			if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) {
+				map.put("click3", true);
+			}
 			if ("description".equals(dbFieldName)) {
 				indexOfDescription = i;
 				map.put("click2", true);
@@ -21,6 +21,7 @@ import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.util.HttpRequestUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -565,69 +566,111 @@ public class FeishuServiceImpl implements IFeishuService {
        headerMap.put("Authorization", "Bearer " + token);
        headerMap.put("Content-Type", "application/json; charset=utf-8");

-        String sendJson = " {\n" +
-                "  \"config\": {\n" +
-                "    \"wide_screen_mode\": true\n" +
-                "  },\n" +
+        //参考：https://open.feishu.cn/tool/cardbuilder?from=openplantform_mcb_entrance
+        /*String sendJson = "{\n" +
                "  \"header\": {\n" +
+                "    \"template\": \"green\",\n" +
                "    \"title\": {\n" +
-                "      \"tag\": \"plain_text\",\n" +
-                "      \"content\": \"点击下方的分类查看常见问题\"\n" +
-                "    },\n" +
-                "    \"template\": \"green\"\n" +
+                "      \"content\": \"知识库分类负责人\",\n" +
+                "      \"tag\": \"plain_text\"\n" +
+                "    }\n" +
+                "  },\n" +
+                "  \"elements\": [\n" +
+                "    {\n" +
+                "      \"fields\": [\n" +
+                "        {\n" +
+                "          \"is_short\": true,\n" +
+                "          \"text\": {\n" +
+                "            \"content\": \"**\uD83D\uDC64 提交人：**\\n<at id=fag43ef3></at>\",\n" +
+                "            \"tag\": \"lark_md\"\n" +
+                "          }\n" +
+                "        }\n" +
+                "      ],\n" +
+                "      \"tag\": \"div\"\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}";*/
+
+        String sendJson = "{\n" +
+                "  \"header\": {\n" +
+                "    \"template\": \"green\",\n" +
+                "    \"title\": {\n" +
+                "      \"content\": \"知识库分类负责人\",\n" +
+                "      \"tag\": \"plain_text\"\n" +
+                "    }\n" +
                "  }\n" +
                "}";
        JSONObject jsonObject = JSONObject.parseObject(sendJson);
        JSONArray elements = new JSONArray();
        JSONObject element = new JSONObject();
-        element.put("tag","action");
-        element.put("layout","bisected");
+        JSONArray fields = new JSONArray();

        //获取分类
        List<ProblemKnowledgeBaseClassifyEO> problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list();
        this.problemKnowledgeBaseClassifyEOService.disposeData(problemKnowledgeBaseClassifyEOList);

-        JSONArray actions = new JSONArray();
-
-        //组装推送过去的点击按钮
+        //获取所有分类下的负责人信息
+        List<String> chargePersonUserIdList = new ArrayList<>();
        for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) {
-            JSONObject buttonObject = new JSONObject();
-            JSONObject text = new JSONObject();
-            JSONObject value = new JSONObject();
-            buttonObject.put("tag","button");
-
-            text.put("tag","plain_text");
-            text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel() + " [" + problemKnowledgeBaseClassifyEO.getChargePersonIdName() + "]");
-            value.put("chosen",problemKnowledgeBaseClassifyEO.getChargePersonId());
-
-            buttonObject.put("text",text);
-            buttonObject.put("type","primary");
-            buttonObject.put("value",value);
-            actions.add(buttonObject);
+            if(StringUtils.isNotEmpty(problemKnowledgeBaseClassifyEO.getChargePersonId())){
+                String chargePersonId = problemKnowledgeBaseClassifyEO.getChargePersonId();
+                for (String chargePerson : chargePersonId.split(",")) {
+                    chargePersonUserIdList.add(chargePerson);
+                }
+            }
        }

-        element.put("actions",actions);
+        if(CollectionUtils.isNotEmpty(chargePersonUserIdList)){
+            List<SysUser> chargePersonUserList = this.sysUserService.querySysUserListByIdList(chargePersonUserIdList);

+            //组装推送过去的知识库负责人信息
+            for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) {
+                JSONObject field = new JSONObject();
+                JSONObject text = new JSONObject();
+                StringBuilder atUserSb = new StringBuilder();

-        elements.add(element);
-        jsonObject.put("elements",elements);
-        // 设置请求参数
-        JSONObject paramsMap = new JSONObject();
-        paramsMap.put("user_ids", userIds);
-        paramsMap.put("msg_type", "interactive");
-        paramsMap.put("card", jsonObject);
+                if(StringUtils.isNotEmpty(problemKnowledgeBaseClassifyEO.getChargePersonId())){
+                    for (String chargePersonId : problemKnowledgeBaseClassifyEO.getChargePersonId().split(",")) {
+                        for (SysUser sysUser : chargePersonUserList) {
+                            if(StringUtils.equals(chargePersonId,sysUser.getId())){
+                                String thirdId = sysUser.getThirdId();
+                                atUserSb.append("<at id=" + thirdId + "></at>");
+                                atUserSb.append(" ");
+                            }
+                        }
+                    }
+                }

-        // 发送请求给飞书
-        String response = null;
-        try {
-            response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        // 获取返回结果
-        JSONObject tokenJson = JSONObject.parseObject(response);
-        if(!tokenJson.get("code").toString().equals("0")) {
-            log.error("请求出现异常：" + tokenJson.get("msg") + "  " + tokenJson);
+                text.put("content","问题标签：" + problemKnowledgeBaseClassifyEO.getProblemLabel() + "\n" +  "责任人：" + atUserSb.toString());
+                text.put("tag","lark_md");
+
+                field.put("is_short",true);
+                field.put("text",text);
+                fields.add(field);
+            }
+
+            element.put("tag","div");
+            element.put("fields",fields);
+            elements.add(element);
+            jsonObject.put("elements",elements);
+            // 设置请求参数
+            JSONObject paramsMap = new JSONObject();
+            paramsMap.put("user_ids", userIds);
+            paramsMap.put("msg_type", "interactive");
+            paramsMap.put("card", jsonObject);
+
+            // 发送请求给飞书
+            String response = null;
+            try {
+                response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            // 获取返回结果
+            JSONObject tokenJson = JSONObject.parseObject(response);
+            if(!tokenJson.get("code").toString().equals("0")) {
+                log.error("请求出现异常：" + tokenJson.get("msg") + "  " + tokenJson);
+            }
        }
    }

@@ -90,7 +90,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			this.batchInsertProblemKnowledgeBaseUserEO(problemKnowledgeBaseEO);
 		}else {
        	//如果展示权限是公开，则把该数据插入到搜索中心中。
-			//this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
 		}
    }

@@ -367,9 +367,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 		//如果该条问题知识库的展示权限为私密，则创建权限表数据
 		if(StringUtils.equals(problemKnowledgeBaseEO.getShowPermissions(), ShowPermissionsEnum.PRIVACY.getValue())){
 			this.batchInsertProblemKnowledgeBaseUserEO(problemKnowledgeBaseEO);
-			//this.deleteElasticsearchData(problemKnowledgeBaseEO.getId());
+			this.deleteElasticsearchData(problemKnowledgeBaseEO.getId());
 		}else {
-			//this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
 		}
    }

@@ -406,9 +406,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle

        this.problemKnowledgeBaseCommentEOService.remove(deleteWrapper);

-		/*for (String problemKnowledgeBaseId : ids) {
+		for (String problemKnowledgeBaseId : ids) {
 			this.deleteElasticsearchData(problemKnowledgeBaseId);
-		}*/
+		}
    }

 	/**
@@ -1,26 +1,28 @@
 package com.jero.modules.project.controller;

-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.modules.project.entity.ConditionAssessmentEO;
-import com.jero.modules.project.service.IConditionAssessmentEOService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ConditionAssessmentEO;
+import com.jero.modules.project.service.IConditionAssessmentEOService;
+import com.jero.modules.project.vo.ConditionAssessmentVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.jero.common.aspect.annotation.AutoLog;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;


 /**
@@ -181,4 +183,16 @@ public class ConditionAssessmentEOController extends JeroController<ConditionAss
 		 return conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO);
 	 }

+	 /**
+	  *   批量添加或修改
+	  *
+	  * @param conditionAssessmentVO
+	  * @return
+	  */
+	 @AutoLog(value = "任务清单-项目状态评估表-批量添加或修改")
+	 @ApiOperation(value="任务清单-项目状态评估表-批量添加或修改", notes="任务清单-项目状态评估表-批量添加或修改")
+	 @PostMapping(value = "/addOrUpdateBatch")
+	 public Result<?> addOrUpdateConditionAssessmentBatch(@RequestBody ConditionAssessmentVO conditionAssessmentVO) {
+		 return conditionAssessmentEOService.addOrUpdateBatch(conditionAssessmentVO);
+	 }
 }
@@ -1,27 +1,27 @@
 package com.jero.modules.project.controller;

-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSONObject;
-import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.modules.project.entity.ProjectTaskInventoryEO;
-import com.jero.modules.project.service.IProjectTaskInventoryEOService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.service.IProjectTaskInventoryEOService;
+import com.jero.modules.project.vo.ProjectTaskInventoryVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.jero.common.aspect.annotation.AutoLog;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;


 /**
@@ -203,4 +203,32 @@ public class ProjectTaskInventoryEOController extends JeroController<ProjectTask
 	 public Result<?> remindDispose(@RequestBody JSONObject jsonObject){
 		 return this.projectTaskInventoryEOService.remindDispose(jsonObject);
 	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param projectTaskInventoryVO
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-任务清单表-批量维护进度")
+	 @ApiOperation(value="项目库-任务清单表-批量维护进度", notes="项目库-任务清单表-批量维护进度")
+	 @PostMapping(value = "/editBatch")
+	 public Result<?> editCertificationProgressBatch(@RequestBody ProjectTaskInventoryVO projectTaskInventoryVO) {
+		 projectTaskInventoryEOService.editBatch(projectTaskInventoryVO);
+		 return Result.OK("编辑成功!");
+	 }
+
+	 /**
+	  *  认证进度和当前状态修改时，校验角色是否符合
+	  *
+	  * @param projectTaskInventoryVO
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-任务清单表-校验角色是否符合")
+	 @ApiOperation(value="项目库-任务清单表-校验角色是否符合", notes="项目库-任务清单表-校验角色是否符合")
+	 @PostMapping(value = "/verifyRoleCode")
+	 public Result<?> verifyRoleCode(@RequestBody ProjectTaskInventoryVO projectTaskInventoryVO) {
+		 List<String> msgList = projectTaskInventoryEOService.verifyRoleCode(projectTaskInventoryVO);
+		 return Result.OK(msgList);
+	 }
 }
@@ -1,11 +1,11 @@
 package com.jero.modules.project.service;

+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
-import com.jero.modules.project.entity. ConditionAssessmentEO;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.vo.ConditionAssessmentVO;

 import java.util.List;
 import java.util.Map;
@@ -92,4 +92,10 @@ public interface IConditionAssessmentEOService extends IService<ConditionAssessm
 	 * @return
 	 */
 	List<Map<String,Object>> getProjectStatusAssessStatisticsGroupByTerritory(Map<String,Object> params);
+
+	/**
+	 * 任务清单-项目状态评估表-批量添加或修改
+	 * @param  conditionAssessmentVO
+	 */
+	Result<?> addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO);
 }
@@ -1,9 +1,10 @@
 package com.jero.modules.project.service;

 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.project.entity.ProjectTaskInventoryEO;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.project.vo.ProjectTaskInventoryVO;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -84,5 +85,21 @@ public interface IProjectTaskInventoryEOService extends IService<ProjectTaskInve
 	 */
    void deleteByProjectLawsInventoryIds(List<String> projectLawsInventoryIds);

+	/**
+	 * 批量更新认证进度
+	 *
+	 * @param projectTaskInventoryVO
+	 * @return
+	 */
+	void editBatch(ProjectTaskInventoryVO projectTaskInventoryVO);
+
+	/**
+	 * 校验角色是否符合
+	 *
+	 * @param projectTaskInventoryVO
+	 * @return
+	 */
+	List<String> verifyRoleCode(ProjectTaskInventoryVO projectTaskInventoryVO);
+
    void exportXls(HttpServletResponse response, HttpServletRequest request, ProjectTaskInventoryEO projectTaskInventoryEO);
 }
@@ -1,6 +1,7 @@
 package com.jero.modules.project.service.impl;

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
@@ -8,6 +9,7 @@ import com.jero.modules.project.entity.ProjectTaskInventoryEO;
 import com.jero.modules.project.enums.ProjectRoleEnum;
 import com.jero.modules.project.mapper.ConditionAssessmentEOMapper;
 import com.jero.modules.project.service.IConditionAssessmentEOService;
+import com.jero.modules.project.vo.ConditionAssessmentVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -16,8 +18,6 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;

-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
 * @Description: 任务清单-项目状态评估表
 * @Author: jero-boot
@@ -251,4 +251,70 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAsses
 		}
 		return result;
 	}
+
+	@Override
+	public Result<?> addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO) {
+		List<String> projectLawsInventoryIdList = Arrays.asList(conditionAssessmentVO.getProjectLawsInventoryIds().split(","));
+		List<String> roleCodeListOld = Arrays.asList(conditionAssessmentVO.getRoleCodes().split(","));
+
+
+		for (int i=0; i < projectLawsInventoryIdList.size(); i++) {
+			String projectLawsInventoryId = projectLawsInventoryIdList.get(i);
+			String roleCode = roleCodeListOld.get(i);
+			List<String> roleCodeList = new ArrayList<>();
+			List<ConditionAssessmentEO> list = new ArrayList<>();
+
+			if (StringUtils.equals(roleCode, ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
+				roleCodeList.add(ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+
+				ConditionAssessmentEO regulatiEngineer = new ConditionAssessmentEO();
+				regulatiEngineer.setProjectLawsInventoryId(projectLawsInventoryId);
+				regulatiEngineer.setConditionAssessment(conditionAssessmentVO.getConditionAssessment());
+				regulatiEngineer.setRemark(conditionAssessmentVO.getRemark());
+				regulatiEngineer.setRoleCode(ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+
+				list.add(regulatiEngineer);
+
+			} else if (StringUtils.equals(roleCode, ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
+				roleCodeList.add(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+
+				ConditionAssessmentEO homologationEngineer = new ConditionAssessmentEO();
+				homologationEngineer.setProjectLawsInventoryId(projectLawsInventoryId);
+				homologationEngineer.setConditionAssessment(conditionAssessmentVO.getConditionAssessment());
+				homologationEngineer.setRemark(conditionAssessmentVO.getRemark());
+				homologationEngineer.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+
+				list.add(homologationEngineer);
+
+			} else if (StringUtils.equals(roleCode, ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())) {
+				roleCodeList.add(ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+				roleCodeList.add(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+
+				ConditionAssessmentEO regulatiEngineer = new ConditionAssessmentEO();
+				regulatiEngineer.setProjectLawsInventoryId(projectLawsInventoryId);
+				regulatiEngineer.setConditionAssessment(conditionAssessmentVO.getConditionAssessment());
+				regulatiEngineer.setRemark(conditionAssessmentVO.getRemark());
+				regulatiEngineer.setRoleCode(ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+
+				ConditionAssessmentEO homologationEngineer = new ConditionAssessmentEO();
+				homologationEngineer.setProjectLawsInventoryId(projectLawsInventoryId);
+				homologationEngineer.setConditionAssessment(conditionAssessmentVO.getConditionAssessment());
+				homologationEngineer.setRemark(conditionAssessmentVO.getRemark());
+				homologationEngineer.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
+
+				list.add(regulatiEngineer);
+				list.add(homologationEngineer);
+			}
+			if(CollectionUtils.isNotEmpty(list)){
+				QueryWrapper<ConditionAssessmentEO> deleteWrapper = new QueryWrapper<>();
+				deleteWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId);
+				deleteWrapper.lambda().in(ConditionAssessmentEO::getRoleCode,roleCodeList);
+				this.baseMapper.delete(deleteWrapper);
+
+				saveBatch(list);
+			}
+		}
+
+		return Result.ok();
+	}
 }
@@ -18,6 +18,7 @@ import com.jero.modules.project.service.IConditionAssessmentEOService;
 import com.jero.modules.project.service.IProjectLawsInventoryEOService;
 import com.jero.modules.project.service.IProjectTaskInventoryEOService;
 import com.jero.modules.project.util.SendMessageUtils;
+import com.jero.modules.project.vo.ProjectTaskInventoryVO;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
@@ -459,6 +460,89 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		this.baseMapper.delete(deleteWrapper);
 	}

+	@Override
+	public void editBatch(ProjectTaskInventoryVO projectTaskInventoryVO) {
+		List<String> idList = Arrays.asList(projectTaskInventoryVO.getIds().split(","));
+
+		List<ProjectTaskInventoryEO> updateEOList = new ArrayList<>();
+		for (String id : idList) {
+			ProjectTaskInventoryEO updateEO = new ProjectTaskInventoryEO();
+			updateEO.setId(id);
+			updateEO.setCertificationProgress(projectTaskInventoryVO.getCertificationProgress());
+			updateEO.setCertificationProgressRemark(projectTaskInventoryVO.getCertificationProgressRemark());
+
+			Date now = new Date();
+			updateEO.setUpdateTime(now);
+
+			updateEOList.add(updateEO);
+		}
+
+		updateBatchById(updateEOList);
+	}
+
+	@Override
+	public List<String> verifyRoleCode(ProjectTaskInventoryVO projectTaskInventoryVO) {
+		List<String> projectLawsInventoryIdList = Arrays.asList(projectTaskInventoryVO.getProjectLawsInventoryIds().split(","));
+		List<String> roleCodeList = Arrays.asList(projectTaskInventoryVO.getRoleCodes().split(","));
+		String cut = projectTaskInventoryVO.getCut();
+		String operation = projectTaskInventoryVO.getOperation();
+
+		List<Map<String, String>> msgMapList = new ArrayList<>();
+		for (int i=0; i < projectLawsInventoryIdList.size(); i++) {
+			String projectLawsInventoryId = projectLawsInventoryIdList.get(i);
+			String roleCode = roleCodeList.get(i);
+			ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOService.getById(projectLawsInventoryId);
+
+			Map<String, String> msgMap = new HashMap<>();
+			if ("1".equals(operation)) {
+				if (! ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)) {
+					msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber());
+
+				}
+			} else if ("2".equals(operation)) {
+				if (!(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)
+						|| ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)
+						|| ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) {
+					msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber());
+
+				}
+			}
+
+			msgMapList.add(msgMap);
+		}
+
+		return getMsg(msgMapList, cut, operation);
+
+	}
+
+	private List<String> getMsg(List<Map<String, String>> msgMapList, String cut, String operation) {
+		List<String> msgList = new ArrayList<>();
+
+		for (Map<String, String> msgMap : msgMapList) {
+			String serialNumber = msgMap.get("serialNumber");
+			StringBuilder stringBuilder = new StringBuilder();
+			if ("1".equals(operation)) {
+				if (CutEnum.EN.getValue().equals(cut)) {
+					stringBuilder.append("Number ").append("<span style='color: red'>").append(serialNumber).append("</span>").append(", the current user can not maintain homologation progress.");
+				} else {
+					stringBuilder.append("编号").append("<span style='color: red'>").append(serialNumber).append("</span>").append(",当前用户没有维护认证进度权限。");
+				}
+
+			} else if("2".equals(operation)) {
+				if (CutEnum.EN.getValue().equals(cut)) {
+					stringBuilder.append("Number ").append("<span style='color: red'>").append(serialNumber).append("</span>").append(", the current user can not modify current status.");
+				} else {
+					stringBuilder.append("编号").append("<span style='color: red'>").append(serialNumber).append("</span>").append("当前用户没有修改状态权限。");
+				}
+
+			}
+
+			msgList.add(stringBuilder.toString());
+		}
+
+		return msgList;
+	}
+
 	/**
 	 * 创建任务清单列表数据
 	 * @param projectTaskInventoryEOList
@@ -0,0 +1,15 @@
+package com.jero.modules.project.vo;
+
+import lombok.Data;
+
+@Data
+public class ConditionAssessmentVO {
+
+    private String cut;
+
+    // 当前状态
+    private String projectLawsInventoryIds;
+    private String roleCodes;
+    private String conditionAssessment;
+    private String remark;
+}
@@ -0,0 +1,18 @@
+package com.jero.modules.project.vo;
+
+import lombok.Data;
+
+@Data
+public class ProjectTaskInventoryVO {
+
+    private String cut;
+
+    // 认证进度
+    private String ids;
+    private String projectLawsInventoryIds;
+    private String roleCodes;
+    private String certificationProgress;
+    private String certificationProgressRemark;
+
+    private String operation; // 1-维护进度，2-修改状态
+}
@@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 		this.updateById(lawsMonthlyReportManageEO);

 		// 同步es
-//		syncElasticsearch(id, issueStatus, issueTime);
+		syncElasticsearch(id, issueStatus, issueTime);
 	}

 	private void syncElasticsearch(String id, String issueStatus, Date issueTime) {
@@ -1269,4 +1269,6 @@ module.exports = {
  source:'Source',
  sourceEn:'Source (English)',
  onlyone:'Only one merge delimiter can be entered',
+  BatchMaintenanceProgress:'Batch Maintenance Progress',
+  BatchChangeStatus:'Batch Change Status',
 }
@@ -1371,4 +1371,7 @@ module.exports = {
  source: '来源',
  sourceEn: '来源(英文)',
  onlyone:'只能输入一个合并分隔符',
+  BatchMaintenanceProgress:'批量维护进度',
+  BatchChangeStatus:'批量修改状态',
+
 }
@@ -1,93 +1,58 @@
 <template>
  <div class='diolag-area'>
    <a-spin :spinning='spinLoading'>
-      <a-form-model
-        @keyup.enter.native="searchQuery"
-        class='tag-module'
-        ref='ruleForm'
-        :model='form'
-        :rules='rules'
-        :label-col='labelCol'
-        :wrapper-col='wrapperCol'
-      >
-        <a-row :gutter='24'>
-          <a-col :span='9'>
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="12" :sm="8">
            <div class="box-title-text">
              <div class="title-text">
-<!--                <span class="Required">*</span>-->
+                <!--                <span class="Required">*</span>-->
                <span class="title-text-text" :title="$t('NiONumber')">{{$t('NiONumber')}}</span>
              </div>
-              <a-form-model-item class="itemModel" :prop='region'>
-<!--                <a-input class="box-input"-->
-<!--                         :disabled="disabled"-->
-<!--                         v-model="formInline[item.db_field_name]"-->
-<!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
-                                <a-input class="box-input" :title="$t('pleaseEnter')+$t('ParameterName')"
-                                  v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />
+              <a-form-model-item class="itemModel">
+                <a-input class="box-input" :title="$t('pleaseEnter')+$t('ParameterName')"
+                         v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')"/>
              </a-form-model-item>
            </div>
-<!--            <a-form-model-item ref='region' :label="$t('NiONumber')" prop='region' >-->
-<!--                <a-input-->
-<!--                  v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />-->
-<!--            </a-form-model-item>-->
          </a-col>
-          <a-col :span='9'>
+          <a-col :md="12" :sm="8">
            <div class="box-title-text">
              <div class="title-text">
                <!--                <span class="Required">*</span>-->
                <span class="title-text-text" :title="$t('ParameterName')">{{$t('ParameterName')}}</span>
              </div>
-              <a-form-model-item class="itemModel" :prop='region'>
-                <!--                <a-input class="box-input"-->
-                <!--                         :disabled="disabled"-->
-                <!--                         v-model="formInline[item.db_field_name]"-->
-                <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
-                <a-input
-                  v-model='form.paramsName' :title="$t('pleaseEnter')+$t('ParameterName')" :placeholder="$t('pleaseEnter')+$t('ParameterName')" />
+              <a-form-model-item class="itemModel">
+                <a-input class="box-input"
+                         v-model='form.paramsName' :title="$t('pleaseEnter')+$t('ParameterName')"
+                         :placeholder="$t('pleaseEnter')+$t('ParameterName')"/>
              </a-form-model-item>
            </div>
-<!--            <a-form-model-item ref='paramsTemplateName' :label="$t('ParameterName')" prop='paramsTemplateName'>-->
-<!--              <a-input-->
-<!--                v-model='form.paramsName' :placeholder="$t('pleaseEnter')+$t('ParameterName')" />-->
-<!--            </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-row :gutter='24'>
-          <a-col :span='10'>
+          <a-col :md="12" :sm="8">
            <div class="box-title-text">
              <div class="title-text">
                <!--                <span class="Required">*</span>-->
                <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
              </div>
-              <a-form-model-item class="itemModel" :prop='region'>
-                <!--                <a-input class="box-input"-->
-                <!--                         :disabled="disabled"-->
-                <!--                         v-model="formInline[item.db_field_name]"-->
-                <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
-                <j-dict-select-tag class='box-input' v-model='form.dutyTerritory'
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input" v-model='form.dutyTerritory'
                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                   :type="'select'"
                                   :title="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                   :triggerChange='false' :dictCode="'duty_territory'" />
+                                   :triggerChange='false' :dictCode="'duty_territory'"/>
              </a-form-model-item>
            </div>
-<!--            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='region'>-->
-<!--              <a-form-model-item class='itemModel' prop='region'>-->
-<!--                <j-dict-select-tag class='box-input' v-model='form.dutyTerritory'-->
-<!--                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                                   :type="'select'"-->
-<!--                                   :triggerChange='false' :dictCode="'duty_territory'" />-->
-<!--              </a-form-model-item>-->
-<!--            </a-form-model-item>-->
          </a-col>
-          <a-col :span='9'>
+          <a-col :md="12" :sm="8">
+            <span style="float: right;overflow: hidden;margin-right: 16px;margin-bottom: 20px"
+                  class="table-page-search-submitButtons">
+            <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>
+            </span>
+
          </a-col>
        </a-row>
-      </a-form-model>
+      </a-form>
    </a-spin>
    <a-table
      class='table-area'
@@ -110,137 +75,137 @@
    </a-table>
    <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' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
    </div>
  </div>
 </template>

 <script>
-import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+  import { putAction, postAction, getAction, deleteAction } from '@/api/manage'

-export default {
-  name: 'diolagArea',
-  components: {},
-  data() {
-    return {
-      title: this.$t('add'),
-      total: 0,
-      selectedRowKeysDate: {},
-      loading: false,
-      editId: '',
-      columns: [
-        {
-          title: this.$t('NiONumber'),
-          dataIndex: 'nioNumber',
-          align: 'center',
-          width:200,
-          ellipsis: true
+  export default {
+    name: 'diolagArea',
+    components: {},
+    data() {
+      return {
+        title: this.$t('add'),
+        total: 0,
+        selectedRowKeysDate: {},
+        loading: false,
+        editId: '',
+        columns: [
+          {
+            title: this.$t('NiONumber'),
+            dataIndex: 'nioNumber',
+            align: 'center',
+            width: 200,
+            ellipsis: true
+          },
+          {
+            title: this.$t('ParameterName'),
+            align: 'center',
+            dataIndex: 'paramsName',
+            width: 200,
+            ellipsis: true
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            dataIndex: 'dutyTerritory_dictText',
+            align: 'center',
+            width: 200,
+            ellipsis: true
+          }
+        ],
+        newVisible: false,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 7 }
        },
-        {
-          title: this.$t('ParameterName'),
-          align: 'center',
-          dataIndex: 'paramsName',
-          width:200,
-          ellipsis: true
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 14 }
        },
-        {
-          title: this.$t('areaOfResponsibility'),
-          dataIndex: 'dutyTerritory_dictText',
-          align: 'center',
-          width:200,
-          ellipsis: true
-        }
-      ],
-      newVisible: false,
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 7 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 14 }
-      },
-      form: {},
-      rules: {
-        // templatetitle: [
-        //   { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
-        // ]
-      },
-      areaTable: [],
-      flag: false,  //表单提交标识
-      spinLoading: false,
-      confirmLoading: false,
-      templatetitle: '',
-      selectedRowKeys: [],
-    }
-  },
-  props: {
-    paramsManifest: {
-      type: Object,
-      default: {},
-      require: true
-    }
-  },
-  mounted() {
-    this.loadData()
-  },
-  methods: {
-    loadData() {
-      this.loading = true
-      let _tt = {
-        paramsManifestId: this.paramsManifest.id,
-        paramsTemplateId: this.paramsManifest.paramsTemplateId,
-        paramsTemplatePublishVersion: this.paramsManifest.paramsTemplatePublishVersion
+        form: {},
+        rules: {
+          // templatetitle: [
+          //   { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
+          // ]
+        },
+        areaTable: [],
+        flag: false,  //表单提交标识
+        spinLoading: false,
+        confirmLoading: false,
+        templatetitle: '',
+        selectedRowKeys: []
      }
-      let params = {
-        ...this.form,
-        ..._tt
-      }
-      getAction(`params/collectManifest/paramsInfoList`, params).then(res => {
-        if (res.success) {
-          this.areaTable = [...res.result]
-        }
-      }).finally(() => {
-        this.loading = false
-      })
    },
-    searchQuery() {
+    props: {
+      paramsManifest: {
+        type: Object,
+        default: {},
+        require: true
+      }
+    },
+    mounted() {
      this.loadData()
    },
-    searchReset() {
-      this.form = {}
-      this.loadData()
-    },
-    handleCancel() {
-      this.$emit('areaVisible', false)
-    },
-    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
-      this.selectedRowKeysDate = selectedRowKeysDate
-      this.selectedRowKeys = selectedRowKeys
-      this.$emit('addselectedRowKeys',this.selectedRowKeys)
-    },
-    handleTableChange(val) {
-    },
-    showModal() {
-      this.title = this.$t('add')
-      this.newVisible = true
-      this.form = {}
-    },
-    //新增
-    handleSubmit() {
-      if (this.selectedRowKeys.length == 0) {
-        this.$message.warning(this.$t('pleaseSelectData'))
-      } else {
-        this.$refs.ruleForm.validate(valid => {
-          if (valid) {
-            this.flag = true
-            this.spinLoading = true
-            this.confirmLoading = true
+    methods: {
+      loadData() {
+        this.loading = true
+        let _tt = {
+          paramsManifestId: this.paramsManifest.id,
+          paramsTemplateId: this.paramsManifest.paramsTemplateId,
+          paramsTemplatePublishVersion: this.paramsManifest.paramsTemplatePublishVersion
+        }
+        let params = {
+          ...this.form,
+          ..._tt
+        }
+        getAction(`params/collectManifest/paramsInfoList`, params).then(res => {
+          if (res.success) {
+            this.areaTable = [...res.result]
+          }
+        }).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
+        this.$emit('addselectedRowKeys', this.selectedRowKeys)
+      },
+      handleTableChange(val) {
+      },
+      showModal() {
+        this.title = this.$t('add')
+        this.newVisible = true
+        this.form = {}
+      },
+      //新增
+      handleSubmit() {
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning(this.$t('pleaseSelectData'))
+        } else {
+          this.$refs.ruleForm.validate(valid => {
+            if (valid) {
+              this.flag = true
+              this.spinLoading = true
+              this.confirmLoading = true
              //新增
              let postDate = {
-                  paramsInfoPublishEOList: this.selectedRowKeysDate,
-                  paramsManifestId: this.paramsManifest.id,
-                  projectId: this.$route.query.projectId
+                paramsInfoPublishEOList: this.selectedRowKeysDate,
+                paramsManifestId: this.paramsManifest.id,
+                projectId: this.$route.query.projectId
              }
              postAction(`params/collectManifest/add`, postDate).then(res => {
                  if (res.success) {
@@ -258,234 +223,239 @@ export default {
                this.spinLoading = false
                this.newVisible = false
              })
-          } else {
-            return false
+            } else {
+              return false
+            }
+          })
+        }
+      },
+      cancelModel() {
+        this.newVisible = false
+        this.$refs.ruleForm.resetFields()
+      },
+      //删除按钮
+      deleteArea(val) {
+        this.$confirm({
+          title: this.$t('confirmDeletion'),
+          content: '',
+          onOk:
+            async () => {
+              getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
+                if (res.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  if (this.areaTable.length == 1 && this.queryParams.pageNo != 1) {
+                    this.queryParams.pageNo = this.queryParams.pageNo - 1
+                  }
+                  this.loadData()
+                } else {
+                  // this.$message.warning(res.message)
+                  if (res.message == '该展示区域有关联数据，无法删除！') {
+                    this.$message.warning(this.$t('noDelete'))
+                  } else {
+                    this.$message.warning(this.$t('operationFailed'))
+                  }
+                }
+              })
+            }
+        })
+      },
+      //编辑按钮
+      editArea(val) {
+        this.title = this.$t('edit')
+        this.newVisible = true
+        let params = {
+          id: val
+        }
+        getAction(`tag/onlCgformArea/queryById`, params).then((res) => {
+          if (res.success) {
+            this.form = { ...res.result }
+            // this.$emit('updateOk',res.result)
+
          }
        })
      }
    },
-    cancelModel() {
-      this.newVisible = false
-      this.$refs.ruleForm.resetFields()
-    },
-    //删除按钮
-    deleteArea(val) {
-      this.$confirm({
-        title: this.$t('confirmDeletion'),
-        content: '',
-        onOk:
-          async () => {
-            getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
-              if (res.success) {
-                this.$message.success(this.$t('OperationSuccessful'))
-                if (this.areaTable.length == 1 && this.queryParams.pageNo != 1) {
-                  this.queryParams.pageNo = this.queryParams.pageNo - 1
-                }
-                this.loadData()
-              } else {
-                // this.$message.warning(res.message)
-                if (res.message == '该展示区域有关联数据，无法删除！') {
-                  this.$message.warning(this.$t('noDelete'))
-                } else {
-                  this.$message.warning(this.$t('operationFailed'))
-                }
-              }
-            })
-          }
-      })
-    },
-    //编辑按钮
-    editArea(val) {
-      this.title = this.$t('edit')
-      this.newVisible = true
-      let params = {
-        id: val
+    watch: {
+      paramsManifest(val) {
+        this.loadData()
      }
-      getAction(`tag/onlCgformArea/queryById`, params).then((res) => {
-        if (res.success) {
-          this.form = { ...res.result }
-          // this.$emit('updateOk',res.result)
-
-        }
-      })
    }
-  },
-  watch: {
-    paramsManifest(val) {
-      this.loadData()
-    },
-  }

-}
+  }
 </script>

 <style lang='less' scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';

-.diolag-area {
-  .table-area {
-    margin: 20px 0;
+  .diolag-area {
+    .table-area {
+      margin: 20px 0;

-    .action-edit {
-      margin-right: 10px;
+      .action-edit {
+        margin-right: 10px;
+      }
+    }
+
+    .table-del {
+      color: red;
    }
  }

-  .table-del {
-    color: red;
+  .drawer-bootom-button {
+    display: flex;
+    justify-content: center;
  }
-}
-.drawer-bootom-button{
-  display: flex;
-  justify-content: center;
-}
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  /*align-items: center;*/
-}

-.title-text {
-  width: 114px;
-  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-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }

-.box-input {
-  display: inline-block;
-  height: 38px;
-  width: 100%;
-}
+  .title-text {
+    width: 114px;
+    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;
+  }

-.itemModel {
-  width: calc(100% - 130px);
-  display: inline-block;
-  margin-top: 2px;
-  height: 40px;
-  margin-bottom: 24px;
-}
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }

-.itemModel-text {
-  width: calc(100% - 130px);
-  display: inline-block;
-  margin-top: 2px;
-}
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    height: 40px;
+    margin-bottom: 24px;
+  }

-.Required {
-  color: red;
-  margin-right: 4px;
-}
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }

-.title-text-text {
-  margin-top: 9px;
-}
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }

-.header-text {
-  font-size: 16px;
-  font-weight: bold;
-  margin-left: 15px;
-  /*border-bottom: 1px #d9d9d9 dashed;*/
-  height: 30px;
-  margin-bottom: 30px;
-}
+  .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;
+  }

-.button-text {
-  height: 38px;
-  width: calc(100% - 100px);
-  line-height: 38px;
-  background: #fff;
-  border: 1px #00B3BE solid;
-  color: #00B3BE;
-}
+  .formAdd {
+    margin-bottom: 40px;
+  }

-.button-text-text {
-  position: absolute;
-  right: -10px;
-  top: -21px;
-  display: inline-block;
-  padding: 6px;
-  border-radius: 50%;
-  background: red;
-  text-align: center;
-  line-height: 6px;
-  color: #fff;
-}
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .button-text-text {
+    position: absolute;
+    right: -10px;
+    top: -21px;
+    display: inline-block;
+    padding: 6px;
+    border-radius: 50%;
+    background: red;
+    text-align: center;
+    line-height: 6px;
+    color: #fff;
+  }
+  .box-button {
+    height: 38px;
+  }
 </style>
 <style lang='less'>
-.area-module {
-  .ant-modal-wrap {
-    .ant-modal {
-      .ant-modal-content {
-        .ant-modal-footer {
-          text-align: center;
+  .area-module {
+    .ant-modal-wrap {
+      .ant-modal {
+        .ant-modal-content {
+          .ant-modal-footer {
+            text-align: center;
+          }
        }
      }
    }
  }
-}
 </style>
 <style>
-.formAdd .ant-form-item-label {
-  width: 130px;
-}
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }

-.formAdd .ant-form-item-control-wrapper {
-  display: inline-block;
-  width: 100%;
-}
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }

-/*.formAdd .ant-form-item {*/
-/*  margin-bottom: 20px;*/
-/*}*/
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/

-.itemModel .ant-form-item-control-wrapper {
-  width: 100%;
-}
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }

-.itemModel-text .ant-form-item-control-wrapper {
-  width: 100% !important;
-}
+  .itemModel-text .ant-form-item-control-wrapper {
+    width: 100% !important;
+  }

-.box-input .ant-select-selection--single {
-  height: 38px;
-}
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }

-.box-input .ant-select-selection--multiple {
-  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__rendered {
+    line-height: 38px;
+    height: 38px;
+  }

-.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
-  margin-top: 6px;
-}
+  .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 {
+    line-height: 38px;
+    height: 38px;
+  }

-.box-input .ant-calendar-picker-input {
-  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-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
 </style>
@@ -286,6 +286,9 @@ export default {
 }
 </style>
 <style scoped>
+/deep/.ant-modal-body{
+  height: 100% !important;
+}
 .box-title-text {
  line-height: 1.4;
  display: flex;
@@ -635,6 +635,7 @@
                  dataIndex: res.db_field_name,
                  align: 'center',
                  // ellipsis: true,
+                  fixed: res.click3?'left':'',
                  sorter: res.sort,
                  width: 160
                })
@@ -137,7 +137,7 @@
                _this.$message.success(_this.$t('OperationSuccessful'))
                _this.replacePage()
              } else {
-                _this.$message.warning(res.success)
+                _this.$message.warning(res.message)
              }
            })
          }
@@ -6,7 +6,7 @@
           <span style="line-height: 66px;display: inline-block;float: left;cursor: pointer" @click="backClick">
             <a-icon type="arrow-left" style="margin-right: 6px;"/>
           </span>
-          {{$t('newlyAdded')}}
+          {{this.$route.query.id ? $t('edit') :$t('newlyAdded')}}
        </div>
      </div>
      <div style="padding-top: 68px;background: #fff">
@@ -365,14 +365,21 @@
  ::v-deep .ant-tag {
    padding: 2px 4px;
    background: #9B9DA9;
-    color: #fff!important;
+    color: #fff !important;
  }
-  ::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover{
-    color: #fff!important;
+
+  ::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover {
+    color: #fff !important;
  }
-  ::v-deep .ant-tag-checkable-checked{
+
+  ::v-deep .ant-tag-checkable-checked {
    background: #21c9cc;
  }
+
+  ::v-deep p {
+    margin: 0;
+    padding: 0;
+  }
 </style>
 <style>
  .box-content-left .ant-tag {
@@ -6,7 +6,7 @@
           <span style="line-height: 66px;display: inline-block;float: left">
             <a-icon type="arrow-left" style="margin-right: 6px;"/>
           </span>
-          {{$t('applicableInstructionsMarketList')}}
+          {{queryForm.title}}
        </div>
        <div class="doc-detail-right">
          <div @click="forwardClick" class="operator-text-text" :title="$t('forward')">
@@ -123,7 +123,7 @@
            value: 'standNumber'
          },
          {
-            title: this.$t('standardName'),
+            title: this.$t('title'),
            value: 'title'
          },
          {
@@ -130,7 +130,7 @@
                <div style="margin-bottom: 10px;position: relative">
                  <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
                  <div class="text-text-right"
-                       @click="checkedClick(item)"
+                       @click="titleClick(item)"
                       :class="{ 'null-input':item.checked }">
                    <div class="text-header">
                      <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
@@ -144,51 +144,53 @@
                          <span v-html="item.serial_number"></span>
                        </template>
                        <span style="cursor: pointer"
-                              @click="titleClick(item)" v-html="item.serial_number"></span>
+                              v-html="item.serial_number"></span>
                      </a-tooltip>
                      <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                        <template slot="title">
                          <span v-html="item.title"></span>
                        </template>
-                        <span style="cursor: pointer" v-html="item.title" @click="titleClick(item)"></span>
+                        <span style="cursor: pointer" v-html="item.title"></span>
                      </a-tooltip>
                      <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                        <template slot="title">
                          <span v-html="item.file_name"></span>
                        </template>
-                        <span style="cursor: pointer" v-html="item.file_name" @click="titleClick(item)"></span>
+                        <span style="cursor: pointer" v-html="item.file_name"></span>
                      </a-tooltip>
                    </div>
-                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
-                               v-if="selectModel == ''">
-                      <template slot="title">
-                        <span v-html="item.content"></span>
-                      </template>
-                      <div class="text-content" @click="checkedClick(item)" v-html="item.content"
-                      >
-                      </div>
-                    </a-tooltip>
-                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
-                               v-else-if="(item.file_text instanceof Array) && selectModel != ''">
-                      <template slot="title">
-                        <span v-html="item.content"></span>
-                      </template>
-                      <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
-                    </a-tooltip>
-                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
-                               v-else-if="!item.file_text && selectModel != ''">
-                      <template slot="title">
-                        <span v-html="item.content"></span>
-                      </template>
-                      <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
-                    </a-tooltip>
-                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
-                      <template slot="title">
-                        <span v-html="item.file_text"></span>
-                      </template>
-                      <div class="text-content" @click="checkedClick(item)" v-html="item.file_text">
-                      </div>
-                    </a-tooltip>
+                    <!--                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"-->
+                    <!--                               >-->
+                    <!--                      <template slot="title">-->
+                    <!--                        <span v-html="item.content"></span>-->
+                    <!--                      </template>-->
+                    <div v-if="selectModel == ''" class="text-content" v-html="item.content"
+                    >
+                    </div>
+                    <!--                    </a-tooltip>-->
+                    <!--                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"-->
+                    <!--                               >-->
+                    <!--                      <template slot="title">-->
+                    <!--                        <span v-html="item.content"></span>-->
+                    <!--                      </template>-->
+                    <div v-else-if="(item.file_text instanceof Array) && selectModel != ''"
+                         class="text-content" v-html="item.content"></div>
+                    <!--                    </a-tooltip>-->
+                    <!--                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"-->
+                    <!--                               >-->
+                    <!--                      <template slot="title">-->
+                    <!--                        <span v-html="item.content"></span>-->
+                    <!--                      </template>-->
+                    <div v-else-if="!item.file_text && selectModel != ''"
+                         class="text-content" v-html="item.content"></div>
+                    <!--                    </a-tooltip>-->
+                    <!--                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" >-->
+                    <!--                      <template slot="title">-->
+                    <!--                        <span v-html="item.file_text"></span>-->
+                    <!--                      </template>-->
+                    <div v-else class="text-content" v-html="item.file_text">
+                    </div>
+                    <!--                    </a-tooltip>-->
                  </div>
                </div>
              </li>
@@ -666,6 +668,11 @@
        postAction(this.url.getParagraphInfoList, query).then((res) => {
          if (res.success) {
            this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                val.content = val.content.replace(/<img .*?>/g, '')
+              })
+            }
            this.total = res.result.total
            this.loading = false
          } else {
@@ -857,6 +864,7 @@
    padding: 19px 28px;
    box-sizing: border-box;
    margin-left: 38px;
+    cursor: pointer;
  }

  .null-input {
@@ -934,6 +942,11 @@
    word-break: break-all
  }

+  ::v-deep p {
+    margin: 0;
+    padding: 0;
+  }
+
  /*::v-deep .ant-select {*/
  /*  max-width: calc(100% - 126px) !important;*/
  /*}*/
@@ -19,36 +19,38 @@
                <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
              </a-tooltip>
            </div>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" v-if="!queryParam.selectValue"
-                       :mouseEnterDelay="0.5">
-              <template slot="title">
-                <span v-html="item.content"></span>
-              </template>
-              <div class="text-content" v-html="item.content"
-              >
-              </div>
-            </a-tooltip>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
-                       v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
-              <template slot="title">
-                <span v-html="item.content"></span>
-              </template>
-              <div class="text-content" v-html="item.content"></div>
-            </a-tooltip>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
-                       v-else-if="!item.file_text && queryParam.selectValue">
-              <template slot="title">
-                <span v-html="item.content"></span>
-              </template>
-              <div class="text-content" v-html="item.content"></div>
-            </a-tooltip>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
-              <template slot="title">
-                <span v-html="item.file_text"></span>
-              </template>
-              <div class="text-content" v-html="item.file_text">
-              </div>
-            </a-tooltip>
+            <!--            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" -->
+            <!--                       :mouseEnterDelay="0.5">-->
+            <!--              <template slot="title">-->
+            <!--                <span v-html="item.content"></span>-->
+            <!--              </template>-->
+            <div v-if="!queryParam.selectValue" class="text-content" v-html="item.content"
+            >
+            </div>
+            <!--            </a-tooltip>-->
+            <!--            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"-->
+            <!--                      >-->
+            <!--              <template slot="title">-->
+            <!--                <span v-html="item.content"></span>-->
+            <!--              </template>-->
+            <div v-else-if="(item.file_text instanceof Array) && queryParam.selectValue"
+                 class="text-content" v-html="item.content"></div>
+            <!--            </a-tooltip>-->
+            <!--            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"-->
+            <!--                       >-->
+            <!--              <template slot="title">-->
+            <!--                <span v-html="item.content"></span>-->
+            <!--              </template>-->
+            <div v-else-if="!item.file_text && queryParam.selectValue"
+                 class="text-content" v-html="item.content"></div>
+            <!--            </a-tooltip>-->
+            <!--            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" >-->
+            <!--              <template slot="title">-->
+            <!--                <span v-html="item.file_text"></span>-->
+            <!--              </template>-->
+            <div v-else class="text-content" v-html="item.file_text">
+            </div>
+            <!--            </a-tooltip>-->
          </div>
        </div>
      </li>
@@ -191,6 +193,11 @@
        postAction(this.url.getInfoList, query).then((res) => {
          if (res.success) {
            this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                val.content = val.content.replace(/<img .*?>/g, '')
+              })
+            }
            this.total = res.result.total
            this.loading = false
          } else {
@@ -305,4 +312,9 @@
    text-align: center;
    line-height: 10;
  }
+
+  ::v-deep p {
+    margin: 0;
+    padding: 0;
+  }
 </style>
@@ -56,14 +56,14 @@
                        <span style="cursor: pointer" v-html="item.title"></span>
                      </a-tooltip>
                    </div>
-                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
-                      <template slot="title">
-                        <span v-html="item.content"></span>
-                      </template>
+<!--                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">-->
+<!--                      <template slot="title">-->
+<!--                        <span v-html="item.content"></span>-->
+<!--                      </template>-->
                      <div class="text-content" v-html="item.content"
                      >
                      </div>
-                    </a-tooltip>
+<!--                    </a-tooltip>-->
                  </div>
                </div>
              </li>
@@ -220,7 +220,9 @@
        return words.replace(/\s/g, '') //这里是去除空格
      },
      getParagraphInfoList() {
-        let queryParamOne = Object.assign(this.queryParam, this.queryParamOne)
+        let queryParamIndex = JSON.parse(JSON.stringify(this.queryParam))
+        let queryParamAdmin = JSON.parse(JSON.stringify(this.queryParamOne))
+        let queryParamOne = Object.assign(queryParamIndex, queryParamAdmin)
        let queryParam = JSON.parse(JSON.stringify(queryParamOne))
        Object.keys(queryParam).forEach(val => {
          if (queryParam[val] instanceof Array) {
@@ -238,6 +240,11 @@
        postAction(this.url.getParagraphInfoList, query).then((res) => {
          if (res.success) {
            this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                val.content = val.content.replace(/<img .*?>/g, '')
+              })
+            }
            this.total = res.result.total
            this.loading = false
          } else {
@@ -482,4 +489,8 @@
    overflow: hidden;
    text-overflow: ellipsis;
  }
+  ::v-deep p{
+    margin: 0;
+    padding: 0;
+  }
 </style>
@@ -8,9 +8,9 @@
      <li v-for="(item,index) in conList" :key="item.id">
        <div style="margin-bottom: 10px;position: relative">
          <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
-          <div class="text-text-right"
+          <div class="text-text-right" @click="titleClick(item)"
               :class="{ 'null-input':item.checked }">
-            <div class="text-header" @click="titleClick(item)">
+            <div class="text-header">
              <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                <template slot="title">
                  <span v-html="item.module_type"></span>
@@ -43,36 +43,39 @@

              </a-tooltip>
            </div>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" v-if="!queryParam.selectValue"
-                       :mouseEnterDelay="0.5">
-              <template slot="title">
-                <span v-html="item.content"></span>
-              </template>
-              <div class="text-content" @click="checkedClick(item)" v-html="item.content"
-              >
-              </div>
-            </a-tooltip>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
-                       v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
-              <template slot="title">
-                <span v-html="item.content"></span>
-              </template>
-              <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
-            </a-tooltip>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
-                       v-else-if="!item.file_text && queryParam.selectValue">
-              <template slot="title">
-                <span v-html="item.content"></span>
-              </template>
-              <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
-            </a-tooltip>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
-              <template slot="title">
-                <span v-html="item.file_text"></span>
-              </template>
-              <div class="text-content" @click="checkedClick(item)" v-html="item.file_text">
-              </div>
-            </a-tooltip>
+            <!--            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" -->
+            <!--                       :mouseEnterDelay="0.5">-->
+            <!--              <template slot="title">-->
+            <!--                <span v-html="item.content"></span>-->
+            <!--              </template>-->
+            <div v-if="!queryParam.selectValue" class="text-content" v-html="item.content"
+            >
+            </div>
+            <!--            </a-tooltip>-->
+            <!--            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"-->
+            <!--                       >-->
+            <!--              <template slot="title">-->
+            <!--                <span v-html="item.content"></span>-->
+            <!--              </template>-->
+            <div v-else-if="(item.file_text instanceof Array) && queryParam.selectValue"
+                 class="text-content" v-html="item.content"></div>
+            <!--            </a-tooltip>-->
+            <!--            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"-->
+            <!--                      >-->
+            <!--              <template slot="title">-->
+            <!--                <span v-html="item.content"></span>-->
+            <!--              </template>-->
+            <div v-else-if="!item.file_text && queryParam.selectValue"
+                 class="text-content" v-html="item.content"></div>
+            <!--            </a-tooltip>-->
+            <!--            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" >-->
+            <!--              <template slot="title">-->
+            <!--                <span v-html="item.file_text"></span>-->
+            <!--              </template>-->
+            <!--            @click="checkedClick(item)"-->
+            <div v-else class="text-content" v-html="item.file_text">
+            </div>
+            <!--            </a-tooltip>-->
          </div>
        </div>
      </li>
@@ -213,6 +216,11 @@
        postAction(this.url.getInfoList, query).then((res) => {
          if (res.success) {
            this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                val.content = val.content.replace(/<img .*?>/g, '')
+              })
+            }
            this.total = res.result.total
          } else {
            this.conList = []
@@ -287,6 +295,7 @@
    padding: 19px 28px;
    box-sizing: border-box;
    margin-left: 38px;
+    cursor: pointer;
  }

  .null-input {
@@ -351,4 +360,9 @@
    text-align: center;
    line-height: 10;
  }
+
+  ::v-deep p {
+    margin: 0;
+    padding: 0;
+  }
 </style>
@@ -65,10 +65,10 @@
                <a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane>
                <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render>
                </a-tab-pane>
-<!--                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>-->
-<!--                </a-tab-pane>-->
-<!--                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>-->
-<!--                </a-tab-pane>-->
+                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>
+                </a-tab-pane>
+                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>
+                </a-tab-pane>
              </a-tabs>
            </div>
          </div>
@@ -644,12 +644,12 @@ export default {
      // } else {
      //   value.technologyTerritory = value.technologyTerritory.split(',')
      // }
+      this.formInline = value
      if(this.formInline.controlType == 11){
        this.required = false
      }else{
        this.required = true
      }
-      this.formInline = value
      this.title = this.$t('edit')
      this.flag = 0
      //  获取认证类别
@@ -80,6 +80,12 @@
 <!--        <a-icon type="setting"/>-->
 <!--        {{ $t('batSetting') }}-->
 <!--      </div>-->
+      <div @click="BatchMaintenanceProgress" class="operator-text">
+        {{$t('BatchMaintenanceProgress')}}
+      </div>
+      <div @click="BatchChangeStatus" class="operator-text">
+        {{$t('BatchChangeStatus')}}
+      </div>
      <div @click="CertificationDirectory" class="operator-text">
        <a-icon type="bulb"/>
        {{$t('CertificationDirectory')}}
@@ -100,6 +106,8 @@
        :pagination="false"
        :scroll="{x: true}"
        :data-source="dataSource"
+        rowKey="id"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
        :columns="columns"
      >
        <div slot="standardInformation" slot-scope="text,result" class="box-left">
@@ -178,11 +186,37 @@
    <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
    <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
    <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
+    <batchChangeModel @batchChangeModel="batchChangeModel" ref="batchChangeModelRef"/>
+    <batchModel @batchModel="batchModel" ref="batchModelRef"/>
+    <!--    错误数据提示-->
+    <a-modal
+      :title="$t('operationFailed')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      @cancel='cancleoperationFailed'
+      :footer="null"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in NotSelectedNoEngineerValue'>
+            <span>{{ item.nioNumber }}</span>
+          </span>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
  </a-card>
 </template>

 <script>
  import certificationDirectory from './certificationDirectory'
+  import batchChangeModel from './batchChangeModel'
+  import batchModel from './batchModel'
  import TaskListModel from './TaskListModel'
  import taskBatSetting from './taskBatSetting'
  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
@@ -194,6 +228,8 @@
    components: {
      certificationDirectory,
      TaskListModel,
+      batchChangeModel,
+      batchModel,
      taskBatSetting
    },
    props: ['isDisplayNum', 'areaOfResponsibility'],
@@ -259,6 +295,7 @@
          }
        ],
        selectedRowKeys: [],
+
        status: {
          'NotDone': '待办',
          'haveDone': '已办',
@@ -305,7 +342,11 @@
          exportXls: '/project/projectTaskInventoryEO/exportXls'
        },
        loading: false,
+        visibleoperationFailed:false,
+        NotSelectedNoEngineerValue:[],
        dataSource: [],
+        selectionRowsArray:[],
+        roleCodes:[],
        long: ''
      }
    },
@@ -352,8 +393,15 @@
      taskBatSettingForm() {
        this.getList()
      },
-      onSelectChange(value) {
+      batchChangeModel() {
+        this.getList()
+      },
+      batchModel() {
+        this.getList()
+      },
+      onSelectChange(value, selectionRows) {
        this.selectedRowKeys = value
+        this.selectionRowsArray = selectionRows
      },
      handleExport() {
        let query = {
@@ -450,6 +498,7 @@
      CertificationDirectory() {
        this.$refs.certificationDirectoryRef.addModel()
      },
+
      getList() {
        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
        Object.keys(queryParam).forEach(val => {
@@ -484,6 +533,70 @@
        let item = JSON.parse(JSON.stringify(val))
        this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus'))
      },
+      //批量维护进度
+
+      BatchMaintenanceProgress() {
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          this.selectionRowsArray.forEach((item,index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+          query = {
+            roleCodes: roleCodes.join(','),
+            operation:'1',
+            projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+          }
+          postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
+            if (res.success) {
+              this.$refs.batchModelRef.getData(this.selectedRowKeys)
+            } else {
+              this.NotSelectedNoEngineerValue = res.result
+              this.visibleoperationFailed = true
+            }
+          })
+
+
+        }
+
+
+      },
+      //批量修改状态
+      BatchChangeStatus() {
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          this.selectionRowsArray.forEach((item,index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+          query = {
+            roleCodes: roleCodes.join(','),
+            operation:'2',
+            projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+          }
+          postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
+            if (res.success) {
+              this.$refs.batchChangeModelRef.getData(this.selectionRowsArray)
+            } else {
+              this.NotSelectedNoEngineerValue = res.result
+              this.visibleoperationFailed = true
+            }
+          })
+
+        }
+
+      },
+      cancleoperationFailed(){
+        this.visibleoperationFailed = false
+      },
      TaskListModelList() {
        this.getList()
      },
@@ -0,0 +1,215 @@
+<!--批量当前状态-->
+<template>
+  <a-modal
+    :title="title"
+    :width="700"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <div class="headerText">
+          {{this.$t('redSchedule')}}<br/>
+          {{this.$t('yellowSchedule')}}<br/>
+          {{this.$t('greenRequirements')}}<br/>
+          {{this.$t('blueUndeterminedState')}}
+        </div>
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="conditionAssessment">
+              <a-select
+                :disabled="disabled"
+                v-model="formInline.conditionAssessment"
+                :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
+                <a-select-option :value="'1'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'2'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'3'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
+                </a-select-option>
+
+                <a-select-option :value="'4'" disabled>
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('remarks')">{{$t('remarks')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="remark">
+              <a-textarea
+                :placeholder="$t('remarks')"
+                :disabled="disabled"
+                v-model="formInline.remark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+import { postAction, putAction, getAction } from '@/api/manage'
+
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      rules: {},
+      selectionRowsArray:[],
+      projectLawsInventoryIds:[],
+      roleCodes:[],
+      visible: false,
+      title:'',
+      confirmLoading: false,
+      studioList: [],
+      disabled: false,
+      url: {
+        edit: '/project/projectTaskInventoryEO/edit',
+        addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+        list: '/project/projectTaskInventoryConditionAssessmentEO/list'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    getData(val) {
+      this.visible = true
+      this.title = this.$t('BatchChangeStatus')
+      this.selectionRowsArray = val
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    getList(val) {
+      getAction(this.url.list, { projectLawsInventoryId: val.projectLawsInventoryId }).then((res) => {
+        if (res.success) {
+          this.studioList = res.result || []
+        } else {
+          this.studioList = []
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let query = {}
+          let projectLawsInventoryIds = []
+          let roleCodes = []
+          let Action
+          this.selectionRowsArray.forEach((item,index) => {
+            projectLawsInventoryIds.push(item.projectLawsInventoryId)
+            roleCodes.push(item.roleCode)
+          })
+            query = {
+              roleCodes: roleCodes.join(','),
+              remark: this.formInline.remark,
+              conditionAssessment: this.formInline.conditionAssessment,
+              projectLawsInventoryIds: projectLawsInventoryIds.join(',')
+            }
+            Action = postAction
+          this.confirmLoading = true
+          Action('/project/projectTaskInventoryConditionAssessmentEO/addOrUpdateBatch', query).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('batchChangeModel')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text {
+  width: 134px;
+  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;
+}
+
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
+</style>
@@ -0,0 +1,179 @@
+<!--批量维护进度-->
+<template>
+  <a-modal
+    :title="title"
+    :width="700"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="!disabled?'certificationProgress':''">
+              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+                                 :disabled="disabled"
+                                 @input="handleInput('certificationProgress')"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('remarks')">{{$t('remarks')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" :prop="!disabled?'certificationProgressRemark':''">
+              <a-textarea
+                :placeholder="$t('PleaseEnter')+$t('remarks')"
+                :disabled="disabled"
+                v-model="formInline.certificationProgressRemark" :rows="4"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+import { postAction, putAction, getAction } from '@/api/manage'
+
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      selectionRowsArray:[],
+      rules: {},
+      title:'',
+      visible: false,
+      confirmLoading: false,
+      studioList: [],
+      ids:'',
+      disabled: false,
+      url: {
+        edit: '/project/projectTaskInventoryEO/edit',
+        addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+        list: '/project/projectTaskInventoryConditionAssessmentEO/list'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    getData(val) {
+      this.visible = true
+      this.title = this.$t('BatchMaintenanceProgress')
+      this.selectionRowsArray = val
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    getList(val) {
+      getAction(this.url.list, { projectLawsInventoryId: val.projectLawsInventoryId }).then((res) => {
+        if (res.success) {
+          this.studioList = res.result || []
+        } else {
+          this.studioList = []
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let query = {}
+          this.ids = this.selectionRowsArray.join(',')
+            query = {
+              ids: this.ids,
+              certificationProgress: this.formInline.certificationProgress,
+              certificationProgressRemark: this.formInline.certificationProgressRemark
+            }
+          this.confirmLoading = true
+          postAction('/project/projectTaskInventoryEO/editBatch', query).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('batchModel')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text {
+  width: 134px;
+  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;
+}
+
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
+</style>