diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index 1eb94cb36..7a6de1b0b 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -325,3 +325,48 @@ CREATE TABLE `auth_dummy_content_change` (
                                              PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- 标签管理 增加认证清单-配置项数据  2023-03-13 未同步生产环境 （由于需求确认 认证清单-配置项为输入框，此数据暂时不用了。）
+-- INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1635093263477002242', '认证清单-配置项', 'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4', '认证清单-配置项', 0, 'admin', '2023-03-13 09:39:47', NULL, NULL, NULL, NULL, 1, 0, '1', 1);
+--
+-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093344389320705', '1635093263477002242', '配置1', '46c10455e29e4855bb7e5d653b11a51d', '开发环境假数据', 1, 1, 'admin', '2023-03-13 09:40:07', 'admin', '2023-03-13 09:40:46', 1, NULL, NULL, '0', 'pz1');
+-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093406049783810', '1635093263477002242', '配置2', '4718f8eef0434d079b970834a2b9dd69', '开发环境假数据', 2, 1, 'admin', '2023-03-13 09:40:21', 'admin', '2023-03-13 09:40:43', 1, NULL, NULL, '0', 'Pz2');
+-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093480922304513', '1635093263477002242', '配置3', 'd3dd928d93d74e07ad8fa31bffea9641', '开发环境假数据', 3, 1, 'admin', '2023-03-13 09:40:39', NULL, NULL, 1, NULL, NULL, '0', 'Pz3');
+
+-- 认证虚拟清单明细表  增加字段 交付物类型  2023-03-13 未同步生产环境
+ALTER TABLE `auth_dummy_inventory_info`
+    ADD COLUMN `deliverable_type` varchar(255) NULL COMMENT '交付物类型' AFTER `deliverable`;
+
+-- 项目库-认证清单 修改交付物类型字段长度  2023-03-13 未同步生产环境
+ALTER TABLE `project_certification_inventory`
+    MODIFY COLUMN `deliverable_type` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物类型' AFTER `duty_person`;
+
+-- 项目库-认证清单-修改历史表 2023-03-13 未同步生产环境
+CREATE TABLE `project_certification_inventory_log`  (
+    `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+    `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+    `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+    `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+    `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+    `content_cn` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作内容-中文',
+    `content_en` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作内容-英文',
+    `operator_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作类型',
+    `project_certification_inventory_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '认证清单数据id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目库-认证清单-修改历史表' ROW_FORMAT = Dynamic;
+
+-- 分类字典表增加字段，认证清单-交付物类型使用   2023-03-14 未同步生产环境
+ALTER TABLE `sys_category`
+    ADD COLUMN `value_type` varchar(255) NULL COMMENT '值类型:值对应SysCategoryValueTypeEnum枚举类' AFTER `sort_order`;
+
+-- 增加标签管理数据  认证-交付物类型   2023-03-14 未同步生产环境
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1635543933669818369', '认证-交付物类型', 'ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2', NULL, 0, 'admin', '2023-03-14 15:30:35', NULL, NULL, NULL, NULL, 1, 0, '2', 30);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635544016406659074', '0', 'testCn1', NULL, 'admin', '2023-03-14 15:30:55', 'admin', '2023-03-14 15:35:09', 'A01', '1635543933669818369', NULL, 'testEn1', NULL, 1, NULL, NULL, 1, NULL, 2);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545079494950913', '0', '强检报告(附件)Cn', NULL, 'admin', '2023-03-14 15:35:09', 'admin', '2023-03-14 15:36:01', 'A01', '1635543933669818369', NULL, '强检报告(附件)En', NULL, 1, NULL, NULL, 0, NULL, 3);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545194746036225', '0', 'CCC证书(附件)Cn', NULL, 'admin', '2023-03-14 15:35:36', NULL, NULL, 'A01', '1635543933669818369', NULL, 'CCC证书(附件)En', NULL, 1, NULL, NULL, 0, NULL, 1);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545299360366594', '0', 'E-Mark(附件)Cn', NULL, 'admin', '2023-03-14 15:36:01', NULL, NULL, 'A01', '1635543933669818369', NULL, 'E-Mark(附件)En', NULL, 1, NULL, NULL, 0, NULL, 2);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545372836184066', '0', '自我声明Cn', NULL, 'admin', '2023-03-14 15:36:19', NULL, NULL, 'A01', '1635543933669818369', NULL, '自我生命En', NULL, 1, NULL, NULL, 0, NULL, 4);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545471297470465', '0', '自愿认证Cn', NULL, 'admin', '2023-03-14 15:36:42', NULL, NULL, 'A01', '1635543933669818369', NULL, '自愿认证En', NULL, 1, NULL, NULL, 0, NULL, 5);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545540197302273', '0', '摸底报告Cn', NULL, 'admin', '2023-03-14 15:36:58', 'admin', '2023-03-14 15:37:20', 'A01', '1635543933669818369', NULL, '摸底报告En', NULL, 1, NULL, NULL, 0, NULL, 7);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545630152540161', '0', '工程评估（文本）Cn', NULL, 'admin', '2023-03-14 15:37:20', NULL, NULL, 'A01', '1635543933669818369', NULL, '工程评估（文本）En', NULL, 1, NULL, NULL, 0, NULL, 6);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545748968783874', '0', 'N/A不填Cn', NULL, 'admin', '2023-03-14 15:37:48', NULL, NULL, 'A01', '1635543933669818369', NULL, 'N/A不填En', NULL, 1, NULL, NULL, 0, NULL, 8);
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
index 7536ab487..bcba55d30 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
@@ -603,4 +603,14 @@ public class SysCategoryController {
 		String flag = "evaluation_method";
 		return Result.OK(sysCategoryService.getSysCategoryTree(flag));
 	}
+
+	/**
+	 * 只查询交付物类型的树形数据字典
+	 * @return
+	 */
+	@GetMapping("/getCertificationDeliverableTree")
+	public Result getCertificationDeliverableTree() {
+		String flag = "ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2";
+		return Result.OK(sysCategoryService.getSysCategoryTree(flag));
+	}
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java
index b80381fcd..520f57129 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java
@@ -96,6 +96,11 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	@Dict(dicCode = "attribute_type")
 	private java.lang.String attributeType;
 
+	// 值对应SysCategoryValueTypeEnum枚举类
+	@ApiModelProperty(value = "值类型 1附件 2文本 3不用填")
+	@Dict(dicCode = "value_type")
+	private java.lang.String valueType;
+
 	/**逻辑删除标识*/
 	@TableLogic
 	public Integer delFlag;
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java
new file mode 100644
index 000000000..0a5cde3a8
--- /dev/null
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java
@@ -0,0 +1,34 @@
+package com.jero.modules.system.enums;
+
+public enum SysCategoryValueTypeEnum {
+
+    FILE("附件","file"),
+    TEXT("文本","text"),
+    SELECT("选择","select"),
+    NA("不用填","N/A"),
+    ;
+
+    String name;
+    String value;
+
+    private SysCategoryValueTypeEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
index fea081c16..cf2c45c7c 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
@@ -19,7 +19,7 @@
 
 	<select id="queryByList" resultType="com.jero.modules.system.entity.SysCategory">
 		select create_by,create_time,sys_org_code,update_by,update_time,attribute_type,code,sort_order,
-		del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id
+		del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id,value_type
 		from sys_category
 		where is_tag_dict=1 and sys_dict_id=#{params.sysDictId} and del_flag=0
 		<!--搜索条件:标签名称包含%,单独搜索-->
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
index db4eeac8c..3e51539c0 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
@@ -275,6 +275,8 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 				dictId = sysCategoryMapper.getDictId("deliverable_template");
 			}else if("evaluation_method".equals(flag)){
 				dictId = sysCategoryMapper.getDictId("evaluation_method");
+			}else if("ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2".equals(flag)){
+				dictId = sysCategoryMapper.getDictId("ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2");
 			}else{
 				dictId = sysCategoryMapper.getFieldInfo("technology_territory");
 			}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java
index 0ecf989cb..c490213c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java
@@ -59,7 +59,8 @@ public class AuthDummyInventoryInfoEOController extends JeroController<AuthDummy
 								   HttpServletRequest req) {
 		QueryWrapper<AuthDummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap());
 		Page<AuthDummyInventoryInfoEO> page = new Page<AuthDummyInventoryInfoEO>(pageNo, pageSize);
-		IPage<AuthDummyInventoryInfoEO> pageList = authDummyInventoryInfoEOService.page(page, queryWrapper);
+		IPage<AuthDummyInventoryInfoEO> pageList = this.authDummyInventoryInfoEOService.page(page, queryWrapper);
+		this.authDummyInventoryInfoEOService.disposeData(pageList.getRecords(),authDummyInventoryInfoEO.getCut());
 		return Result.OK(pageList);
 	}
 
@@ -71,9 +72,10 @@ public class AuthDummyInventoryInfoEOController extends JeroController<AuthDummy
 	@AutoLog(value = "认证虚拟清单详情表-列表查询")
     @ApiOperation(value="认证虚拟清单详情表-列表查询", notes="认证虚拟清单详情表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<AuthDummyInventoryInfoEO>> queryList() {
-        List<AuthDummyInventoryInfoEO> list = authDummyInventoryInfoEOService.queryList();
-        return Result.OK(list);
+	public Result<List<AuthDummyInventoryInfoEO>> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) {
+        List<AuthDummyInventoryInfoEO> list = this.authDummyInventoryInfoEOService.queryList(authDummyInventoryInfoEO,req);
+		this.authDummyInventoryInfoEOService.disposeData(list,authDummyInventoryInfoEO.getCut());
+        return Result.OK(authDummyInventoryInfoEO.getCut(),list);
 	}
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
index 8dee0aa8a..59943aef2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
@@ -91,12 +91,23 @@ public class AuthDummyInventoryInfoEO implements Serializable {
 	@Excel(name = "责任领域", width = 15)
     @ApiModelProperty(value = "责任领域")
     private java.lang.String dutyTerritory;
+    @TableField(exist = false)
+    // 责任领域名称
+    private String dutyTerritoryName;
 
 	/**交付物*/
 	@Excel(name = "交付物", width = 15)
     @ApiModelProperty(value = "交付物")
     private java.lang.String deliverable;
 
+    /**交付物类型*/
+    @Excel(name = "交付物类型", width = 15)
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    @TableField(exist = false)
+    // 交付物类型名称
+    private String deliverableTypeName;
+
 	/**文档库id*/
 //	@Excel(name = "文档库id", width = 15)
     @ApiModelProperty(value = "文档库id")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java
index 1528cc8c8..1868b94ba 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.system.entity.SysCategory;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -63,7 +64,7 @@ public interface IAuthDummyInventoryInfoEOService extends IService<AuthDummyInve
 	 *
 	 * @return
 	 */
-    List<AuthDummyInventoryInfoEO> queryList();
+    List<AuthDummyInventoryInfoEO> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req);
 
 	/**
 	 * 复制
@@ -103,4 +104,20 @@ public interface IAuthDummyInventoryInfoEOService extends IService<AuthDummyInve
 	 * @param request
 	 */
 	void exportTemplate(AuthDummyInventoryInfoEO authDummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request);
+
+	/**
+	 * 处理数据
+	 * @param datas
+	 * @param cut
+	 */
+	void disposeData(List<AuthDummyInventoryInfoEO> datas, String cut);
+
+	/**
+	 * 获取责任领域名称
+	 * @param cut
+	 * @param categoryList
+	 * @param technologyTerritoryList
+	 * @return
+	 */
+	String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
index e3a17e1d7..795c5c3ef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
@@ -28,10 +28,12 @@ import com.jero.modules.dummy.entity.DummyInventoryInfoEOEn;
 import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
 import com.jero.modules.split.common.FileUnZip;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.mapper.SysCategoryMapper;
+import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
@@ -114,6 +116,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 	@Autowired
 	private IBussDocumentLibraryEOService iBussDocumentLibraryEOService;
 
+	@Autowired
+	private ISysDictItemService sysDictItemService;
+
 	/**
 	 * 保存
 	 *
@@ -180,8 +185,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 	 * @return
 	 */
 	@Override
-    public List<AuthDummyInventoryInfoEO> queryList() {
-        return list();
+    public List<AuthDummyInventoryInfoEO> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) {
+		QueryWrapper<AuthDummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap());
+		List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = this.list(queryWrapper);
+		return authDummyInventoryInfoEOList;
     }
 
 	@Override
@@ -260,6 +267,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 				if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getBussDocumentLibraryId())){
 					updateAuthDummyEO.setBussDocumentLibraryId(authDummyInventoryInfoEO.getBussDocumentLibraryId());
 				}
+				if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getDeliverableType())){
+					updateAuthDummyEO.setDeliverableType(authDummyInventoryInfoEO.getDeliverableType());
+				}
 				updateList.add(updateAuthDummyEO);
 			}
 
@@ -1085,4 +1095,44 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		}
 
 	}
+
+	@Override
+	public void disposeData(List<AuthDummyInventoryInfoEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			List<SysCategory> categoryList = this.sysCategoryService.list();
+			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
+
+			for (AuthDummyInventoryInfoEO data : datas) {
+				if(StringUtils.isNotEmpty(data.getDeliverableType())){
+					String deliverableTypeName = this.getTreeName(cut, categoryList, Arrays.asList(data.getDeliverableType().split(",")));
+					data.setDeliverableTypeName(deliverableTypeName);
+				}
+				if(StringUtils.isNotEmpty(data.getDutyTerritory())){
+					String dutyTerritoryName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+					data.setDutyTerritoryName(dutyTerritoryName);
+				}
+			}
+
+		}
+	}
+
+	@Override
+	public String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
+		StringBuilder sb = new StringBuilder();
+		for (String technologyTerritory : technologyTerritoryList) {
+			List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
+			if(collect.size() != 0){
+				if (CutEnum.CN.getValue().equals(cut)) {
+					sb.append(collect.get(0).getName() + ",");
+				} else {
+					sb.append(collect.get(0).getEnName()+ ",");
+				}
+			}
+		}
+		String technologyTerritoryName = "";
+		if (StringUtils.isNotBlank(sb)) {
+			technologyTerritoryName = sb.substring(0, sb.length() - 1);
+		}
+		return technologyTerritoryName;
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
index 0b3e288fd..e9c503949 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
@@ -14,7 +14,7 @@ public enum TemplateInfoEnum2 {
     CERTIFICATION_MESSAGE6("认证清单-任务提醒，截止日期前第三天","ctp_AAuDmfXC3oJo"),
     CERTIFICATION_MESSAGE7("认证清单-任务提醒，截止日期当天","ctp_AAuDmfXCHc1I"),
     CERTIFICATION_MESSAGE8("认证清单-任务提醒，已逾期","ctp_AAuDMwOPU71H"),
-    CERTIFICATION_MESSAGE9("认证清单-责任人分发（转办），第二责任人收到消息","ctp_AAuDM8YP6soc"),
+    //CERTIFICATION_MESSAGE9("认证清单-责任人分发（转办），第二责任人收到消息","ctp_AAuDM8YP6soc"),
     ;
 
     String name;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
index 898b198d4..ab88110b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
@@ -10,6 +10,7 @@ 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.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -58,9 +59,10 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
 		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		Page<ProjectCertificationInventoryEO> page = new Page<ProjectCertificationInventoryEO>(pageNo, pageSize);
 		IPage<ProjectCertificationInventoryEO> pageList = this.projectCertificationInventoryEOService.queryPage(queryWrapper,page,projectCertificationInventoryEO,cut);
-		return Result.OK(pageList);
+		return Result.OK(cut,pageList);
 	}
 
     /**
@@ -241,4 +243,31 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 	 public Result<?> expediting(@RequestBody JSONObject json) {
 		 return this.projectCertificationInventoryEOService.expediting(json);
 	 }
+
+	 @AutoLog(value = "项目库-认证清单表-批量修改配置项")
+	 @ApiOperation(value="项目库-认证清单表-批量修改配置项", notes="项目库-认证清单表-批量修改配置项")
+	 @PostMapping(value = "/updateConfigItemBatch")
+	 public Result<?> updateConfigItemBatch(@RequestBody JSONObject json) {
+		 return this.projectCertificationInventoryEOService.updateConfigItemBatch(json);
+	 }
+
+	 @ApiOperation(value="项目库-认证清单表-模板下载", notes="项目库-认证清单表-模板下载")
+	 @GetMapping(value = "/exportTemplate")
+	 public void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception {
+		 projectCertificationInventoryEOService.exportTemplate(projectCertificationInventoryEO,response,request);
+	 }
+
+	 @AutoLog(value = "项目库-认证清单表-调取添加")
+	 @ApiOperation(value="项目库-认证清单表-调取添加", notes="项目库-认证清单表-调取添加")
+	 @PostMapping(value = "/callAdd")
+	 public Result<?> callAdd(@RequestBody JSONObject json) {
+		 return this.projectCertificationInventoryEOService.callAdd(json);
+	 }
+
+	 @AutoLog(value = "项目库-认证清单表-引用交付物")
+	 @ApiOperation(value="项目库-认证清单表-引用交付物", notes="项目库-认证清单表-引用交付物")
+	 @PostMapping(value = "/citeDeliverable")
+	 public Result<?> citeDeliverable(@RequestBody JSONObject json) {
+		 return this.projectCertificationInventoryEOService.citeDeliverable(json);
+	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java
new file mode 100644
index 000000000..80a4e28a9
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java
@@ -0,0 +1,172 @@
+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.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
+import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
+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.system.base.controller.JeroController;
+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;
+
+
+ /**
+ * @Description: 项目库-认证清单-修改历史表
+ * @Author: jero-boot
+ * @Date:   2023-03-13
+ * @Version: V1.0
+ */
+@Api(tags="项目库-认证清单-修改历史表")
+@RestController
+@RequestMapping("/project/projectCertificationInventoryLogEO")
+@Slf4j
+public class ProjectCertificationInventoryLogEOController extends JeroController<ProjectCertificationInventoryLogEO, IProjectCertificationInventoryLogEOService> {
+	@Autowired
+	private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectCertificationInventoryLogEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "项目库-认证清单-修改历史表-分页列表查询")
+	@ApiOperation(value="项目库-认证清单-修改历史表-分页列表查询", notes="项目库-认证清单-修改历史表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectCertificationInventoryLogEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryLogEO, req.getParameterMap());
+		Page<ProjectCertificationInventoryLogEO> page = new Page<ProjectCertificationInventoryLogEO>(pageNo, pageSize);
+		queryWrapper.orderByDesc("create_time");
+		IPage<ProjectCertificationInventoryLogEO> pageList = this.projectCertificationInventoryLogEOService.page(page, queryWrapper);
+		this.projectCertificationInventoryLogEOService.disposeData(pageList.getRecords(),projectCertificationInventoryLogEO.getCut());
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-认证清单-修改历史表-列表查询")
+    @ApiOperation(value="项目库-认证清单-修改历史表-列表查询", notes="项目库-认证清单-修改历史表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectCertificationInventoryLogEO>> queryList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO,HttpServletRequest req) {
+        List<ProjectCertificationInventoryLogEO> list = this.projectCertificationInventoryLogEOService.queryList(projectCertificationInventoryLogEO,req);
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectCertificationInventoryLogEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-认证清单-修改历史表-添加")
+	@ApiOperation(value="项目库-认证清单-修改历史表-添加", notes="项目库-认证清单-修改历史表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) {
+		projectCertificationInventoryLogEOService.add(projectCertificationInventoryLogEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectCertificationInventoryLogEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-认证清单-修改历史表-编辑")
+	@ApiOperation(value="项目库-认证清单-修改历史表-编辑", notes="项目库-认证清单-修改历史表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) {
+		projectCertificationInventoryLogEOService.editById(projectCertificationInventoryLogEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目库-认证清单-修改历史表-通过id删除")
+	@ApiOperation(value="项目库-认证清单-修改历史表-通过id删除", notes="项目库-认证清单-修改历史表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		projectCertificationInventoryLogEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目库-认证清单-修改历史表-批量删除")
+	@ApiOperation(value="项目库-认证清单-修改历史表-批量删除", notes="项目库-认证清单-修改历史表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectCertificationInventoryLogEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目库-认证清单-修改历史表-通过id查询")
+	@ApiOperation(value="项目库-认证清单-修改历史表-通过id查询", notes="项目库-认证清单-修改历史表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = projectCertificationInventoryLogEOService.queryById(id);
+		if(projectCertificationInventoryLogEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectCertificationInventoryLogEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectCertificationInventoryLogEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) {
+        return super.exportXls(request, projectCertificationInventoryLogEO, ProjectCertificationInventoryLogEO.class, "项目库-认证清单-修改历史表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectCertificationInventoryLogEO.class);
+    }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
index 9242934e8..67bcd878b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
@@ -75,6 +75,7 @@ public class ProjectCertificationInventoryEO implements Serializable {
 	/**配置项*/
 	@Excel(name = "配置项", width = 15)
     @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
     private java.lang.String configItem;
 
 	/**WVTA ID*/
@@ -94,6 +95,9 @@ public class ProjectCertificationInventoryEO implements Serializable {
     /**责任领域名称**/
     @TableField(exist = false)
     private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
 
 	/**交付物*/
 	@Excel(name = "交付物", width = 15)
@@ -125,14 +129,20 @@ public class ProjectCertificationInventoryEO implements Serializable {
 	@Excel(name = "交付物类型", width = 15)
     @ApiModelProperty(value = "交付物类型")
     private java.lang.String deliverableType;
-	@TableField(exist = false)
     // 交付物类型名称
+    @TableField(exist = false)
     private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
 
 	/**交付物模板*/
 	@Excel(name = "交付物模板", width = 15)
     @ApiModelProperty(value = "交付物模板")
     private java.lang.String deliverableTemplate;
+	/**交付物模板名称**/
+    @TableField(exist = false)
+    private String deliverableTemplateName;
 
 	/**交付结果*/
 	@Excel(name = "交付结果", width = 15)
@@ -150,8 +160,8 @@ public class ProjectCertificationInventoryEO implements Serializable {
 	@Excel(name = "流程状态", width = 15)
     @ApiModelProperty(value = "流程状态")
     private java.lang.String flowStatus;
-	@TableField(exist = false)
     // 流程状态展示名称
+    @TableField(exist = false)
     private String flowStatusName;
 
 	/**报告编号*/
@@ -194,4 +204,8 @@ public class ProjectCertificationInventoryEO implements Serializable {
 
     @TableField(exist = false)
     private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java
new file mode 100644
index 000000000..5908294bc
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java
@@ -0,0 +1,95 @@
+package com.jero.modules.project.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 项目库-认证清单-修改历史表
+ * @Author: jero-boot
+ * @Date:   2023-03-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory_log对象", description="项目库-认证清单-修改历史表")
+public class ProjectCertificationInventoryLogEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**操作内容-中文*/
+	@Excel(name = "操作内容-中文", width = 15)
+    @ApiModelProperty(value = "操作内容-中文")
+    private java.lang.String contentCn;
+
+    /**操作内容-英文*/
+    @Excel(name = "操作内容-英文", width = 15)
+    @ApiModelProperty(value = "操作内容-英文")
+    private java.lang.String contentEn;
+
+    /**操作类型*/
+    @Excel(name = "操作类型", width = 15)
+    @ApiModelProperty(value = "操作类型")
+    private String operatorType;
+
+	/**认证清单数据id*/
+	@Excel(name = "认证清单数据id", width = 15)
+    @ApiModelProperty(value = "认证清单数据id")
+    private java.lang.String projectCertificationInventoryId;
+
+	@TableField(exist = false)
+    private String cut;
+
+	/**操作内容回显**/
+    @TableField(exist = false)
+    private String content;
+
+    /**操作类型名称**/
+    @TableField(exist = false)
+    private String operatorTypeName;
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
index 0dfbf1750..64d746a4f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
@@ -55,6 +55,18 @@ public enum OperatorTypeEnum {
     CERTIFICATION_INVENTORY_SDT_EXPEDITING("认证清单-接口人催办","certificationInventorySdtExpediting"),
     CERTIFICATION_INVENTORY_STUDIO_WITHDRAW("认证清单-studio撤回","certificationInventoryStudioWithdraw"),
     CERTIFICATION_INVENTORY_STUDIO_RESET("认证清单-studio重置流程","certificationInventoryStudioReset"),
+    CERTIFICATION_INVENTORY_EDIT("认证清单-编辑","certificationInventoryEdit"),
+    CERTIFICATION_INVENTORY_ADD("认证清单-添加","certificationInventoryAdd"),
+    CERTIFICATION_INVENTORY_CALL("认证清单-调取","certificationInventoryCall"),
+    CERTIFICATION_INVENTORY_STUDIO_ISSUE("认证清单-studio发布","certificationInventoryStudioIssue"),
+    CERTIFICATION_INVENTORY_INITIATING_TASK("认证清单-认证工程师发起任务","certificationInventoryInitiatingTask"),
+    CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK("认证清单-认证工程师退回至studio任务","certificationInventoryReturnedStudioTask"),
+    CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK("认证清单-责任人接受任务","certificationInventoryDutyPersonAcceptTask"),
+    CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK("认证清单-责任人拒绝任务","certificationInventoryDutyPersonRejectTask"),
+    CERTIFICATION_INVENTORY_DUTY_PERSON_TRANSFER_TASK("认证清单-责任人转办任务","certificationInventoryDutyPersonTransferTask"),
+    CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK("认证清单-责任人提交任务","certificationInventoryDutyPersonSubmitTask"),
+    CERTIFICATION_INVENTORY_REVIEW_THROUGH("认证清单-认证工程师审核通过","certificationInventoryReviewThrough"),
+    CERTIFICATION_INVENTORY_REVIEW_RETURNED("认证清单-认证工程师审核退回","certificationInventoryReviewReturned"),
     ;
 
     String name;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryLogEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryLogEOMapper.java
new file mode 100644
index 000000000..b39d78d97
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryLogEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.project.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 项目库-认证清单-修改历史表
+ * @Author: jero-boot
+ * @Date:   2023-03-13
+ * @Version: V1.0
+ */
+public interface ProjectCertificationInventoryLogEOMapper extends BaseMapper<ProjectCertificationInventoryLogEO> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryLogEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryLogEOMapper.xml
new file mode 100644
index 000000000..13b06ba45
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryLogEOMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.project.mapper.ProjectCertificationInventoryLogEOMapper">
+    <resultMap id="ProjectCertificationInventoryLogEOResultMap" type="com.jero.modules.project.entity.ProjectCertificationInventoryLogEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="content" property="content" />
+        <result column="project_certification_inventory_id" property="projectCertificationInventoryId" />
+    </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
index 7ae88da7e..0017c61ac 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
@@ -12,6 +12,8 @@ import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -160,4 +162,33 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
 	Map<String,Object> getCertificationInventoryLinkHrefFeishu(String projectLibraryId,String PRN_CN,String PRN_EN);
 
 	Map<String,Object> getStandNameAndItemName(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+
+	/**
+	 * 模板下载
+	 * @param projectCertificationInventoryEO
+	 * @param response
+	 * @param request
+	 */
+	void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request);
+
+	/**
+	 * 批量修改配置项
+	 * @param json
+	 * @return
+	 */
+	Result<?> updateConfigItemBatch(JSONObject json);
+
+	/**
+	 * 调取添加
+	 * @param json
+	 * @return
+	 */
+	Result<?> callAdd(JSONObject json);
+
+	/**
+	 * 引用交付物
+	 * @param json
+	 * @return
+	 */
+	Result<?> citeDeliverable(JSONObject json);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java
new file mode 100644
index 000000000..f1183f035
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java
@@ -0,0 +1,82 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Description: 项目库-认证清单-修改历史表
+ * @Author: jero-boot
+ * @Date:   2023-03-13
+ * @Version: V1.0
+ */
+public interface IProjectCertificationInventoryLogEOService extends IService<ProjectCertificationInventoryLogEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectCertificationInventoryLogEO
+	 * @return
+	 */
+    void add(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectCertificationInventoryLogEO
+	 * @return
+	 */
+    void editById(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectCertificationInventoryLogEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectCertificationInventoryLogEO> queryList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO, HttpServletRequest req);
+
+	/**
+	 * 批量添加认证清单明细操作历史信息
+	 * @param projectCertificationInventoryLogEOList
+	 */
+    void insertBatch(List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList);
+
+	/**
+	 * 处理数据
+	 * @param datas
+	 * @param cut
+	 */
+	void disposeData(List<ProjectCertificationInventoryLogEO> datas, String cut);
+
+	/**
+	 * 根据认证清单idList删除历史数据
+	 * @param projectCertificationInventoryIdList
+	 */
+	void deleteByProjectCertificationInventoryIdList(List<String> projectCertificationInventoryIdList);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index b4eea846e..a07261c80 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -2,6 +2,7 @@ package com.jero.modules.project.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.IOUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,12 +12,19 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
+import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
+import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
+import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 import com.jero.modules.project.enums.*;
+import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.system.enums.ProjectRoleEnum;
 import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper;
@@ -26,6 +34,7 @@ import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
 import com.jero.modules.system.mapper.SysRoleMapper;
 import com.jero.modules.system.service.ISysCategoryService;
 import com.jero.modules.system.service.ISysDictItemService;
@@ -37,6 +46,15 @@ import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.todoCenter.service.IProcessInfoEOService;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -45,7 +63,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -54,6 +74,9 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description: 项目库-认证清单表
  * @Author: jero-boot
@@ -84,10 +107,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	private SysRoleMapper sysRoleMapper;
 	@Autowired
 	private IFeishuService feishuService;
+	@Autowired
+	private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService;
+	@Autowired
+	private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService;
+	@Autowired
+	private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
+	@Autowired
+	private IOSSFileService ossFileService;
 
 
 	@Value(value = "${jero.backUrl}")
 	private String backUrl;
+	@Value(value = "${jero.path.upload}")
+	private String uploadpath;
 
 	/**
 	 * 保存
@@ -111,11 +144,226 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	 */
 	@Override
     public void editById(ProjectCertificationInventoryEO projectCertificationInventoryEO) {
-    	Date now = new Date();
+		List<ProjectCertificationInventoryEO> editBeforeList = new ArrayList<>();
+		ProjectCertificationInventoryEO editBefore = this.queryById(projectCertificationInventoryEO.getId());
+		editBeforeList.add(editBefore);
+		this.disposeData(editBeforeList,CutEnum.CN.getValue());
+		List<ProjectCertificationInventoryEO> editAfterList = new ArrayList<>();
+		editAfterList.add(projectCertificationInventoryEO);
+		this.disposeData(editAfterList,CutEnum.CN.getValue());
+		this.setEditProjectCertificationInventoryLogEO(editBeforeList,editAfterList);
+
+		Date now = new Date();
         projectCertificationInventoryEO.setUpdateTime(now);
     	saveOrUpdate(projectCertificationInventoryEO);
     }
 
+	/**
+	 * 对比编辑前后 认证清单信息，设置修改历史日志
+	 * @param editBeforeList	编辑前
+	 * @param editAfterList     编辑后
+	 */
+    public void setEditProjectCertificationInventoryLogEO(List<ProjectCertificationInventoryEO> editBeforeList,List<ProjectCertificationInventoryEO> editAfterList){
+		if(CollectionUtils.isNotEmpty(editBeforeList) && CollectionUtils.isNotEmpty(editAfterList)){
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
+
+			for (ProjectCertificationInventoryEO editAfter : editAfterList) {
+				ProjectCertificationInventoryEO editBeforeById = editBeforeList.stream().filter(editBefore -> {
+					boolean flag = false;
+					if (StringUtils.equals(editBefore.getId(), editAfter.getId())) {
+						flag = true;
+					}
+					return flag;
+				}).collect(Collectors.toList()).get(0);
+
+				if(!ObjectUtils.isEmpty(editBeforeById)){
+					StringBuilder contentCnSb = new StringBuilder();
+					StringBuilder contentEnSb = new StringBuilder();
+
+					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("将");
+					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" changes ");
+
+					boolean saveFlag = false;
+
+					if(!StringUtils.equals(editBeforeById.getSerialNumber(),editAfter.getSerialNumber())){
+						contentCnSb.append("\"").append("法规编号").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getSerialNumber()) ? editBeforeById.getSerialNumber() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getSerialNumber()) ? editAfter.getSerialNumber() : "空").append("，");
+
+						contentEnSb.append("\"").append("Regulation No").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getSerialNumber()) ? editBeforeById.getSerialNumber() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getSerialNumber()) ? editAfter.getSerialNumber() : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getWvtaId(),editAfter.getWvtaId())){
+						contentCnSb.append("\"").append("WVTA ID").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getWvtaId()) ? editBeforeById.getWvtaId() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getWvtaId()) ? editAfter.getWvtaId() : "空").append("，");
+
+						contentEnSb.append("\"").append("WVTA ID").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getWvtaId()) ? editBeforeById.getWvtaId() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getWvtaId()) ? editAfter.getWvtaId() : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getCategory(),editAfter.getCategory())){
+						contentCnSb.append("\"").append("类别").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getCategory()) ? editBeforeById.getCategory() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getCategory()) ? editAfter.getCategory() : "空").append("，");
+
+						contentEnSb.append("\"").append("Category").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getCategory()) ? editBeforeById.getCategory() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getCategory()) ? editAfter.getCategory() : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getInspectionItem(),editAfter.getInspectionItem())){
+						contentCnSb.append("\"").append("检验项目").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getInspectionItem()) ? editBeforeById.getInspectionItem() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getInspectionItem()) ? editAfter.getInspectionItem() : "空").append("，");
+
+						contentEnSb.append("\"").append("Inspection Items").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getInspectionItem()) ? editBeforeById.getInspectionItem() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getInspectionItem()) ? editAfter.getInspectionItem() : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getConfigItem(),editAfter.getConfigItem())){
+						contentCnSb.append("\"").append("配置项").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getConfigItem()) ? editBeforeById.getConfigItem() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getConfigItem()) ? editAfter.getConfigItem() : "空").append("，");
+
+						contentEnSb.append("\"").append("Configuration Item").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getConfigItem()) ? editBeforeById.getConfigItem() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getConfigItem()) ? editAfter.getConfigItem() : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getDutyTerritory(),editAfter.getDutyTerritory())){
+						contentCnSb.append("\"").append("责任领域").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getDutyTerritoryName()) ? editBeforeById.getDutyTerritoryName() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getDutyTerritoryName()) ? editAfter.getDutyTerritoryName() : "空").append("，");
+
+						contentEnSb.append("\"").append("Responsible Field").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getDutyTerritoryNameEn()) ? editBeforeById.getDutyTerritoryNameEn() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getDutyTerritoryNameEn()) ? editAfter.getDutyTerritoryNameEn() : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getDeliverableType(),editAfter.getDeliverableType())){
+						contentCnSb.append("\"").append("交付物类型").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getDeliverableTypeName()) ? editBeforeById.getDeliverableTypeName() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getDeliverableTypeName()) ? editAfter.getDeliverableTypeName() : "空").append("，");
+
+						contentEnSb.append("\"").append("Deliverable Type").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getDeliverableTypeNameEn()) ? editBeforeById.getDeliverableTypeNameEn() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getDeliverableTypeNameEn()) ? editAfter.getDeliverableTypeNameEn() : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getDeliverableTemplateName(),editAfter.getDeliverableTemplateName())){
+						contentCnSb.append("\"").append("交付物模板").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getDeliverableTemplateName()) ? editBeforeById.getDeliverableTemplateName() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getDeliverableTemplateName()) ? editAfter.getDeliverableTemplateName() : "空").append("，");
+
+						contentEnSb.append("\"").append("Deliverable Template").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getDeliverableTemplateName()) ? editBeforeById.getDeliverableTemplateName() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getDeliverableTemplateName()) ? editAfter.getDeliverableTemplateName() : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getSdtName(),editAfter.getSdtName())){
+						contentCnSb.append("\"").append("工程接口人").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getSdtName()) ? editBeforeById.getSdtName() : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfter.getSdtName()) ? editAfter.getSdtName() : "空").append("，");
+
+						contentEnSb.append("\"").append("Eng. Interface").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getSdtName()) ? editBeforeById.getSdtName() : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfter.getSdtName()) ? editAfter.getSdtName() : "null").append("，");
+						saveFlag = true;
+					}
+					String editBeforeEndTime = "";
+					if(editBeforeById.getEndTime() != null){
+						editBeforeEndTime = DateUtils.formatDate(editBeforeById.getEndTime());
+					}
+					String editAfterEndTime = "";
+					if(editAfter.getEndTime() != null){
+						editAfterEndTime = DateUtils.formatDate(editAfter.getEndTime());
+					}
+
+					if(!StringUtils.equals(editBeforeEndTime,editAfterEndTime)){
+						contentCnSb.append("\"").append("截止时间").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editBeforeEndTime) ? editBeforeEndTime : "空");
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(StringUtils.isNotEmpty(editAfterEndTime) ? editAfterEndTime : "空").append("，");
+
+						contentEnSb.append("\"").append("Due Date").append("\"");
+						contentEnSb.append(StringUtils.isNotEmpty(editBeforeEndTime) ? editBeforeEndTime : "null");
+						contentEnSb.append(" to ");
+						contentEnSb.append(StringUtils.isNotEmpty(editAfterEndTime) ? editAfterEndTime : "null").append("，");
+						saveFlag = true;
+					}
+					if(!StringUtils.equals(editBeforeById.getDutyPersonName(),editAfter.getDutyPersonName())){
+						contentCnSb.append("\"").append("责任人").append("\"");
+						contentCnSb.append("由 ");
+						contentCnSb.append(editBeforeById.getDutyPersonName());
+						contentCnSb.append(" 修改为 ");
+						contentCnSb.append(editAfter.getDutyPersonName()).append("，");
+
+						contentEnSb.append("\"").append("Assignee").append("\"");
+						contentEnSb.append(editBeforeById.getDutyPersonName());
+						contentEnSb.append(" to ");
+						contentEnSb.append(editAfter.getDutyPersonName()).append("，");
+						saveFlag = true;
+					}
+
+					String contentCn = "";
+					if(StringUtils.isNotEmpty(contentCnSb.toString())){
+						contentCn = contentCnSb.toString().substring(0,contentCnSb.toString().length()-1);
+					}
+					String contentEn = "";
+					if(StringUtils.isNotEmpty(contentEnSb.toString())){
+						contentEn = contentEnSb.toString().substring(0,contentEnSb.toString().length()-1);
+					}
+
+					if(saveFlag){
+						ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+						projectCertificationInventoryLogEO.setProjectCertificationInventoryId(editAfter.getId());
+						projectCertificationInventoryLogEO.setContentCn(contentCn);
+						projectCertificationInventoryLogEO.setContentEn(contentEn);
+						projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_EDIT.getValue());
+						projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+					}
+				}
+			}
+			if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+				this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
+			}
+		}
+	}
+
 	/**
 	 * 通过id删除
 	 *
@@ -129,6 +377,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		QueryWrapper<ProcessInfoDetailEO> detailRemoveWrap = new QueryWrapper<>();
 		detailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,id);
 		this.processInfoDetailEOService.remove(detailRemoveWrap);
+
+		this.projectCertificationInventoryLogEOService.deleteByProjectCertificationInventoryIdList(Arrays.asList(id.split(",")));
     }
 
 	/**
@@ -140,7 +390,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	@Override
     public void deleteByIds(List<String> ids) {
 		QueryWrapper<ProjectCertificationInventoryEO> queryWrap = new QueryWrapper<>();
-		queryWrap.lambda().eq(ProjectCertificationInventoryEO::getId,ids);
+		queryWrap.lambda().in(ProjectCertificationInventoryEO::getId,ids);
 		List<ProjectCertificationInventoryEO> list = this.list(queryWrap);
 		removeByIds(ids);
 
@@ -148,6 +398,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,ids);
 		detailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,list.get(0).getProjectLibraryId());
 		this.processInfoDetailEOService.remove(detailRemoveWrap);
+
+		this.projectCertificationInventoryLogEOService.deleteByProjectCertificationInventoryIdList(ids);
 	}
 
 	/**
@@ -194,6 +446,33 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 			if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
 				this.saveBatch(projectCertificationInventoryEOList);
+
+				LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+				List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
+				for (ProjectCertificationInventoryEO certificationInventoryEO : projectCertificationInventoryEOList) {
+					StringBuilder contentCnSb = new StringBuilder();
+					contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
+					contentCnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" ");
+					contentCnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" ");
+					contentCnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" ");
+					contentCnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\"").append(" ");
+
+					StringBuilder contentEnSb = new StringBuilder();
+					contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
+					contentEnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" ");
+					contentEnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" ");
+					contentEnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" ");
+					contentEnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\"");
+
+
+					ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+					projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventoryEO.getId());
+					projectCertificationInventoryLogEO.setContentCn(contentCnSb.toString());
+					projectCertificationInventoryLogEO.setContentEn(contentEnSb.toString());
+					projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue());
+					projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+				}
+				this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 			}
 		}catch (Exception ex){
 			throw new JeroBootException("添加失败！");
@@ -267,10 +546,25 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				if(StringUtils.isNotEmpty(data.getDeliverableType())){
 					String deliverableTypeName = this.getTreeName(cut, categoryList, Arrays.asList(data.getDeliverableType().split(",")));
 					data.setDeliverableTypeName(deliverableTypeName);
+
+					String deliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(data.getDeliverableType().split(",")));
+					data.setDeliverableTypeNameEn(deliverableTypeNameEn);
+
+					String valueType = categoryList.stream().filter(category -> {
+						boolean flag = false;
+						if (StringUtils.equals(data.getDeliverableType(), category.getId())) {
+							flag = true;
+						}
+						return flag;
+					}).map(SysCategory::getValueType).distinct().collect(Collectors.joining(","));
+					data.setValueType(valueType);
 				}
 				if(StringUtils.isNotEmpty(data.getDutyTerritory())){
 					String dutyTerritoryName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
 					data.setDutyTerritoryName(dutyTerritoryName);
+
+					String dutyTerritoryNameEn = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),CutEnum.EN.getValue(), ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+					data.setDutyTerritoryNameEn(dutyTerritoryNameEn);
 				}
 				if(StringUtils.isNotEmpty(data.getCertificationProgress())){
 					String certificationProgress_dictText = "";
@@ -286,6 +580,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					}
 					data.setCertificationProgress_dictText(certificationProgress_dictText);
 				}
+				if(StringUtils.isNotEmpty(data.getDeliverableTemplate())){
+					List<OSSFile> deliverableTemplateFileInfos = this.ossFileService.getFileInfos(data.getDeliverableTemplate());
+					if(CollectionUtils.isNotEmpty(deliverableTemplateFileInfos)){
+						String deliverableTemplateNames = deliverableTemplateFileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
+						data.setDeliverableTemplateName(deliverableTemplateNames);
+					}
+				}
 			}
 		}
 	}
@@ -322,7 +623,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if(StringUtils.isEmpty(ids)){
 			throw new JeroBootException("至少选择一条数据进行发布！");
 		}
-		String endTime = json.getString("endTime");
+		// String endTime = json.getString("endTime");
 		String cut = json.getString("cut");
 
 		List<String> idList = Arrays.asList(ids.split(","));
@@ -345,12 +646,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			}
 
 		}
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
 		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			// 将数据的状态更新为：清单待校核，更新截止时间。等待认证工程师进行操作。
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
-			projectCertificationInventoryEO.setEndTime(DateUtils.str2Date(endTime,DateUtils.date_sdf.get()));
+			// projectCertificationInventoryEO.setEndTime(DateUtils.str2Date(endTime,DateUtils.date_sdf.get()));
+
+			String contentCn = "\"" + currentUser.getUsername() + "\"" +"发布了认证清单";
+			String contentEn = "\"" + currentUser.getUsername() + "\"" +" publishes the authentication list";
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 		}
 
 		String projectLibraryId = json.getString("projectLibraryId");
@@ -415,7 +732,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					templateVariableMap.put("projectNameCn",PRN_CN);
 					templateVariableMap.put("projectNameEn",PRN_EN);
 					templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
-					templateVariableMap.put("endTime",endTime);
+					templateVariableMap.put("endTime","");
 					templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
 					templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
 
@@ -794,9 +1111,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
 			throw new JeroBootException("至少选择一条数据流程状态为'结果待审查'的数据！");
 		}
-
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
+
+			String contentCn = "\"" + currentUser.getUsername() + "\"" +"审核退回";
+			String contentEn = "\"" + currentUser.getUsername() + "\"" +" review and returned";
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 		}
 
 		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
@@ -846,8 +1176,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			throw new JeroBootException("至少选择一条数据流程状态为'结果待审查'的数据！");
 		}
 
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
+
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
+
+			String contentCn = "\"" + currentUser.getUsername() + "\"" +"审核通过";
+			String contentEn = "\"" + currentUser.getUsername() + "\"" +" pass the audit";
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 		}
 
 		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
@@ -920,6 +1265,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList);
 		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+		this.disposeData(projectCertificationInventoryEOList,CutEnum.CN.getValue());
 
 		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
 			throw new JeroBootException("至少选择一条数据流程状态为'结果待提交 或 审查退回'的数据！");
@@ -947,9 +1293,35 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
 			processInfoDetailEOList.add(processInfoDetailEO);
 		}
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
 		// 数据更新为结果待审查
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue());
+
+			String contentCn = "";
+			String contentEn = "";
+			if (StringUtils.equals(projectCertificationInventoryEO.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) {
+				String fileName = "N/A";
+				if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliveryResult())) {
+					fileName = this.ossFileService.getFileInfos(projectCertificationInventoryEO.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
+				}
+				contentCn = "\"" + currentUser.getUsername() + "\"" +"提交了附件 " + fileName;
+				contentEn = "\"" + currentUser.getUsername() + "\"" +" submitted attachment " + fileName;
+			}else {
+				String deliveryResult = (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliveryResult()) ? projectCertificationInventoryEO.getDeliveryResult() : "N/A");
+				contentCn = "\"" + currentUser.getUsername() + "\"" +"提交了交付结果为" + deliveryResult;
+				contentEn = "\"" + currentUser.getUsername() + "\"" +" submitted a delivery result of " + deliveryResult;
+			}
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 		}
 		try {
 			this.updateBatchById(projectCertificationInventoryEOList);
@@ -1004,6 +1376,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 		ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class);
 
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
 		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue());
@@ -1013,6 +1386,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			processInfoDetailEO.setEndTime(projectCertificationInventoryEO.getEndTime());
 			processInfoDetailEO.setProjectLawsInventoryId(projectCertificationInventoryEO.getId());
 			processInfoDetailEOList.add(processInfoDetailEO);
+
+			String contentCn = "\"" + currentUser.getUsername() + "\"" +"接受了任务信息";
+			String contentEn = "\"" + currentUser.getUsername() + "\"" +" accepts the task information";
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 		}
 
 		try {
@@ -1074,8 +1460,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
 		}
 
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
+
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
+
+			String contentCn = "\"" + currentUser.getUsername() + "\"" +"退回了任务信息";
+			String contentEn = "\"" + currentUser.getUsername() + "\"" +" returned the task information";
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 		}
 
 		try {
@@ -1172,10 +1573,30 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
 			@Override
 			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
-				return p1.getEndTime().compareTo(p2.getEndTime());
+				if(p1.getEndTime() != null && p2.getEndTime() != null){
+					return p1.getEndTime().compareTo(p2.getEndTime());
+				}
+				return 1;
 			}
 		});
 
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
+
+			String contentCn = "\"" + currentUser.getUsername() + "\"" +"拒绝，流程退回至" + "\"" +studioEngineerUserInfo.get(0).getUsername()+"\"";
+			String contentEn = "\"" + currentUser.getUsername() + "\"" +" refuses, and the process returns to " + "\"" +studioEngineerUserInfo.get(0).getUsername()+"\"";
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+		}
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
+		}
+
 		Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList);
 		String standName = (String) standNameAndItemName.get("standName");
 		String itemName = (String) standNameAndItemName.get("itemName");
@@ -1196,7 +1617,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
 						@Override
 						public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
-							return p1.getEndTime().compareTo(p2.getEndTime());
+							if(p1.getEndTime() != null && p2.getEndTime() != null){
+								return p1.getEndTime().compareTo(p2.getEndTime());
+							}
+							return 1;
 						}
 					});
 					Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
@@ -1242,6 +1666,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if(StringUtils.isEmpty(ids)){
 			throw new JeroBootException("至少选择一条数据进行操作！");
 		}
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		List<String> idList = Arrays.asList(ids.split(","));
 		List<String> flowStatusList = new ArrayList<>();
@@ -1263,6 +1688,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 
 		try {
+			List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
 			// 给责任人分配待办中心的任务
 			List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
@@ -1273,6 +1699,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				processInfoDetailEO.setEndTime(projectCertificationInventoryEO.getEndTime());
 				processInfoDetailEO.setProjectLawsInventoryId(projectCertificationInventoryEO.getId());
 				processInfoDetailEOList.add(processInfoDetailEO);
+
+				String contentCn = "\"" + currentUser.getUsername() + "\"" +"发起了Pre-Homo流程";
+				String contentEn = "The \"" + currentUser.getUsername() + "\"" +" initiates the Pre-Homo process";
+				ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+				projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+				projectCertificationInventoryLogEO.setContentCn(contentCn);
+				projectCertificationInventoryLogEO.setContentEn(contentEn);
+				projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue());
+				projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+			}
+
+			if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+				this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 			}
 
 			this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.ZRRJSRW.getKey());
@@ -1327,6 +1766,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 
 		List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+		List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+		String certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(","));
+
 		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
@@ -1345,7 +1787,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
 			@Override
 			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
-				return p1.getEndTime().compareTo(p2.getEndTime());
+				if(p1.getEndTime() != null && p2.getEndTime() != null){
+					return p1.getEndTime().compareTo(p2.getEndTime());
+				}
+				return 1;
 			}
 		});
 
@@ -1374,6 +1819,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
 			this.processInfoDetailEOService.remove(detailRemoveWrap);
 
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
 			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 				// 把交付结果、截止日期清空，流程状态 设置为 清单待发布
 				LambdaUpdateWrapper<ProjectCertificationInventoryEO> updateWrap = new LambdaUpdateWrapper<>();
@@ -1382,10 +1829,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				updateWrap.eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
 				this.update(updateWrap);
+
+				String contentCn = "";
+				String contentEn = "";
+				if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
+					contentCn = "\"" + currentUser.getUsername() + "\"" +"从"+"\""+certificationEngineerUserNames + "\""+"撤回了流程";
+					contentEn = "\"" + currentUser.getUsername() + "\"" + " retracts the process from " +"\""+certificationEngineerUserNames + "\"";
+				}else if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
+					contentCn = "\"" + currentUser.getUsername() + "\"" + " 操作了流程重置功能";
+					contentEn = "\"" + currentUser.getUsername() + "\"" + " enables the process reset function";
+				}
+				ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+				projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
+				projectCertificationInventoryLogEO.setContentCn(contentCn);
+				projectCertificationInventoryLogEO.setContentEn(contentEn);
+				projectCertificationInventoryLogEO.setOperatorType(operatorType);
+				projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+			}
+			if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+				this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
 			}
 
 			try {
-				List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
 				if(CollectionUtils.isNotEmpty(certificationEngineerList)){
 					for (String certificationEngineerId : certificationEngineerIdList) {
 						String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId);
@@ -1395,7 +1860,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 							Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
 								@Override
 								public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
-									return p1.getEndTime().compareTo(p2.getEndTime());
+									if(p1.getEndTime() != null && p2.getEndTime() != null){
+										return p1.getEndTime().compareTo(p2.getEndTime());
+									}
+									return 1;
 								}
 							});
 							Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
@@ -1444,6 +1912,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 		String projectLibraryId = json.getString("projectLibraryId");
 		String transferUserId = json.getString("transferUserId");
+		SysUser transferUserInfo = this.sysUserService.getById(transferUserId);
+
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
 		if(ObjectUtils.isEmpty(projectLibraryBase)){
 			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
@@ -1470,15 +1940,33 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			throw new JeroBootException("至少选择一条数据流程状态为'任务待确认 或 结果待提交 或 审查退回'的数据进行转办操作！");
 		}
 
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
 		projectCertificationInventoryEOList.forEach(certificationInventory -> {
 			certificationInventory.setDutyPerson(transferUserId);
+
+			String contentCn = "\"" + currentUser.getUsername() + "\"" +"将流程发送至" +"\""+ transferUserInfo.getUsername() + "\"办理" ;
+			String contentEn = "\"" + currentUser.getUsername() + "\"" +" sends the process to "+"\""+ transferUserInfo.getUsername() + "\" for handling" ;
+			ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+			projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventory.getId());
+			projectCertificationInventoryLogEO.setContentCn(contentCn);
+			projectCertificationInventoryLogEO.setContentEn(contentEn);
+			projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_TRANSFER_TASK.getValue());
+			projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
 		});
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
+		}
+
 		this.updateBatchById(projectCertificationInventoryEOList);
 
 		Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
 			@Override
 			public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
-				return p1.getEndTime().compareTo(p2.getEndTime());
+				if(p1.getEndTime() != null && p2.getEndTime() != null){
+					return p1.getEndTime().compareTo(p2.getEndTime());
+				}
+				return 1;
 			}
 		});
 
@@ -1495,7 +1983,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 
 		// 获取认证清单 - 飞书跳转链接
-		Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
+		// 2023-03-15 去掉此消息
+		/*Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
 		String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
 		String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
 
@@ -1525,7 +2014,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			} catch (Exception e) {
 				log.error("飞书消息推送失败");
 			}
-		}
+		}*/
 
 		return Result.OK("转办成功！");
 	}
@@ -1583,7 +2072,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						Collections.sort(certificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
 							@Override
 							public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
-								return p1.getEndTime().compareTo(p2.getEndTime());
+								if(p1.getEndTime() != null && p2.getEndTime() != null){
+									return p1.getEndTime().compareTo(p2.getEndTime());
+								}
+								return 1;
 							}
 						});
 						Date endTime = certificationInventoryEOList.get(0).getEndTime();
@@ -1645,7 +2137,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						Collections.sort(value, new Comparator<ProjectCertificationInventoryEO>() {
 							@Override
 							public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
-								return p1.getEndTime().compareTo(p2.getEndTime());
+								if(p1.getEndTime() != null && p2.getEndTime() != null){
+									return p1.getEndTime().compareTo(p2.getEndTime());
+								}
+								return 1;
 							}
 						});
 						Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(value);
@@ -1693,8 +2188,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		StringBuilder standNameSb = new StringBuilder();
 		StringBuilder itemNameSb = new StringBuilder();
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
-			projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
-
 			if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getInspectionItem())){
 				itemNameSb.append(projectCertificationInventoryEO.getInspectionItem()).append(",");
 			}
@@ -1746,4 +2239,247 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		return result;
 	}
 
+
+	@Override
+	public Result<?> updateConfigItemBatch(JSONObject json) {
+		String ids = json.getString("ids");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("至少选择一条数据进行操作！");
+		}
+
+		String configItem = json.getString("configItem");
+		if(StringUtils.isEmpty(ids)){
+			throw new JeroBootException("请选择一个配置！");
+		}
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrap = new QueryWrapper<>();
+		queryWrap.lambda().in(ProjectCertificationInventoryEO::getId,ids.split(","));
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrap);
+		projectCertificationInventoryEOList.forEach(certificationInventoryEO -> {
+			certificationInventoryEO.setConfigItem(configItem);
+		});
+
+		this.updateBatchById(projectCertificationInventoryEOList);
+		return Result.OK("修改配置成功！");
+	}
+
+	@Override
+	public Result<?> callAdd(JSONObject json) {
+		String authDummyInventoryBaseId = json.getString("authDummyInventoryBaseId");
+		if(StringUtils.isEmpty(authDummyInventoryBaseId)){
+			throw new JeroBootException("请选择一个认证虚拟清单进行操作！");
+		}
+
+		String authDummyInventoryInfoIds = json.getString("authDummyInventoryInfoIds");
+		if(StringUtils.isEmpty(authDummyInventoryInfoIds)){
+			throw new JeroBootException("至少选择一条数据进行调取！");
+		}
+
+		String projectLibraryId = json.getString("projectLibraryId");
+
+		QueryWrapper<AuthDummyInventoryInfoEO> authDummyInfoQueryWrap = new QueryWrapper<>();
+		authDummyInfoQueryWrap.lambda().in(AuthDummyInventoryInfoEO::getId,authDummyInventoryInfoIds.split(","));
+		List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = this.authDummyInventoryInfoEOService.list(authDummyInfoQueryWrap);
+
+		if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+			for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : authDummyInventoryInfoEOList) {
+				ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO();
+				BeanUtils.copyProperties(authDummyInventoryInfoEO,projectCertificationInventoryEOTemp);
+
+				projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
+				projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId);
+				projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				projectCertificationInventoryEOTemp.setCreateTime(new Date());
+				projectCertificationInventoryEOTemp.setCreateBy(currentUser.getUsername());
+				projectCertificationInventoryEOTemp.setSysOrgCode(currentUser.getOrgCode());
+				projectCertificationInventoryEOTemp.setUpdateTime(null);
+				projectCertificationInventoryEOTemp.setUpdateBy(null);
+				projectCertificationInventoryEOList.add(projectCertificationInventoryEOTemp);
+			}
+			this.saveBatch(projectCertificationInventoryEOList);
+
+			List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
+			for (ProjectCertificationInventoryEO certificationInventoryEO : projectCertificationInventoryEOList) {
+				StringBuilder contentCnSb = new StringBuilder();
+				contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
+				contentCnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" ");
+				contentCnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" ");
+				contentCnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" ");
+				contentCnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\"").append(" ");
+
+				StringBuilder contentEnSb = new StringBuilder();
+				contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
+				contentEnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" ");
+				contentEnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" ");
+				contentEnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" ");
+				contentEnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\"");
+
+				ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
+				projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventoryEO.getId());
+				projectCertificationInventoryLogEO.setContentCn(contentCnSb.toString());
+				projectCertificationInventoryLogEO.setContentEn(contentEnSb.toString());
+				projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL.getValue());
+				projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
+			}
+			this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
+		}
+
+		return Result.OK("调取成功！");
+	}
+	/**
+	 * 模板下载
+	 * @param projectCertificationInventoryEO
+	 * @param response
+	 * @param request
+	 */
+	@Override
+	public void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request) {
+		OutputStream os = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+		String fileOriName = "认证清单导入模板.xls";
+		String filePath = uploadpath + File.separator + fileOriName;
+
+		try {
+			String title = "";
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				title = "类别,检验项目,配置项,WVTA ID," +
+						"*标注编号,*责任领域,工程接口人,责任人," +
+						"交付物类型,交付结果,截止日期,流程状态," +
+						"报告编号,产品型号,生产企业名称,认证进度";
+			}else {
+				title = "Category,Inspection Items,Configuration Item,WVTA ID," +
+						"*Standard No,*Responsible Field,Eng. Interface,Assignee," +
+						"Deliverable Type,Deliverables Result,Due Date,Process Status," +
+						"Report No,Product Model,Name Of Manufacturer,Homologation Progress";
+			}
+
+			List<String> list = Arrays.asList(title.split(","));
+			int index = 0;
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				index = list.indexOf("认证进度") + 1;
+			}else{
+				index = list.indexOf("Homologation Progress") + 1;
+			}
+
+			//创建临时文件夹
+			File nowFile = new File(filePath);
+			if (nowFile.exists()) {
+				nowFile.delete();
+			}
+			nowFile.mkdirs();
+			HSSFSheet sheet = workbook.createSheet("认证清单导入模板");
+			sheet.setDefaultColumnWidth(16);//列宽
+//			HSSFCellStyle cellStyle = workbook.createCellStyle();
+//			cellStyle.setWrapText(true);//自动换行
+//			cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+//			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+
+			HSSFCellStyle cellStyleTemp = workbook.createCellStyle();
+			cellStyleTemp.setWrapText(true);//自动换行
+
+			CellRangeAddress region =
+					new CellRangeAddress(1, 1, 0, 15); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+			sheet.addMergedRegion(region);
+			String explain= "";
+			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+				explain = "填写说明\n" +
+						"1.导入数据从第三行开始\n" +
+						"2.所有带*号的字段必须填写\n"+
+						"3.责任人,交付物类型,工程接口人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"4.编号,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
+						"5.类别,WVTA ID,检验项目,填写文本内容\n" +
+						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
+			}else{
+				explain = "Filling explanation\n" +
+						"1.Import data starts at the fourth line\n" +
+						"2.All fields marked with * must be filled in\n"+
+						"3.Assignee,Deliverable Type,Deliverable Type,Eng. Interface,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"4.Standard No,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
+						"5.Category,WVTA ID,Inspection Items,Fill in the text\n" +
+						"6.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
+			}
+			for(int i = 0; i < 2; i++){
+				//表头
+				Row row = sheet.createRow(i);//开始创建标题行
+				String[] headerArr = title.split(",");
+				if(i == 0 ){
+					for (int m = 0; m < headerArr.length; m++) {
+						if(m < index){
+							row.createCell(m).setCellValue(headerArr[m]);
+						}else {
+							break;
+						}
+					}
+				}else {
+					short height = (short) (7 * 252);
+					row.setHeight((short) height);
+					Cell cell = row.createCell(0);
+					cell.setCellStyle(cellStyleTemp);
+					cell.setCellValue(new HSSFRichTextString(explain));
+				}
+			}
+			response.setHeader("Content-Disposition",
+					"attachment; filename=\"" + fileOriName + ".xls");
+			response.setContentType("application/force-download");
+			response.flushBuffer();
+			os = response.getOutputStream();
+			workbook.write(os);
+		}catch (Exception e){
+			e.printStackTrace();
+			throw new JeroBootException("下载文件失败，请重试");
+		}finally {
+			IOUtils.closeQuietly(os);
+		}
+	}
+
+
+	@Override
+	public Result<?> citeDeliverable(JSONObject json) {
+		String projectCertificationInventoryIds = json.getString("projectCertificationInventoryIds");
+		if(StringUtils.isEmpty(projectCertificationInventoryIds)){
+			throw new JeroBootException("请选择需要引用的认证清单数据！");
+		}
+		String projectLibraryId = json.getString("projectLibraryId");
+
+		String citeProjectLibraryId = json.getString("citeProjectLibraryId");
+		if(StringUtils.isEmpty(citeProjectLibraryId)){
+			throw new JeroBootException("请选择引用的项目！");
+		}
+
+		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,projectCertificationInventoryIds.split(","));
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrapper);
+
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+			QueryWrapper<ProjectCertificationInventoryEO> citeQueryWrapper = new QueryWrapper<>();
+			citeQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,citeProjectLibraryId);
+			citeQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
+			List<ProjectCertificationInventoryEO> citeProjectCertificationInventoryEOList = this.baseMapper.selectList(citeQueryWrapper);
+
+			if(CollectionUtils.isNotEmpty(citeProjectCertificationInventoryEOList)){
+				for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+					for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) {
+						// 匹配数据  类别、检验项目、配置项、标准编号、交付物类型完全一致，并且数据的状态为 审查完成
+						boolean flag = (
+								StringUtils.equals(projectCertificationInventoryEO.getCategory(),citeProjectCertificationInventoryEO.getCategory())
+								&& StringUtils.equals(projectCertificationInventoryEO.getInspectionItem(),citeProjectCertificationInventoryEO.getInspectionItem())
+								&& StringUtils.equals(projectCertificationInventoryEO.getConfigItem(),citeProjectCertificationInventoryEO.getConfigItem())
+								&& StringUtils.equals(projectCertificationInventoryEO.getSerialNumber(),citeProjectCertificationInventoryEO.getSerialNumber())
+								&& StringUtils.equals(projectCertificationInventoryEO.getDeliverableType(),citeProjectCertificationInventoryEO.getDeliverableType())
+						);
+						if(flag){
+							projectCertificationInventoryEO.setDeliveryResult(citeProjectCertificationInventoryEO.getDeliveryResult());
+							break;
+						}
+					}
+				}
+
+				this.updateBatchById(projectCertificationInventoryEOList);
+			}
+		}
+
+		return Result.OK("引用交付物成功！");
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java
new file mode 100644
index 000000000..4894c21b2
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java
@@ -0,0 +1,125 @@
+package com.jero.modules.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
+import com.jero.modules.project.mapper.ProjectCertificationInventoryLogEOMapper;
+import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 项目库-认证清单-修改历史表
+ * @Author: jero-boot
+ * @Date:   2023-03-13
+ * @Version: V1.0
+ */
+@Service
+public class ProjectCertificationInventoryLogEOServiceImpl extends ServiceImpl<ProjectCertificationInventoryLogEOMapper, ProjectCertificationInventoryLogEO> implements IProjectCertificationInventoryLogEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectCertificationInventoryLogEO
+	 * @return
+	 */
+	@Override
+    public void add(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) {
+        Date now = new Date();
+        projectCertificationInventoryLogEO.setCreateTime(now);
+        projectCertificationInventoryLogEO.setUpdateTime(now);
+        save(projectCertificationInventoryLogEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param projectCertificationInventoryLogEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) {
+    	Date now = new Date();
+        projectCertificationInventoryLogEO.setUpdateTime(now);
+    	saveOrUpdate(projectCertificationInventoryLogEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ProjectCertificationInventoryLogEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProjectCertificationInventoryLogEO> queryList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO, HttpServletRequest req) {
+		QueryWrapper<ProjectCertificationInventoryLogEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryLogEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
+		List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = this.list(queryWrapper);
+		this.disposeData(projectCertificationInventoryLogEOList,projectCertificationInventoryLogEO.getCut());
+		return projectCertificationInventoryLogEOList;
+    }
+
+	@Override
+	public void insertBatch(List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList) {
+		this.saveBatch(projectCertificationInventoryLogEOList);
+	}
+
+	@Override
+	public void disposeData(List<ProjectCertificationInventoryLogEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			for (ProjectCertificationInventoryLogEO data : datas) {
+				if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+					data.setContent(data.getContentCn());
+				}else {
+					data.setContent(data.getContentEn());
+				}
+			}
+		}
+	}
+
+	@Override
+	public void deleteByProjectCertificationInventoryIdList(List<String> projectCertificationInventoryIdList) {
+		QueryWrapper<ProjectCertificationInventoryLogEO> removeWrap = new QueryWrapper<>();
+		removeWrap.lambda().in(ProjectCertificationInventoryLogEO::getProjectCertificationInventoryId,projectCertificationInventoryIdList);
+		this.remove(removeWrap);
+	}
+}
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 36f8350ec..bb8ec1478 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -895,6 +895,7 @@ module.exports = {
   pleaseConformityVerification: 'Please complete the data of Conformity verification',
   virtualListDetails: 'Virtual List Details',
   virtualAuthenticationListDetails: 'Virtual Authentication List Details',
+  VirtualAuthenticationList: 'Virtual Authentication List',
   maintainVirtualList: 'Maintain Virtual List',
   certificationListMaintenance: 'Certification List Maintenance',
   reasonsForRejection: 'Reasons For Rejection',
@@ -1431,6 +1432,10 @@ module.exports = {
   onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected',
   youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved',
   batchmodify:'Whether to batch modify',
+  onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected',
+  type:'type',
+  select:'select',
+  onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted',
   registrationnumber:'Product registration number',
   noticebatch:'Notice batch',
   producttrademark:'Product Trademark',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 99661c59b..78430946f 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -907,6 +907,7 @@ module.exports = {
   pleaseConformityVerification: '请补全验证符合性确认的数据',
   virtualListDetails: '虚拟清单详情',
   virtualAuthenticationListDetails: '虚拟认证清单详情',
+  VirtualAuthenticationList: '虚拟认证清单',
   maintainVirtualList: '维护虚拟清单',
   certificationListMaintenance: '认证清单维护',
   reasonsForRejection: '驳回原因',
@@ -1533,6 +1534,10 @@ module.exports = {
   onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据',
   youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据',
   batchmodify:'是否批量修改',
+  onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据',
+  type:'类型',
+  select:'选择',
+  onlyDataWithProcessStatusDeleted:'只能删除流程状态为清单待发布和审查通过的数据',
   registrationnumber:'产品登记编号',
   noticebatch:'《公告》批次',
   producttrademark:'产品商标',
diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 02ab1fba8..9ee43b9b3 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -542,6 +542,7 @@
             // this.gData[0].isLeaf = false
             this.defaultExpandedKeys = [this.departId]
             if (num == 1) {
+              console.log(this.personneQuery)
               if (this.userName && this.userName.length == 0) {
                 if (this.personneQuery[this.query.db_field_name + 'Name']) {
                   this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
index 383f989e0..1dbc4c4ac 100644
--- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
@@ -55,6 +55,15 @@
           <a-form-model-item :label="$t('enName')" prop="enName">
             <a-input v-model.trim="form.enName" :placeholder="$t('PleaseEnterYourEnglishName')"/>
           </a-form-model-item>
+          <a-form-model-item :label="$t('type')" prop="valueType" v-if="record.id == '1635543933669818369'">
+            <a-select v-model="form.valueType"
+                      :placeholder="$t('pleaseSelect')"
+                      allowClear>
+              <a-select-option :value="item.id" v-for="(item, index) in valueTypeList" :key="item.id">
+                {{item.name}}
+              </a-select-option>
+            </a-select>
+          </a-form-model-item>
           <a-form-model-item :label="$t('ParentName')" prop="pid" v-if="parentVisible">
             <a-select v-model="form.pid" @change="handleChange" :placeholder="$t('pleaseSelect')" allowClear>
               <a-select-option :value="item.id" v-for="(item, index) in parentDataPid" :key="item.id">
@@ -105,6 +114,24 @@
           pageSize: 10
         },//查询条件
         form: {},
+        valueTypeList:[
+          {
+            id:'file',
+            name:this.$t('enclosure')
+          },
+          {
+            id:'text',
+            name:this.$t('text')
+          },
+          {
+            id:'select',
+            name:this.$t('select')
+          },
+          {
+            id:'N/A',
+            name:'NA'
+          },
+        ],
         newVisible: false,
         rules: {
           name: [
@@ -112,6 +139,9 @@
             { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
             { validator: this.test }
           ],
+          valueType:[
+            { required: true, message: this.$t('type') + this.$t('cannotEmpty'), trigger: 'change' },
+          ],
           itemText: [
             { required: true, message: this.$t('enterName'), trigger: 'blur' },
             { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
@@ -147,7 +177,8 @@
         editPId: '',
         tabletreeDataSource: [],
         flag: false,  //提交表单标识
-        parentDataPid: []
+        parentDataPid: [],
+        valueTypeVisible:true
       }
     },
     watch: {
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
index 58ca41b03..74bcfe483 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
@@ -73,8 +73,9 @@
 
       <template slot="action" slot-scope="text, record">
         <a class="action-dict" @click="handleDicPop(record)">{{$t('DictionaryConfiguration')}}</a>
-        <a class="action-edit" @click="actionEdit(record)" v-has="'dict:edit'">{{$t('edit')}}</a>
-        <a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dict:logicDelete'">{{$t('delete')}}</a>
+        <a class="action-edit" v-if="record.id != '1635543933669818369'" @click="actionEdit(record)" v-has="'dict:edit'">{{$t('edit')}}</a>
+        <a class="action-delete" v-if="record.id != '1635543933669818369'" href="javascript:;" @click="onDelete(record)"
+           v-has="'dict:logicDelete'">{{$t('delete')}}</a>
       </template>
       <template slot="describe" slot-scope="text, record">
         <span class="text" :title="text">
@@ -124,7 +125,7 @@
       // tabTable,
       DicList
     },
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    mixins: [ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         title: this.$t('add'),
@@ -244,13 +245,13 @@
             this.loading = false
             this.total = res.result.total
             this.tableData = [...res.result.records]
-          }else{
+          } else {
             this.loading = false
           }
         })
-      //  .finally(() => {
-      //  this.loading = false
-      //})
+        //  .finally(() => {
+        //  this.loading = false
+        //})
       },
       //查询
       searchQuery() {
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 03441eca1..a61672efa 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -20,12 +20,16 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="serialNumber">
                   <a-select :placeholder="$t('PleaseSelect')+$t('regulationNo')"
+                            optionFilterProp="label"
                             @change="serialNumberChange"
+                            showSearch
                             v-model="formInline.bussDocumentLibraryId">
                     <a-select-option v-for="(item, key) in projectNameList"
+                                     :label="item.serialNumber"
                                      :key="key"
                                      :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.serialNumber ">
+                     <span style="display: inline-block;width: 100%"
+                           :title=" item.serialNumber ">
                            {{ item.serialNumber}}
                      </span>
                     </a-select-option>
@@ -93,7 +97,52 @@
                   </div>
                 </a-col>
               </a-row>
-
+              <a-row :gutter="24">
+                <a-col :span="12">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                    </div>
+                    <a-form-model-item
+                      class="itemModel"
+                      :prop="'dataList.'+index+'.configItem'"
+                      :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},
+                             {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                            }]"
+                    >
+                      <a-input class="box-input"
+                               v-model="item.configItem"
+                               :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+                      <!--                      <j-dict-select-tag class="box-input" v-model="item.configItem"-->
+                      <!--                                         @input="handleInput('dataList.'+index+'.configItem')"-->
+                      <!--                                         :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
+                      <!--                                         :type="'select'"-->
+                      <!--                                         :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+                <a-col :span="12">
+                  <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="'dataList.'+index+'.dutyTerritory'"
+                                       :rules="[{ required: true, message: $t('areaOfResponsibility') + $t('cannotEmpty'), trigger: 'change'},]"
+                    >
+                      <j-dict-select-tag class="box-input" v-model="item.dutyTerritory"
+                                         @input="handleInput('dataList.'+index+'.dutyTerritory')"
+                                         @changeQuery="dutyHandleChange(index)"
+                                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                         :type="'select'"
+                                         :triggerChange="false" :dictCode="'duty_territory'"/>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
               <a-row :gutter="24">
                 <a-col :span="12">
                   <div class="box-title-text">
@@ -145,65 +194,76 @@
                   <div class="box-title-text">
                     <div class="title-text">
                       <span class="Required">*</span>
-                      <span class="title-text-text"
-                            :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                      <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
                     </div>
                     <a-form-model-item class="itemModel"
-                                       :prop="'dataList.'+index+'.dutyTerritory'"
-                                       :rules="[{ required: true, message: $t('areaOfResponsibility') + $t('cannotEmpty'), trigger: 'change'},]"
+                                       :prop="'dataList.'+index+'.sdt'"
+                                       :rules="[{ required: true, message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <j-dict-select-tag class="box-input" v-model="item.dutyTerritory"
-                                         @input="handleInput('dataList.'+index+'.dutyTerritory')"
-                                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                         :type="'select'"
-                                         :triggerChange="false" :dictCode="'duty_territory'"/>
+                      <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                                optionFilterProp="label"
+                                showSearch
+                                @change="handleInput('dataList.'+index+'.sdt')"
+                                v-model="item.sdt">
+                        <a-select-option v-for="(val, key) in item.engineeringInterfacePersonList"
+                                         :label="val.name"
+                                         :key="key"
+                                         :value="val.value">
+                     <span style="display: inline-block;width: 100%"
+                           :title=" val.name ">
+                           {{ val.name}}
+                     </span>
+                        </a-select-option>
+                      </a-select>
                     </a-form-model-item>
                   </div>
                 </a-col>
+
                 <a-col :span="12">
                   <div class="box-title-text">
                     <div class="title-text">
                       <span class="Required">*</span>
-                      <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+                      <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
                     </div>
-                    <a-form-model-item class="itemModel-multi"
-                                       :prop="'dataList.'+index+'.sdtName'"
-                                       :rules="[{ required: true, message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'},]"
+                    <a-form-model-item class="itemModel"
+                                       :prop="'dataList.'+index+'.endTime'"
+                                       :rules="[{ required: true, message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <PersonnelSelection
-                        :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson'),subscript:index}"
-                        :personneQuery="item"
-                        :isSingleChoice="true"
-                        @change="PersonnelSelectionChange"
-                        :disabled="disabled"
-                        v-model="item.sdtName"/>
+                      <a-date-picker class="box-input"
+                                     :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                     @change="dateChange({db_field_name:'endTime'},index)"
+                                     format="YYYY-MM-DD"
+                                     :disabledDate="disabledDate"
+                                     :getCalendarContainer="(trigger) => trigger.parentNode"
+                                     v-model="item.endTime"
+                                     style="width: 100%"/>
                     </a-form-model-item>
                   </div>
                 </a-col>
               </a-row>
 
-              <a-row :gutter="24">
-                <a-col :span="12">
-                  <div class="box-title-text">
-                    <div class="title-text">
-                      <span class="Required">*</span>
-                      <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
-                    </div>
-                    <a-form-model-item class="itemModel-multi"
-                                       :prop="'dataList.'+index+'.dutyPersonName'"
-                                       :rules="[{ required: true, message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'},]"
-                    >
-                      <PersonnelSelection
-                        :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable'),subscript:index}"
-                        :personneQuery="item"
-                        :isSingleChoice="true"
-                        @change="PersonnelSelectionChange"
-                        :disabled="disabled"
-                        v-model="item.dutyPersonName"/>
-                    </a-form-model-item>
-                  </div>
-                </a-col>
-              </a-row>
+              <!--              <a-row :gutter="24">-->
+              <!--                <a-col :span="12">-->
+              <!--                  <div class="box-title-text">-->
+              <!--                    <div class="title-text">-->
+              <!--                      <span class="Required">*</span>-->
+              <!--                      <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>-->
+              <!--                    </div>-->
+              <!--                    <a-form-model-item class="itemModel-multi"-->
+              <!--                                       :prop="'dataList.'+index+'.dutyPersonName'"-->
+              <!--                                       :rules="[{ required: true, message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'},]"-->
+              <!--                    >-->
+              <!--                      <PersonnelSelection-->
+              <!--                        :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable'),subscript:index}"-->
+              <!--                        :personneQuery="item"-->
+              <!--                        :isSingleChoice="true"-->
+              <!--                        @change="PersonnelSelectionChange"-->
+              <!--                        :disabled="disabled"-->
+              <!--                        v-model="item.dutyPersonName"/>-->
+              <!--                    </a-form-model-item>-->
+              <!--                  </div>-->
+              <!--                </a-col>-->
+              <!--              </a-row>-->
             </div>
           </div>
 
@@ -240,7 +300,48 @@
                 </div>
               </a-col>
             </a-row>
-
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                  </div>
+                  <a-form-model-item
+                    class="itemModel"
+                    :prop="'configItem'"
+                  >
+                    <a-input class="box-input"
+                             v-model="formInline.configItem"
+                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+                    <!--                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
+                    <!--                                       @input="handleInput('configItem')"-->
+                    <!--                                       :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
+                    <!--                                       :type="'select'"-->
+                    <!--                                       :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <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="'dutyTerritory'"
+                  >
+                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                       @input="handleInput('dutyTerritory')"
+                                       @changeQuery="handleChange"
+                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                       :type="'select'"
+                                       :triggerChange="false" :dictCode="'duty_territory'"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
             <a-row :gutter="24">
               <a-col :span="12">
                 <div class="box-title-text">
@@ -260,7 +361,6 @@
                       class="box-input"
                       style="width: 100%"
                       :tree-data="DeliverableTreeList"
-                      tree-checkable
                       :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                     />
                   </a-form-model-item>
@@ -290,17 +390,25 @@
                 <div class="box-title-text">
                   <div class="title-text">
                     <span class="Required">*</span>
-                    <span class="title-text-text"
-                          :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                    <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
                   </div>
                   <a-form-model-item class="itemModel"
-                                     :prop="'dutyTerritory'"
+                                     :prop="'sdt'"
                   >
-                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                       @input="handleInput('dutyTerritory')"
-                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                       :type="'select'"
-                                       :triggerChange="false" :dictCode="'duty_territory'"/>
+                    <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                              optionFilterProp="label"
+                              showSearch
+                              v-model="formInline.sdt">
+                      <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
+                                       :label="item.name"
+                                       :key="key"
+                                       :value="item.value">
+                     <span style="display: inline-block;width: 100%"
+                           :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                      </a-select-option>
+                    </a-select>
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -308,18 +416,19 @@
                 <div class="box-title-text">
                   <div class="title-text">
                     <span class="Required">*</span>
-                    <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
+                    <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel-multi"
-                                     :prop="'sdtName'"
+                  <a-form-model-item class="itemModel"
+                                     :prop="'endTime'"
                   >
-                    <PersonnelSelection
-                      :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
-                      :personneQuery="formInline"
-                      :isSingleChoice="true"
-                      @change="PersonnelSelectionChange"
-                      :disabled="disabled"
-                      v-model="formInline.sdtName"/>
+                    <a-date-picker class="box-input"
+                                   :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                   @change="dateChange({db_field_name:'endTime'})"
+                                   format="YYYY-MM-DD"
+                                   :disabledDate="disabledDate"
+                                   :getCalendarContainer="(trigger) => trigger.parentNode"
+                                   v-model="formInline.endTime"
+                                   style="width: 100%"/>
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -339,6 +448,7 @@
                       :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
                       :personneQuery="formInline"
                       :isSingleChoice="true"
+                      v-if="visible"
                       @change="PersonnelSelectionChange"
                       :disabled="disabled"
                       v-model="formInline.dutyPersonName"/>
@@ -377,6 +487,7 @@
   import uploadFile from '@/components/uploadFile/file'
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import moment from 'moment'
 
   export default {
     name: 'addModel',
@@ -437,7 +548,7 @@
               trigger: 'change'
             }
           ],
-          sdtName: [
+          sdt: [
             {
               required: true,
               message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'),
@@ -450,6 +561,21 @@
               message: this.$t('personLiable') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
+          ],
+          endTime: [
+            {
+              required: true,
+              message: this.$t('closingDate') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          configItem: [
+            { required: true, message: this.$t('configurationItem') + this.$t('cannotEmpty'), trigger: 'blur' },
+            {
+              max: 300,
+              message: this.$t('configurationItem') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
           ]
         },
         disabled: false,
@@ -462,7 +588,8 @@
           add: '/project/projectCertificationInventoryEO/batchAdd',
           edit: '/project/projectCertificationInventoryEO/edit',
           list: '/project/projectLawsInventoryEO/list'
-        }
+        },
+        engineeringInterfacePersonList: []
       }
     },
     mounted() {
@@ -471,8 +598,20 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
+      dateChange(item, index) {
+        if (index) {
+          this.formInline.dataList[index][item.db_field_name] = this.formInline.dataList[index][item.db_field_name] ? moment(this.formInline.dataList[index][item.db_field_name]).format('YYYY-MM-DD') : ''
+
+        } else {
+          this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+
+        }
+      },
       getDeliverableTree() {
-        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
           if (res.success) {
             this.DeliverableTreeList = res.result
           } else {
@@ -493,15 +632,19 @@
         })
       },
       editModel(value) {
-        this.formInline = {}
+        // this.formInline = {}
         this.visible = true
-        this.formInline = value
-        if (this.formInline.deliverableType) {
-          this.formInline.deliverableType = this.formInline.deliverableType.split(',')
+        this.formInline = JSON.parse(JSON.stringify(value))
+        // if (this.formInline.deliverableType) {
+        //   this.formInline.deliverableType = this.formInline.deliverableType.split(',')
+        // }
+        if (value.dutyTerritory) {
+          this.queryPersonByProject(value.dutyTerritory)
         }
         this.getRegulationNo()
         this.title = this.$t('edit')
         this.$nextTick(() => {
+          this.formInline = {...this.formInline}
           this.$refs.ruleForm.clearValidate()
         })
       },
@@ -527,6 +670,7 @@
               url = this.url.add
               Action = postAction
               query.dataList.forEach(val => {
+                delete val.engineeringInterfacePersonList
                 Object.keys(val).forEach(res => {
                   if (val[res] && val[res] instanceof Array) {
                     val[res] = val[res].join(',')
@@ -618,8 +762,37 @@
         let content = this.projectNameList.filter(res => {
           return res.id === value
         })
-        this.formInline.bussDocumentLibraryId = content[0].id
-        this.formInline.serialNumber = content[0].serialNumber
+        if (content && content.length > 0) {
+          this.formInline.bussDocumentLibraryId = content[0].id
+          this.formInline.serialNumber = content[0].serialNumber
+        }
+      },
+      handleChange(value) {
+        this.formInline.sdt = undefined
+        this.queryPersonByProject(this.formInline.dutyTerritory)
+      },
+      dutyHandleChange(index) {
+        this.formInline.dataList[index].sdt = undefined
+        this.formInline = {... this.formInline}
+        this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory, index)
+      },
+      queryPersonByProject(row, index) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row
+        }
+        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            if (this.formInline.id) {
+              this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
+            } else {
+              this.$nextTick(()=>{
+                this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || []
+                this.formInline = {...this.formInline}
+              })
+            }
+          }
+        })
       }
     }
   }
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue
index 6d7f9cde3..8a302361f 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue
@@ -17,19 +17,15 @@
               <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <a-select :placeholder="$t('PleaseSelect')+$t('configurationItem')"
-                        class="box-input"
-                        allowClear
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        v-model="formInline.configItem">
-                <a-select-option v-for="(item, key) in configurationItemList"
-                                 :key="item.key"
-                                 :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.label ">
-                           {{ item.label }}
-                     </span>
-                </a-select-option>
-              </a-select>
+              <a-input class="box-input"
+                       v-model="formInline.configItem"
+                       :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
+              <!--                                 @input="handleInput('configItem')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('configurationItem')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'"/>-->
             </a-form-model-item>
           </div>
         </a-col>
@@ -41,6 +37,7 @@
             <a-form-model-item class="itemModel">
               <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
                                  @input="handleInput('dutyTerritory')"
+                                 @changeQuery="handleChange"
                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -58,13 +55,15 @@
               <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
                         class="box-input"
                         allowClear
+                        optionFilterProp="label"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         v-model="formInline.sdt">
                 <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
                                  :key="item.key"
+                                 :label="item.name"
                                  :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.label ">
-                           {{ item.label }}
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
                      </span>
                 </a-select-option>
               </a-select>
@@ -74,15 +73,20 @@
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
+              <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
             </div>
             <a-form-model-item class="itemModel-multi">
-              <PersonnelSelection :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
-                                  :isSingleChoice="true"
-                                  :personneQuery="formInline"
-                                  v-if="visible"
-                                  @change="PersonnelSelectionChange"
-                                  v-model="formInline.dutyPersonName"/>
+              <!--              tree-checkable-->
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="formInline.deliverableType"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="DeliverableTreeList"
+                :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+              />
             </a-form-model-item>
           </div>
         </a-col>
@@ -91,22 +95,49 @@
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+              <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+            </div>
+            <a-form-model-item class="itemModel"
+                               :prop="'endTime'"
+            >
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                             @change="dateChange({db_field_name:'endTime'})"
+                             format="YYYY-MM-DD"
+                             :disabledDate="disabledDate"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.endTime"
+                             style="width: 100%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="12" v-if="roleSwitchingCode == 2">
+          <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">
-              <a-select :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                        class="box-input"
-                        allowClear
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        v-model="formInline.deliverableType">
-                <a-select-option v-for="(item, key) in typeOfDeliverablesList"
-                                 :key="item.key"
-                                 :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.label ">
-                           {{ item.label }}
-                     </span>
-                </a-select-option>
-              </a-select>
+              <j-dict-select-tag class="box-input" v-model="formInline.certificationProgress"
+                                 @input="handleInput('certificationProgress')"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="name == $t('BatchSetting') && roleSwitchingCode == 2">
+        <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="'certificationProgressRemark'">
+              <a-textarea
+                :placeholder="$t('PleaseEnter')+$t('remarks')"
+                v-model="formInline.certificationProgressRemark" :rows="4"/>
             </a-form-model-item>
           </div>
         </a-col>
@@ -122,7 +153,7 @@
 
   export default {
     name: 'batSetting',
-    props: ['url'],
+    props: ['url', 'roleSwitchingCode'],
     components: {
       PersonnelSelection
     },
@@ -136,14 +167,29 @@
         configurationItemList: [],
         engineeringInterfacePersonList: [],
         typeOfDeliverablesList: [],
-        name: ''
+        name: '',
+        DeliverableTreeList: []
       }
     },
     mounted() {
     },
     methods: {
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
+
+      getDeliverableTree() {
+        getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
       edit(data, name) {
         this.visible = true
+        this.getDeliverableTree()
         this.$nextTick(() => {
           this.ids = data || []
           this.formInline = {}
@@ -163,12 +209,24 @@
       },
       handleOkOne() {
         let ids = JSON.parse(JSON.stringify(this.ids))
+        let formInline = JSON.parse(JSON.stringify(this.formInline))
+        Object.keys(formInline).forEach(res => {
+          if (formInline[res] && formInline[res] instanceof Array) {
+            formInline[res] = formInline[res].join(',')
+          }
+        })
         let query = {
           ids: ids.join(','),
-          ...this.formInline
+          ...formInline
         }
+        let url = ''
         this.confirmLoading = true
-        postAction(this.url.setBatch, query).then((res) => {
+        if (this.name == this.$t('changeSetting')) {
+          url = '/project/projectCertificationInventoryEO/updateConfigItemBatch'
+        } else {
+          url = this.url.setBatch
+        }
+        postAction(url, query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
             this.visible = false
@@ -217,6 +275,21 @@
       },
       dateChange(item) {
         this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
+      },
+      handleChange(value) {
+        this.formInline.sdt = undefined
+        this.queryPersonByProject(this.formInline.dutyTerritory)
+      },
+      queryPersonByProject(row) {
+        let query = {
+          projectId: this.$route.query.id,
+          dutyTerritory: row
+        }
+        getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
+          }
+        })
       }
     }
   }
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue
index 316740189..32eb8dcaf 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue
@@ -40,54 +40,57 @@
 
 <script>
   import { getAction, postAction } from '@/api/manage'
+
   export default {
     name: 'modifyHistoryList',
     data() {
       return {
-        visible:false,
-        dataList:[],
-        confirmLoading:false,
-        loading:false,
+        visible: false,
+        dataList: [],
+        confirmLoading: false,
+        loading: false,
         pageNo: 1,
         pageSize: 10,
         total: 0,
-        url:{
-          list:'',
+        projectCertificationInventoryId: '',
+        url: {
+          list: '/project/projectCertificationInventoryLogEO/page'
         },
-        columns:[
+        columns: [
           {
             title: this.$t('Operator'),
-            dataIndex: 'Operator',
+            dataIndex: 'createBy',
             align: 'left',
             ellipsis: true,
-            width: 228
+            width: 108
           },
           {
             title: this.$t('operationTime'),
-            dataIndex: 'operationTime',
+            dataIndex: 'createTime',
             align: 'left',
             ellipsis: true,
-            width: 228
+            width: 148
           },
           {
             title: this.$t('OperationContent'),
-            dataIndex: 'OperationContent',
+            dataIndex: 'content',
             align: 'left',
             ellipsis: true,
-            width: 228
-          },
-        ],
+            width: 528
+          }
+        ]
       }
     },
     mounted() {
     },
-    methods:{
-      handleCancel(){
-         this.visible = false
+    methods: {
+      handleCancel() {
+        this.visible = false
       },
-      getList() {
+      getList(id) {
         this.pageNo = 1
         this.visible = true
+        this.projectCertificationInventoryId = id
         this.replacePage()
       },
       onChange(page, pageSize) {
@@ -99,13 +102,14 @@
         this.pageSize = pageSize
         this.replacePage()
       },
-      replacePage(){
+      replacePage() {
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          projectCertificationInventoryId: this.projectCertificationInventoryId
         }
         this.loading = true
-        postAction(this.url.list, query).then((res) => {
+        getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total
@@ -116,7 +120,7 @@
             this.loading = false
           }
         })
-      },
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
index 0cbf8c842..642b23e65 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
@@ -56,7 +56,7 @@
 
     <div class="drawer-bootom-button">
       <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
     </div>
   </a-drawer>
 </template>
@@ -95,17 +95,19 @@
         loading: false,
         pageNo: 1,
         pageSize: 10,
-        total: 0
+        total: 0,
+        ids:'',
       }
     },
     mounted() {
 
     },
     methods: {
-      transferModel() {
+      transferModel(ids) {
         this.visible = true
         this.queryParam = {}
         this.selectedRowKeys = []
+        this.ids = ids.join(',')
         this.replacePage()
       },
       searchQuery() {
@@ -151,49 +153,31 @@
       },
       handleCancel() {
         this.visible = false
-        this.$emit('visible')
       },
-      handleSubmit(flag) {
+      handleSubmit() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          this.confirmLoading = false
-          this.$emit('transferListForm',selectedRowKeys.join(','))
-          this.selectedRowKeys = []
-          // postAction('project/projectLawsInventoryEO/add', {
-          //   dummyInventoryBaseId: selectedRowKeys.join(','),
-          //   projectLibraryId: this.$route.query.id,
-          //   flag: flag
-          // }).then((res) => {
-          //   if (res.success) {
-          //     this.confirmLoading = false
-          //     // this.$message.success(this.$t('OperationSuccessful'))
-          //     // this.visible = false
-          //     this.selectedRowKeys = []
-          //     this.$emit('transferListForm',selectedRowKeys.join(','))
-          //   } else {
-          //     // if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
-          //     //   this.confirmLoading = false
-          //     //   this.getAdd()
-          //     //   return
-          //     // }
-          //     this.$message.warning(this.$t('operationFailed'))
-          //     this.confirmLoading = false
-          //   }
-          // })
+          postAction('/project/projectCertificationInventoryEO/citeDeliverable', {
+            projectCertificationInventoryIds: this.ids,
+            projectLibraryId: this.$route.query.id,
+            citeProjectLibraryId: selectedRowKeys.join(',')
+          }).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.selectedRowKeys = []
+              this.$emit('referenceDeliverablesListForm')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
-      getAdd() {
-        let _this = this
-        this.$confirm({
-          content: _this.$t('TheDoesNotContainData'),
-          onOk() {
-            _this.handleSubmit('1')
-          }
-        })
-      }
     }
   }
 </script>
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
index 3198cb9d6..5e6100722 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
@@ -1,76 +1,84 @@
 <template>
-  <a-drawer
-    :title="$t('Transfer')"
-    :maskClosable="false"
-    :width="1000"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <div style="margin-bottom: 60px">
-      <div class="table-page-search-wrapper">
-        <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" :title="$t('VirtualListName')">
-                  <span>{{$t('VirtualListName')}}</span>
+  <div>
+    <a-drawer
+      :title="$t('Transfer')"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <div style="margin-bottom: 60px">
+        <div class="table-page-search-wrapper">
+          <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" :title="$t('VirtualListName')">
+                    <span>{{$t('VirtualListName')}}</span>
+                  </div>
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
+                           v-model="queryParam.name"></j-input>
                 </div>
-                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
-                         v-model="queryParam.name"></j-input>
-              </div>
-            </a-col>
-            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+              </a-col>
+              <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
                   <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>
       </span>
-          </a-row>
-        </a-form>
-      </div>
-      <a-table
-        :components="drag(columns,'columns')"
-        :columns="columns"
-        rowKey="id"
-        :scroll="{x: 800}"
-        :data-source="dataList"
-        :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
-        :loading="loading">
+            </a-row>
+          </a-form>
+        </div>
+        <a-table
+          :components="drag(columns,'columns')"
+          :columns="columns"
+          rowKey="id"
+          :scroll="{x: 800}"
+          :data-source="dataList"
+          :pagination="false"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+          :loading="loading">
 
-      </a-table>
-      <div class="page" v-if="dataList.length > 0">
-        <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
-          show-size-changer
-          :page-size.sync="pageSize"
-          :total="total"
-          :current="pageNo"
-          @change="onChange"
-          @showSizeChange="SizeChange"
-        />
+        </a-table>
+        <div class="page" v-if="dataList.length > 0">
+          <a-pagination
+            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            show-quick-jumper
+            show-size-changer
+            :page-size.sync="pageSize"
+            :total="total"
+            :current="pageNo"
+            @change="onChange"
+            @showSizeChange="SizeChange"
+          />
+        </div>
       </div>
-    </div>
 
-    <div class="drawer-bootom-button">
-      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
-    </div>
-  </a-drawer>
+      <div class="drawer-bootom-button">
+        <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}
+        </a-button>
+      </div>
+    </a-drawer>
+    <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
+  </div>
+
 </template>
 
 <script>
   import { getAction, postAction } from '@/api/manage'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import transferListvirtal from './transferListvirtal'
 
   export default {
     name: 'transferList',
-    components: {},
+    components: {
+      transferListvirtal
+    },
     props: ['url'],
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    mixins: [ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         visible: false,
@@ -150,7 +158,7 @@
           ...this.queryParam
         }
         this.loading = true
-        postAction('/project/projectLawsInventoryEO/getPageInfoDummy', query).then((res) => {
+        getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total
@@ -160,6 +168,11 @@
           }
         })
       },
+      transferListFormHomo() {
+        this.visible = false
+        this.selectedRowKeys = []
+        this.$emit('transferListForm')
+      },
       onSelectChange(value) {
         this.selectedRowKeys = value
         if (this.selectedRowKeys.length > 1) {
@@ -168,6 +181,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.selectedRowKeys = []
         this.$emit('visible')
       },
       handleSubmit(flag) {
@@ -175,8 +189,9 @@
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           this.confirmLoading = false
-          this.$emit('transferListForm',selectedRowKeys.join(','))
-          this.selectedRowKeys = []
+          // this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.$refs.transferListvirtalRef.transferModel(selectedRowKeys.join(','))
+          // this.selectedRowKeys = []
           // postAction('project/projectLawsInventoryEO/add', {
           //   dummyInventoryBaseId: selectedRowKeys.join(','),
           //   projectLibraryId: this.$route.query.id,
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue
new file mode 100644
index 000000000..9416a4fd8
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue
@@ -0,0 +1,314 @@
+<template>
+  <a-drawer
+    :title="$t('Transfer')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serialNumber"></j-input>
+              </div>
+            </a-col>
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('category')">
+                  <span>{{$t('category')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('category')"
+                         v-model="queryParam.category"></j-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
+                  <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>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 800,y:600}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
+        :loading="loading">
+
+      </a-table>
+<!--      <div class="page" v-if="dataList.length > 0">-->
+<!--        <a-pagination-->
+<!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+<!--          show-quick-jumper-->
+<!--          show-size-changer-->
+<!--          :page-size.sync="pageSize"-->
+<!--          :total="total"-->
+<!--          :current="pageNo"-->
+<!--          @change="onChange"-->
+<!--          @showSizeChange="SizeChange"-->
+<!--        />-->
+<!--      </div>-->
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { getAction, postAction } from '@/api/manage'
+import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+
+export default {
+  name: 'transferList',
+  components: {
+    globalAdvancedQuery
+  },
+  props: ['url'],
+  data() {
+    return {
+      visible: false,
+      queryParam: {},
+      confirmLoading: false,
+      selectedRowKeys: [],
+      columns: [
+        {
+          title: this.$t('category'),
+          align: 'left',
+          dataIndex: 'category',
+          width: 150,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('inspectionItems'),
+          align: 'left',
+          dataIndex: 'inspectionItem',
+          width: 150,
+          ellipsis: true,
+          scopedSlots: { customRender: 'inspectionItems' }
+        },
+        {
+          title: 'WVTA ID',
+          align: 'left',
+          dataIndex: 'wvtaId',
+          width: 150,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('standard'),
+          align: 'left',
+          dataIndex: 'serialNumber',
+          width: 150,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('areaOfResponsibility'),
+          align: 'left',
+          dataIndex: 'dutyTerritoryName',
+          width: 200,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('typeOfDeliverables'),
+          align: 'left',
+          dataIndex: 'deliverableTypeName',
+          width: 200,
+          ellipsis: true,
+        },
+      ],
+      fieldList: [
+        {
+          type: 'string',
+          value: 'wvtaId',
+          text: 'WVTA ID'
+        },
+        {
+          type: 'string',
+          value: 'inspectionItem',
+          text: this.$t('inspectionItems'),
+        },
+        {
+          type: '',
+          value: 'dutyTerritory',
+          text: this.$t('areaOfResponsibility'),
+          dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+      ],
+      dataList: [],
+      content: [],
+      loading: false,
+      dummyInventoryBaseId:'',
+      pageNo: 1,
+      pageSize: 10,
+      total: 0
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    transferModel(id) {
+      this.visible = true
+      this.dummyInventoryBaseId = id
+      this.queryParam = {}
+      this.selectedRowKeys = []
+      this.replacePage()
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.replacePage()
+    },
+    searchReset() {
+      this.pageNo = 1
+      this.queryParam = {}
+      this.replacePage()
+      this.$refs.globalAdvancedQueryRef.resetLine()
+      this.$refs.globalAdvancedQueryRef.emitCallback()
+    },
+    onChange(page, pageSize) {
+      this.pageNo = page
+      this.replacePage()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.replacePage()
+    },
+    handleSuperQuery(params, matchType) {
+      let sqp = {}
+      if (!params || (params && params.length == 0)) {
+        sqp['superQueryParams'] = ''
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+      } else {
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+        sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+        sqp['superQueryMatchType'] = matchType
+      }
+      this.queryParamQuery = sqp
+      this.replacePage()
+    },
+    replacePage() {
+      let query = {
+        // pageNo: this.pageNo,
+        // pageSize: this.pageSize,
+        ...this.queryParamQuery,
+        ...this.queryParam,
+        authDummyInventoryBaseId: this.dummyInventoryBaseId
+      }
+      this.loading = true
+      getAction('/authDummy/authDummyInventoryInfoEO/list', query).then((res) => {
+        if (res.success) {
+          this.dataList = res.result || []
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    onSelectChange(value) {
+      this.selectedRowKeys = value
+      // if (this.selectedRowKeys.length > 1) {
+      //   this.selectedRowKeys.shift()
+      // }
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleSubmit(flag) {
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.confirmLoading = true
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        postAction('project/projectCertificationInventoryEO/callAdd', {
+          authDummyInventoryBaseId: this.dummyInventoryBaseId,
+          projectLibraryId: this.$route.query.id,
+          authDummyInventoryInfoIds: selectedRowKeys.join(','),
+        }).then((res) => {
+          if (res.success) {
+            this.confirmLoading = false
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.selectedRowKeys = []
+            this.$emit('transferListFormHomo')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index b3cacecb4..a2a496ece 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -54,10 +54,10 @@
                   <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 @click="handleToggleSearch" style="margin-left: 8px">
-                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                 </a>
+                 <!--                 <a @click="handleToggleSearch" style="margin-left: 8px">-->
+                 <!--                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+                 <!--                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+                 <!--                 </a>-->
                </a-col>
             </span>
         </a-row>
@@ -280,18 +280,49 @@
               </a>
         </span>
         <span slot="DeliverablesResult" slot-scope="text,record,index">
-                  <a-button type="primary" class="button-text"
-                            v-if="record.flowStatus == 'Results to be submitted'"
-                            @click="clickButtonToUpload('deliveryResult',index)">
+                  <span v-if="(record.flowStatus == 'Results to be submitted' &&
+                  record.dutyPersonName == userInfoQuery.username && roleSwitchingCode == 20) ||
+                  record.flowStatus == 'Results to be submitted' && roleSwitchingCode == 21">
+                   <a-button type="primary" class="button-text"
+                             v-if="record.valueType == 'file'"
+                             @click="clickButtonToUpload('deliveryResult',index)">
                     {{ (record.deliveryResult === 'null' || record.deliveryResult === '' ||
                     record.deliveryResult == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
-                  </a-button>
+                   </a-button>
+                     <a-input class="box-input-index"
+                              v-else-if="record.valueType == 'text'"
+                              :maxLength="200"
+                              @blur="deliveryBlur"
+                              onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
+                              v-model.trim="record.deliveryResult"
+                              :placeholder="$t('PleaseEnter')"/>
+                    <a-radio-group v-else-if="record.valueType == 'select'"
+                                   @change="deliveryChange"
+                                   v-model="record.deliveryResult">
+                      <a-radio :value="'1'">
+                           {{$t('yes')}}
+                       </a-radio>
+                       <a-radio :value="'2'">
+                          {{$t('not')}}
+                        </a-radio>
+                    </a-radio-group>
+                    <span v-else>--</span>
+                  </span>
+
                    <span v-else>
                        <span class="viewFile"
-                             @click="viewFileClick(record.deliveryResult)" v-if="record.deliveryResult">
+                             @click="viewFileClick(record.deliveryResult)"
+                             v-if="record.deliveryResult && record.valueType == 'file'">
                            {{$t('viewFile')}}
                        </span>
+                        <span :title="record.deliveryResult"
+                              v-else-if="record.deliveryResult && record.valueType == 'text'">
+                             {{record.deliveryResult}}
+                        </span>
+                        <span v-else-if="record.deliveryResult && record.valueType == 'select'">
+                             {{record.deliveryResult == '1' ? $t('yes') :$t('not')}}
+                        </span>
                        <span v-else>--</span>
                    </span>
         </span>
@@ -347,7 +378,7 @@
     </div>
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
     <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
-    <batSetting :url="url" ref="batSettingRef" @batSettingForm="batSettingForm"/>
+    <batSetting :url="url" ref="batSettingRef" :roleSwitchingCode="roleSwitchingCode" @batSettingForm="batSettingForm"/>
     <addModel ref="addModelRef" @addModelForm="addModelForm"/>
     <modifyHistory ref="modifyHistoryRef"/>
     <uploadFile ref="uploadFile" :isMultiple="true" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -355,41 +386,41 @@
     <referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
     <SelectedBy ref="SelectedByRef" :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
     <viewFileModel ref="viewFileModelRef"/>
-    <a-modal
-      :title="listTitle"
-      :width="500"
-      :visible="visible"
-      :confirm-loading="confirmLoading"
-      :maskClosable="false"
-      @ok="handleOk"
-      @cancel="handleCancel"
-    >
-      <a-spin :spinning="confirmLoading">
-        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <div class="box-title-text-index">
-                <div class="title-text-index">
-                  <span class="Required">*</span>
-                  <span class="title-text-text"
-                        :title="$t('TaskCutOffTime')">{{ $t('TaskCutOffTime') }}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="endTime">
-                  <a-date-picker class="box-input"
-                                 :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
-                                 @change="dateChange({db_field_name:'endTime'})"
-                                 format="YYYY-MM-DD"
-                                 :disabledDate="disabledDate"
-                                 :getCalendarContainer="(trigger) => trigger.parentNode"
-                                 v-model="formInline.endTime"
-                                 style="width: 100%"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
-        </a-form-model>
-      </a-spin>
-    </a-modal>
+    <!--    <a-modal-->
+    <!--      :title="listTitle"-->
+    <!--      :width="500"-->
+    <!--      :visible="visible"-->
+    <!--      :confirm-loading="confirmLoading"-->
+    <!--      :maskClosable="false"-->
+    <!--      @ok="handleOk"-->
+    <!--      @cancel="handleCancel"-->
+    <!--    >-->
+    <!--      <a-spin :spinning="confirmLoading">-->
+    <!--        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">-->
+    <!--          <a-row :gutter="24">-->
+    <!--            <a-col :span="24">-->
+    <!--              <div class="box-title-text-index">-->
+    <!--                <div class="title-text-index">-->
+    <!--                  <span class="Required">*</span>-->
+    <!--                  <span class="title-text-text"-->
+    <!--                        :title="$t('TaskCutOffTime')">{{ $t('TaskCutOffTime') }}</span>-->
+    <!--                </div>-->
+    <!--                <a-form-model-item class="itemModel" prop="endTime">-->
+    <!--                  <a-date-picker class="box-input"-->
+    <!--                                 :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"-->
+    <!--                                 @change="dateChange({db_field_name:'endTime'})"-->
+    <!--                                 format="YYYY-MM-DD"-->
+    <!--                                 :disabledDate="disabledDate"-->
+    <!--                                 :getCalendarContainer="(trigger) => trigger.parentNode"-->
+    <!--                                 v-model="formInline.endTime"-->
+    <!--                                 style="width: 100%"/>-->
+    <!--                </a-form-model-item>-->
+    <!--              </div>-->
+    <!--            </a-col>-->
+    <!--          </a-row>-->
+    <!--        </a-form-model>-->
+    <!--      </a-spin>-->
+    <!--    </a-modal>-->
     <a-modal
       :title="$t('roleSwitching')"
       :width="500"
@@ -473,7 +504,50 @@
           'NA': 'notInvolvedColor',
           'Not start': 'submittedColor'
         },
-        fieldList: [],
+        fieldList: [
+          {
+            type: 'string',
+            value: 'category',
+            text: this.$t('category')
+          },
+          {
+            type: 'string',
+            value: 'inspectionItem',
+            text: this.$t('inspectionItems')
+          },
+          {
+            type: 'string',
+            value: 'configItem',
+            text: this.$t('configurationItem')
+          },
+          {
+            type: 'string',
+            value: 'wvtaId',
+            text: 'WVTA ID'
+          },
+          {
+            type: 'string',
+            value: 'serialNumber',
+            text: this.$t('standardNo')
+          },
+          {
+            type: 'Personnel',
+            value: 'sdt',
+            valueName: 'sdtName',
+            text: this.$t('engineeringInterfacePerson')
+          },
+          {
+            type: 'Personnel',
+            value: 'dutyPerson',
+            valueName: 'dutyPersonName',
+            text: this.$t('personLiable')
+          },
+          {
+            type: 'date',
+            value: 'endTime',
+            text: this.$t('closingDate')
+          }
+        ],
         disabled: false,
         queryParamQuery: {},
         formInline: {},
@@ -589,7 +663,7 @@
             align: 'left',
             dataIndex: 'deliveryResult',
             width: 180,
-            // ellipsis: true,
+            ellipsis: true,
             scopedSlots: { customRender: 'DeliverablesResult' }
           },
           {
@@ -651,13 +725,15 @@
         isDisplayNum: 2,
         long: '',
         toDoIds: [],
-        toDoNotConditions: []
+        toDoNotConditions: [],
+        userInfoQuery: {}
       }
     },
     mounted() {
       // this.getList()
       this.long = localStorage.getItem('language') || 'zh-cn'
       this.loading = true
+      this.userInfoQuery = this.userInfo()
       this.getProcessStatus()
       this.getRoleByUserId(() => {
         this.getAndUserId()
@@ -718,7 +794,7 @@
         if (this.roleSwitchingCode == 2) {
           this.preservationClick()
         }
-        this.replacePage()
+        this.getList()
       },
       SizeChange(page, pageSize) {
         this.pageNo = 1
@@ -726,7 +802,7 @@
         if (this.roleSwitchingCode == 2) {
           this.preservationClick()
         }
-        this.replacePage()
+        this.getList()
       },
       searchQuery() {
         this.pageNo = 1
@@ -779,6 +855,11 @@
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.dataSource = res.result.records || []
             this.total = res.result.total
             this.loading = false
@@ -821,42 +902,46 @@
         downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
       },
       handleDel() {
+        let _this = this
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          let _this = this
-          let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-          let isTrue = true
-          // for (let i = 0; i < this.dataSource.length; i++) {
-          //   for (let j = 0; j < selectedRowKeys.length; j++) {
-          //     if (this.dataSource[i].id == selectedRowKeys[j]) {
-          //       if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') {
-          //         isTrue = true
-          //       } else {
-          //         isTrue = false
-          //         this.$message.warning(this.$t('onlyDeleted'))
-          //         return
-          //       }
-          //     }
-          //   }
-          // }
-          if (isTrue) {
+          let ids = []
+          let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'List to be released' ||
+              this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataWithProcessStatusDeleted')
+          }
+          if (ids && ids.length > 0) {
             this.$confirm({
               content: _this.$t('ConfirmBatchDeletion'),
               onOk() {
-                let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
                 deleteAction(_this.url.deleteBatch, {
-                  ids: idList.join(','),
+                  ids: ids.join(','),
                   projectLibraryId: _this.$route.query.id
                 }).then((res) => {
                   if (res.success) {
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.selectedRowKeys = []
+                    _this.selectedRowKeysList = []
                     _this.getList()
+                    if (notConditions && notConditions.length > 0) {
+                      _this.failedMessage(data)
+                    }
                   } else {
                     _this.$message.warning(res.message)
                   }
                 })
               }
             })
+          } else {
+            this.failedMessage(data)
           }
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
@@ -897,46 +982,93 @@
         this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
       },
       releaseClick() {
-        this.listTitle = this.$t('Deadline')
-        if (this.selectedRowKeysList.length < 1) {
-          this.$message.warning(this.$t('selectLeastOne'))
+        // this.listTitle = this.$t('Deadline')
+        // if (this.selectedRowKeysList.length < 1) {
+        //   this.$message.warning(this.$t('selectLeastOne'))
+        // } else {
+        //   this.visible = true
+        // }
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'List to be released' ||
+              this.selectedRowKeysList[i].flowStatus == 'Certification returned') {
+              ids.push(this.selectedRowKeysList[i].id)
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataListReleasedAndCertificationReturnCanSelected')
+          }
+          if (ids && ids.length > 0) {
+            this.releaseData(ids, notConditions, data)
+          } else {
+            this.failedMessage(data)
+          }
         } else {
-          this.visible = true
+          this.$message.warning(this.$t('selectLeastOne'))
         }
       },
-      handleOk() {
-        this.$refs.ruleForm.validate(valid => {
-          if (valid) {
-            let selectedRowKeys = []
-            this.selectedRowKeysList.forEach(res => {
-              selectedRowKeys.push(res.id)
-            })
-            let query = {
-              ids: selectedRowKeys.join(','),
-              projectLibraryId: this.$route.query.id,
-              ...this.formInline
-            }
-            this.confirmLoading = true
-            postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => {
+      releaseData(ids, notConditions, data) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('confirmRelease'),
+          onOk() {
+            postAction('/project/projectCertificationInventoryEO/issue', {
+              ids: ids.join(','),
+              projectLibraryId: _this.$route.query.id
+            }).then((res) => {
               if (res.success) {
-                this.$message.success(this.$t('OperationSuccessful'))
-                this.visible = false
-                this.selectedRowKeys = []
-                this.confirmLoading = false
-                this.getList()
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.selectedRowKeys = []
+                _this.selectedRowKeysList = []
+                _this.getList()
+                if (notConditions && notConditions.length > 0) {
+                  _this.failedMessage(data)
+                }
               } else {
-                this.$message.warning(res.message)
-                this.confirmLoading = false
+                _this.$message.warning(res.message)
               }
-              this.detailedSuccessList = []
             })
           }
         })
       },
-      handleCancel() {
-        this.formInline = {}
-        this.visible = false
-      },
+      // handleOk() {
+      //   this.$refs.ruleForm.validate(valid => {
+      //     if (valid) {
+      //       let selectedRowKeys = []
+      //       this.selectedRowKeysList.forEach(res => {
+      //         selectedRowKeys.push(res.id)
+      //       })
+      //       let query = {
+      //         ids: selectedRowKeys.join(','),
+      //         projectLibraryId: this.$route.query.id,
+      //         ...this.formInline
+      //       }
+      //       this.confirmLoading = true
+      //       postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => {
+      //         if (res.success) {
+      //           this.$message.success(this.$t('OperationSuccessful'))
+      //           this.visible = false
+      //           this.selectedRowKeys = []
+      //           this.confirmLoading = false
+      //           this.getList()
+      //         } else {
+      //           this.$message.warning(res.message)
+      //           this.confirmLoading = false
+      //         }
+      //         this.detailedSuccessList = []
+      //       })
+      //     }
+      //   })
+      // },
+      // handleCancel() {
+      //   this.formInline = {}
+      //   this.visible = false
+      // },
 
       //撤回
       withdrawClick() {
@@ -1085,8 +1217,8 @@
       },
       transferListForm() {
         this.pageNo = 1
-        this.getList()
         this.selectedRowKeys = []
+        this.getList()
       },
       batSettingForm() {
         this.pageNo = 1
@@ -1103,22 +1235,26 @@
       },
       deleteLib(val) {
         let _this = this
-        this.$confirm({
-          content: _this.$t('ConfirmDelete'),
-          onOk() {
-            deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
-              if (res.success) {
-                _this.$message.success(_this.$t('OperationSuccessful'))
-                _this.getList()
-              } else {
-                _this.$message.warning(_this.$t('operationFailed'))
-              }
-            })
-          }
-        })
+        if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') {
+          this.$confirm({
+            content: _this.$t('ConfirmDelete'),
+            onOk() {
+              deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('onlyDataWithProcessStatusDeleted'))
+        }
       },
-      modifyHistoryClick() {
-        this.$refs.modifyHistoryRef.getList()
+      modifyHistoryClick(row) {
+        this.$refs.modifyHistoryRef.getList(row.id)
       },
       getRoleByUserId(callback) {
         getAction('/project/projectCertificationInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
@@ -1187,6 +1323,8 @@
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.visibleRoleSwitching = false
                 this.confirmLoadingRoleSwitching = false
+                this.selectedRowKeysList = []
+                this.selectedRowKeys = []
                 this.getList()
                 this.$emit('getRoleSwitch', this.roleSwitchingCode)
               } else {
@@ -1217,7 +1355,7 @@
       //引用交付物
       referenceDeliverablesClick() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$refs.referenceDeliverablesListRef.transferModel()
+          this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
@@ -1326,6 +1464,12 @@
         this.dataSource = [...this.dataSource]
         this.preservationClick()
       },
+      deliveryBlur() {
+        this.preservationClick()
+      },
+      deliveryChange() {
+        this.preservationClick()
+      },
       CertificationProgressClick(val) {
         let item = JSON.parse(JSON.stringify(val))
         item.roleCode = this.roleSwitchingCode
diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
index a2a38a05f..e98ef3490 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue
@@ -1,28 +1,28 @@
 <template>
-  <a-drawer
-    :title="$t('add')"
-    :maskClosable="false"
-    :width="1000"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <a-spin :spinning="confirmLoading">
+  <div>
+    <a-drawer
+      :title="$t('add')"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
         <a-form-model :model="formInline" :rules="rules" ref="ruleForm">
           <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
+                  <span class="title-text-text" :title="$t ('regulationNo')">{{$t('regulationNo')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="regulationNo">
-                  <j-dict-select-tag class="box-input"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('regulationNo')"
-                                     :type="'select'"
-                                     :triggerChange="false"/>
+                <a-form-model-item class="itemModel" prop="serialNumber">
+                  <a-input @click.native="serialNumberClick"
+                           class="box-input"
+                           :placeholder="$t('PleaseSelect')+$t('regulationNo')"
+                           v-model="formInline.serialNumber"></a-input>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -32,12 +32,14 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
                 </div>
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel" prop="dutyTerritory">
                   <j-dict-select-tag class="box-input"
                                      :disabled="disabled"
+                                     @input="handleInput('dutyTerritory')"
+                                     v-model="formInline.dutyTerritory"
                                      :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                      :type="'select'"
-                                     :triggerChange="false"/>
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -49,9 +51,9 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
                 </div>
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel" prop="wvtaId">
                   <a-input class="box-input"
-                           v-model='formInline.dddd'
+                           v-model='formInline.wvtaId'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
                 </a-form-model-item>
@@ -59,124 +61,182 @@
             </a-col>
           </a-row>
           <div v-for="(item,index) in formInline.dataList" :key="index">
-          <div class="header-text">
-            <span>{{$t('itemInformation')}}</span>
-            <div class="box-title-text" style="margin-left: 10px">
-              <a-button @click='addClick(index)' style="margin-right: .8rem" icon="plus">
-              </a-button>
-              <a-button v-if="formInline.dataList.length > 1" @click="deleteClick(index)" type="primary" icon="minus">
-              </a-button>
+            <div class="header-text">
+              {{$t('itemInformation')}}
+              <a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
+              <a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
+                      type="minus-circle"/>
             </div>
-          </div>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dataList.'+index+'.category'"
+                                     :rules="[{ required: true, message: $t('category') + $t('cannotEmpty'), trigger: 'blur'},
+                                            {max: 300,message: $t('category') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]"
+                  >
+                    <a-input class="box-input"
+                             v-model="item.category"
+                             :placeholder="$t('PleaseEnter')+$t('category')"/>
+                  </a-form-model-item>
                 </div>
-                <a-form-model-item class="itemModel" prop="category">
-                  <a-input class="box-input"
-                                     v-model="item.category"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('category')"
-                                     :type="'select'"
-                                     :triggerChange="false"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dataList.'+index+'.inspectionItem'"
+                                     :rules="[{ required: true, message: $t('inspectionItems') + $t('cannotEmpty'), trigger: 'blur'},
+                                            {max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]"
+                  >
+                    <a-input class="box-input"
+                             v-model="item.inspectionItem"
+                             :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
+                  </a-form-model-item>
                 </div>
-                <a-form-model-item class="itemModel" prop="inspectionItems">
-                  <j-dict-select-tag class="box-input"
-                                     v-model="item.inspectionItems"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('inspectionItems')"
-                                     :type="'select'"
-                                     :triggerChange="false"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dataList.'+index+'.configItem'"
+                                     :rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},
+                                            {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                            }]">
+                    <a-input class="box-input"
+                             v-model="item.configItem"
+                             :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+                  </a-form-model-item>
                 </div>
-                <a-form-model-item class="itemModel" prop="Deliverables">
-                  <j-dict-select-tag class="box-input"
-                                     v-model="item.Deliverables"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('Deliverables')"
-                                     :type="'select'"
-                                     :triggerChange="false"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel"
+                                     :prop="'dataList.'+index+'.deliverableType'"
+                                     :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
+                  >
+                    <a-tree-select
+                      tree-node-filter-prop="title"
+                      v-model="item.deliverableType"
+                      :maxTagCount="1"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      class="box-input"
+                      style="width: 100%"
+                      :tree-data="DeliverableTreeList"
+                      :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                    />
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
           </div>
         </a-form-model>
-    </a-spin>
-    <div class="drawer-bootom-button">
-      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>
-    </div>
-  </a-drawer>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      </div>
+    </a-drawer>
+   <codeNumber ref="codeNumber" @regulation="regulation" />
+  </div>
+
 </template>
 
 <script>
+import codeNumber from './codeNumber'
 import { getAction, postAction } from '@/api/manage'
+import { mapGetters } from 'vuex'
 
 export default {
   name:"addModel",
   props: ['url'],
+  components:{
+    codeNumber
+  },
   data() {
     return {
       visible: false,
       disabled: false,
       formInline: {},
       confirmLoading: false,
+      projectNameList: [],
+      DeliverableTreeList: [],
       rules: {
-        regulationNo: [
-          // {
-          //   required: true,
-          //   message: this.$t('regulationNo') + this.$t('cannotEmpty'),
-          //   trigger: 'change'
-          // }
-        ]
+        serialNumber: [
+          {
+            required: true,
+            message: this.$t('entryName') + this.$t('regulationNo'),
+            trigger: 'change'
+          }
+        ],
+        dutyTerritory: [
+          {
+            required: true,
+            message: this.$t('entryName') + this.$t('areaOfResponsibility'),
+            trigger: 'change'
+          }
+        ],
+        wvtaId: [
+          {
+            required: true,
+            message: 'WVTA ID' + this.$t('regulationNo'),
+            trigger: 'blur'
+          },
+          {
+            max: 300,
+            message: 'WVTA ID' + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+            trigger: 'blur'
+          }
+        ],
       },
     }
   },
+  mounted() {
+    this.getDeliverableTree()
+    this.getRegulationNo()
+  },
   methods: {
+    ...mapGetters(['userInfo']),
     addModel() {
       this.visible = true
       this.formInline = {}
       this.formInline.dataList = [{}]
-      this.formInline = { ...this.formInline }
       this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
         this.$refs.ruleForm.clearValidate()
+        this.$refs.codeNumber.number()
       })
     },
     handleCancel() {
       this.visible = false
     },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
     handleSubmit() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          this.formInline.authDummyInventoryBaseId = this.$route.query.id
           let query = JSON.parse(JSON.stringify(this.formInline))
-          query.dataList.forEach(val => {
-            Object.keys(query).forEach(res => {
-              if (query[res] && query[res] instanceof Array) {
-                query[res] = query[res].join(',')
-              }
-            })
-          })
           this.confirmLoading = true
           postAction(this.url.addModel, query).then((res) => {
             if (res.success) {
@@ -199,6 +259,46 @@ export default {
     deleteClick(index) {
       this.formInline.dataList.splice(index, 1)
       this.formInline = { ...this.formInline }
+    },
+    getRegulationNo() {
+      let query = {
+        projectLibraryId: this.$route.query.id,
+        roleCode: 0
+      }
+      getAction(this.url.number, query).then((res) => {
+        if (res.success) {
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
+        }
+      })
+    },
+    serialNumberChange(value) {
+      let content = this.projectNameList.filter(res => {
+        return res.id === value
+      })
+      this.formInline.bussDocumentLibraryId = content[0].id
+      this.formInline.serialNumber = content[0].serialNumber
+    },
+    getDeliverableTree() {
+      getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+        if (res.success) {
+          this.DeliverableTreeList = res.result
+        } else {
+          this.DeliverableTreeList = []
+        }
+      })
+    },
+    serialNumberClick(){
+      this.$refs.codeNumber.add()
+    },
+    regulation(item,data) {
+      this.formInline.serialNumber = item
+      this.formInline.bussDocumentLibraryId = data
+      this.$nextTick(()=>{
+        this.formInline = {... this.formInline}
+        this.$refs.ruleForm.validateField(['serialNumber'])
+      })
     }
   }
 }
@@ -246,12 +346,7 @@ export default {
 
 .header-text {
   font-size: 16px;
-  font-weight: bold;
-  margin-left: 15px;
-  /*border-bottom: 1px #d9d9d9 dashed;*/
-  height: 30px;
-  margin-bottom: 30px;
-  display: flex;
+  font-weight: 500;
 }
 
 .drawer-bootom-button {
@@ -266,4 +361,9 @@ export default {
   background: #fff;
   border-radius: 0 0 2px 2px;
 }
+
+.icon-text {
+  font-size: 16px;
+  margin-right: 4px;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
index f0872d80d..6b86102b9 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
@@ -18,7 +18,6 @@
             <a-form-model-item class="itemModel-multi">
               <j-dict-select-tag class="box-input"
                                   v-model="formInline.dutyTerritory"
-                                 @input="handleInput('dutyTerritory')"
                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                   :type="'select'"
                                   :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -33,20 +32,19 @@
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="title-text-text" :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
+              <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
             </div>
-            <a-form-model-item class="itemModel-multi">
-              <j-multi-select-tag class="box-input"
-                                  v-model="formInline.deliverable"
-                                  @input="handleInput('deliverable')"
-                                  :placeholder="$t('PleaseSelect')+$t('Deliverables')"
-                                  :type="'select'"
-                                  :triggerChange="false"/>
-              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
-              <!--                                 @input="handleInput('attestationType')"-->
-              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
-              <!--                                 :type="'select'"-->
-              <!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
+            <a-form-model-item class="itemModel">
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="formInline.deliverableType"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="DeliverableTreeList"
+                :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+              />
             </a-form-model-item>
           </div>
         </a-col>
@@ -56,7 +54,7 @@
 </template>
 
 <script>
-import { postAction } from '../../../api/manage'
+import { getAction, postAction } from '../../../api/manage'
 
 export default {
   name: 'batSetting',
@@ -68,10 +66,11 @@ export default {
       formInline: {},
       rules: {},
       ids: [],
+      DeliverableTreeList: [],
     }
   },
   mounted() {
-
+    this.getDeliverableTree()
   },
   methods: {
     edit(data) {
@@ -83,8 +82,10 @@ export default {
     },
     handleOk() {
       if (this.formInline.dutyTerritory) {
+        this.formInline.authDummyInventoryBaseId = this.$route.query.id
         this.handleOnTwo()
       } else {
+        this.formInline.authDummyInventoryBaseId = this.$route.query.id
         this.handleOkOne()
       }
     },
@@ -148,10 +149,19 @@ export default {
       this.formInline = {}
       this.visible = false
     },
-    handleInput(value) {
-      this.$nextTick(() => {
-        this.formInline = { ...this.formInline }
-        this.$refs.ruleForm.validateField([value])
+    // handleInput(value) {
+    //   this.$nextTick(() => {
+    //     this.formInline = { ...this.formInline }
+    //     this.$refs.ruleForm.validateField([value])
+    //   })
+    // },
+    getDeliverableTree() {
+      getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+        if (res.success) {
+          this.DeliverableTreeList = res.result
+        } else {
+          this.DeliverableTreeList = []
+        }
       })
     },
   }
diff --git a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
new file mode 100644
index 000000000..60008065b
--- /dev/null
+++ b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
@@ -0,0 +1,357 @@
+<template>
+  <div>
+<!--  <a-input allowClear-->
+<!--           @click="add"-->
+<!--           :placeholder="$t('PleaseSelect')+$t('regulationNo')"-->
+<!--            v-model="regulation"></a-input>-->
+  <a-drawer
+    :title="$t('regulationNo')"
+    :width="1000"
+    :visible="visible"
+    placement="right"
+    :maskClosable="false"
+    :closable="true"
+    @close="handleCancel"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <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" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serial_number"></a-input>
+              </div>
+            </a-col>
+            <template v-if="toggleSearchStatus">
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('title')">
+                    <span>{{$t('title')}}</span>
+                  </div>
+                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                           v-model="queryParam.title"></a-input>
+                </div>
+              </a-col>
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('status')">
+                    <span>{{$t('status')}}</span>
+                  </div>
+                  <j-dict-select-tag class="box-input" v-model="queryParam.state"
+                                     :placeholder="$t('PleaseSelect')+$t('status')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'state'"/>
+                </div>
+              </a-col>
+            </template>
+            <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                        @handleSuperQuery="handleSuperQuery"
+                                        :fieldList="fieldList"/>
+                  <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 @click="handleToggleSearch" style="margin-left: 8px">
+                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
+               </a-col>
+            </span>
+          </a-row>
+        </a-form>
+      </div>
+
+      <div style="width: 100%">
+        <a-table
+          :columns="columns"
+          :components="drag(columns,'columns')"
+          rowKey="id"
+          :scroll="{x: 1200}"
+          :data-source="dataList"
+          :pagination="false"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :loading="loading">
+
+        </a-table>
+      </div>
+
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction } from '@/api/manage'
+import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+export default {
+  name: 'codeNumber',
+  components: {
+    globalAdvancedQuery
+  },
+  mixins: [ResizeHeader, ResizeColumnProvide],
+  data() {
+    return {
+      url: {
+        addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy',
+      },
+      selectedRowList: [],
+      visible:false,
+      queryParam: {},
+      regulation: '',
+      confirmLoading: false,
+      toggleSearchStatus: false,
+      columns: [
+        {
+          title: this.$t('standard'),
+          dataIndex: 'serial_number',
+          align: 'left',
+          ellipsis: true,
+          width: 228
+        },
+        {
+          title: this.$t('title'),
+          dataIndex: 'title',
+          align: 'left',
+          ellipsis: true,
+          width: 228
+        },
+        {
+          title: this.$t('zoneOfApplication'),
+          dataIndex: 'region',
+          align: 'left',
+          ellipsis: true,
+          width: 228
+        },
+        // {
+        //   title: this.$t('status'),
+        //   dataIndex: 'state',
+        //   align: 'center',
+        //   ellipsis: true
+        // },
+        // {
+        //   title: this.$t('technicalField'),
+        //   dataIndex: 'technology_territory',
+        //   align: 'center',
+        //   ellipsis: true
+        // },
+        {
+          title: this.$t('ImplementationDate'),
+          dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
+          align: 'left',
+          ellipsis: true,
+          width: 228
+        },
+        {
+          title: this.$t('vehicleInProductionDate'),
+          dataIndex: 'implement_time',
+          align: 'left',
+          ellipsis: true,
+          width: 228
+        }
+        // {
+        //   title: this.$t('correspondingStandard'),
+        //   dataIndex: 'corresponding_standard',
+        //   align: 'center',
+        //   ellipsis: true
+        // }
+      ],
+      dataList: [],
+      selectedRowKeys: [],
+      loading: false,
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      fieldList: [],
+      queryParamQuery: {},
+      queryConditionVOList: []
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    add() {
+      this.visible = true
+      this.queryParam = {}
+      this.selectedRowKeys = []
+      this.queryConditionVOList = []
+      this.replacePage()
+      this.queryConditionInventory()
+    },
+    // number() {
+    //   this.regulation = ''
+    // },
+    searchQuery() {
+      this.pageNo = 1
+      this.replacePage()
+    },
+    searchReset() {
+      this.pageNo = 1
+      this.queryParam = {}
+      this.queryConditionVOList = []
+      this.$refs.globalAdvancedQueryRef.resetLine()
+      this.$refs.globalAdvancedQueryRef.emitCallback()
+      this.replacePage()
+    },
+    onChange(page, pageSize) {
+      this.pageNo = page
+      this.replacePage()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.replacePage()
+    },
+    queryConditionInventory() {
+      let query = {
+        flag: 1
+      }
+      getAction(this.url.queryConditionInventory, query).then((res) => {
+        if (res.success) {
+          this.fieldList = res.result || []
+        } else {
+          this.fieldList = []
+        }
+      })
+    },
+    replacePage() {
+      let queryConditionVOList = JSON.parse(JSON.stringify(this.queryConditionVOList))
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.queryParam,
+        queryConditionVOList: JSON.stringify(queryConditionVOList)
+      }
+      this.loading = true
+      postAction(this.url.addModelList, query).then((res) => {
+        if (res.success) {
+          this.dataList = res.result.records || []
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.dataList = []
+          this.total = 0
+          this.loading = false
+        }
+      })
+    },
+    onSelectChange(value,row) {
+      this.selectedRowKeys = value
+      this.selectedRowList = row
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleSuperQuery(params, matchType) {
+      let sqp = {}
+      if (!params || (params && params.length == 0)) {
+        this.queryConditionVOList = []
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+      } else {
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+        this.queryConditionVOList = params
+        this.queryConditionVOList.forEach(res => {
+          res.type = matchType
+        })
+      }
+      this.replacePage()
+    },
+    handleSubmit() {
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.confirmLoading = true
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        if (this.selectedRowKeys.length < 2){
+          let fgid = this.selectedRowList[0].id
+          let regulationIndex = this.selectedRowList[0].serial_number
+          this.confirmLoading = false
+          this.visible = false
+          this.$emit('regulation',regulationIndex,fgid)
+        } else {
+          this.$message.warning(this.$t('OnlyOneSelected'))
+          this.confirmLoading = false
+        }
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+        this.confirmLoading = false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 100%;
+  height: 38px;
+}
+
+.box-button {
+  height: 38px;
+}
+
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
index 4e35e6e15..3b0869ae9 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue
@@ -20,7 +20,7 @@
               <a-form-model-item class="itemModel" prop="serialNumber">
                 <j-dict-select-tag class="box-input"
                                    v-model="formInline.serialNumber"
-                                   :disabled="disabled"
+                                   :disabled="true"
                                    :placeholder="$t('PleaseSelect')+$t('regulationNo')"
                                    :type="'select'"
                                    :triggerChange="false"/>
@@ -39,7 +39,7 @@
                                    :disabled="disabled"
                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                    :type="'select'"
-                                   :triggerChange="false"/>
+                                   :triggerChange="false" :dictCode="'duty_territory'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -68,12 +68,10 @@
                 <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="category">
-                <j-dict-select-tag class="box-input"
-                                   v-model="formInline.category"
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('category')"
-                                   :type="'select'"
-                                   :triggerChange="false"/>
+                <a-input class="box-input"
+                         v-model="formInline.category"
+                         :disabled="disabled"
+                         :placeholder="$t('PleaseEnter')+$t('category')" />
               </a-form-model-item>
             </div>
           </a-col>
@@ -84,12 +82,10 @@
                 <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="inspectionItem">
-                <j-dict-select-tag class="box-input"
-                                   v-model="formInline.inspectionItem"
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('inspectionItems')"
-                                   :type="'select'"
-                                   :triggerChange="false"/>
+                <a-input class="box-input"
+                         v-model="formInline.inspectionItem"
+                         :disabled="disabled"
+                         :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -99,15 +95,35 @@
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required">*</span>
-                <span class="title-text-text" :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
+                <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="deliverable">
-                <j-dict-select-tag class="box-input"
-                                   v-model="formInline.deliverable"
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('Deliverables')"
-                                   :type="'select'"
-                                   :triggerChange="false"/>
+              <a-form-model-item class="itemModel" prop="configItem">
+                <a-input class="box-input"
+                         v-model="formInline.configItem"
+                         :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel"
+                                 prop="deliverableType"
+                                 :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
+              >
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="formInline.deliverableType"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
               </a-form-model-item>
             </div>
           </a-col>
@@ -133,6 +149,7 @@ export default {
       confirmLoading: false,
       formInline: {},
       disabled: false,
+      DeliverableTreeList: [],
       rules: {
         serialNumber: [
           {
@@ -169,6 +186,18 @@ export default {
             trigger: 'change'
           }
         ],
+        configItem: [
+          {
+            required: true,
+            message: this.$t('configurationItem') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          },
+          {
+            max: 300,
+            message: this.$t('configurationItem') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+            trigger: 'blur'
+          }
+        ],
         deliverable: [
           {
             required: true,
@@ -179,6 +208,9 @@ export default {
       }
     }
   },
+  mounted() {
+    this.getDeliverableTree()
+  },
   methods: {
     handleCancel() {
       this.visible = false
@@ -187,6 +219,9 @@ export default {
       this.visible = true
       this.$nextTick(() => {
       this.formInline = item || {}
+        if (this.formInline.deliverableType) {
+          this.formInline.deliverableType = this.formInline.deliverableType.split(',')
+        }
       this.$refs.ruleForm.clearValidate()
       })
     },
@@ -194,6 +229,11 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           let formInline = JSON.parse(JSON.stringify(this.formInline))
+          Object.keys(formInline).forEach(res => {
+            if (formInline[res] && formInline[res] instanceof Array) {
+              formInline[res] = formInline[res].join(',')
+            }
+          })
           this.confirmLoading = true
           postAction(this.url.editModel, formInline).then((res) => {
             if (res.success) {
@@ -212,6 +252,15 @@ export default {
         }
       })
     },
+    getDeliverableTree() {
+      getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+        if (res.success) {
+          this.DeliverableTreeList = res.result
+        } else {
+          this.DeliverableTreeList = []
+        }
+      })
+    },
   }
 }
 </script>
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 348e013cb..60133812d 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -260,12 +260,13 @@ export default {
         list: '/authDummy/authDummyInventoryInfoEO/page',
         logList: '',//更新log
         exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载
-        exportData: '',//导出
-        addModel: '/authDummy/authDummyInventoryInfoEO/add',//添加
+        exportData: '/authDummy/authDummyInventoryInfoEO/exportData',//导出
+        addModel: '/authDummy/authDummyInventoryInfoEO/batchAdd',//添加
         copyInfo: '/authDummy/authDummyInventoryInfoEO/copyInfoByIds',//复制
         deleteBatch: '/authDummy/authDummyInventoryInfoEO/deleteBatch',//批量删除
         editModel: '/authDummy/authDummyInventoryInfoEO/edit',//编辑
         setBatch: '/authDummy/authDummyInventoryInfoEO/setBatch',//批量设置
+        number: '/project/projectLawsInventoryEO/list',
       },
       queryParam: {},
       orderByField: '',
@@ -285,6 +286,13 @@ export default {
           ellipsis: true,
           scopedSlots: { customRender: 'inspectionItems' }
         },
+        {
+          title: this.$t('configurationItem'),
+          align: 'left',
+          dataIndex: 'configItem',
+          width: 150,
+          ellipsis: true,
+        },
         {
           title: 'WVTA ID',
           align: 'left',
@@ -302,14 +310,14 @@ export default {
         {
           title: this.$t('areaOfResponsibility'),
           align: 'left',
-          dataIndex: 'dutyTerritory',
+          dataIndex: 'dutyTerritoryName',
           width: 200,
           ellipsis: true,
         },
         {
-          title: this.$t('Deliverables'),
+          title: this.$t('typeOfDeliverables'),
           align: 'left',
-          dataIndex: 'deliverable',
+          dataIndex: 'deliverableTypeName',
           width: 200,
           ellipsis: true,
         },
@@ -392,6 +400,7 @@ export default {
   created() {
     if (this.$route.query.title == '虚拟认证清单详情') {
       document.title = this.$t('virtualAuthenticationListDetails')
+      this.columns.splice(7,1)
     } else {
       document.title = this.$t('certificationListMaintenance')
     }
@@ -438,7 +447,7 @@ export default {
     },
     //模板下载
     handleModule() {
-      downloadFile(this.url.exportTemplate, this.$t('VirtualList') + this.$t('importTemplate') + '.xls', {})
+      downloadFile(this.url.exportTemplate, this.$t('VirtualAuthenticationList') + this.$t('importTemplate') + '.xls', {})
     },
     //调取
     // transferClick() {
@@ -457,7 +466,7 @@ export default {
         ids: selectedRowKeys.join(','),
         dummyInventoryBaseId: this.$route.query.id
       }
-      downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList') + '.zip', query, this.Deselect)
+      downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualAuthenticationList') + '.zip', query, this.Deselect)
     },
     Deselect() {
       this.selectedRowKeys = []
@@ -708,4 +717,7 @@ export default {
   color: #000F16;
 }
 
+::v-deep .ant-table-placeholder {
+  margin-top: 8px!important;
+}
 </style>
\ No newline at end of file