diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index 706af7d17..3acdcb933 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -645,10 +645,10 @@ ALTER TABLE `project_task_planning`
     ADD COLUMN `seven` datetime(0) NULL COMMENT '小批量生产阶段' AFTER `six`,
     ADD COLUMN `eight` datetime(0) NULL COMMENT '大规模生产阶段' AFTER `seven`;
 
--- 工作流数据库-增加固定数据 2023-05-17 未同步生产环境
+-- 工作流数据库-增加固定数据 2023-05-17 已同步生产环境
 INSERT INTO `t_form`(`OBJECT_ID`, `CODE`, `CREATE_TIME`, `WIDGET_JSON`, `JSON`, `NAME`, `SHOW_KEY`, `IS_DELETED`, `MODEL_ID`, `JSON_EVAL`, `HTML`, `RUN_TYPE`, `CATEGORY_ID`, `HTML_READONLY`) VALUES ('xgjfwlc', '0007', '2023-05-17 13:52:26', NULL, NULL, '修改交付物流程', NULL, 0, '15007', NULL, NULL, 'json', '4bdf0b396b4aa6ea10dd5e19956a1e22', NULL);
 
--- 最近浏览表 2023-06-08 未同步生产环境
+-- 最近浏览表 2023-06-08 已同步生产环境
 CREATE TABLE `recent_browse`  (
   `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 '创建人',
@@ -660,6 +660,9 @@ CREATE TABLE `recent_browse`  (
   `browse_data_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-06-16 已同步生产环境
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1669532516277075970', '1552487412749369345', '一般导出', NULL, NULL, NULL, NULL, 2, 'report:detail:export:general', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2023-06-16 10:29:05', NULL, NULL, 0, 0, '1', 0, 'General export');
+
 
 -- 认证清单表 交付物字段扩大  2023-06-21 未同步生产环境
 ALTER TABLE `project_certification_inventory`
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/BeanUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/BeanUtils.java
new file mode 100644
index 000000000..0a5f606e2
--- /dev/null
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/BeanUtils.java
@@ -0,0 +1,48 @@
+package com.jero.common.util;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * 实体工具类
+ */
+public class BeanUtils {
+    /**
+     * 实体对象转Map
+     * @param entity
+     * @param <T>
+     * @return
+     */
+    public static <T> Map<String, Object> entityToMap(T entity) {
+
+        Map<String, Object> map = new HashMap<>();
+
+        List<Field> fieldList = new ArrayList<>();
+
+        Class<?> clazz = entity.getClass();
+        Field[] fields = clazz.getDeclaredFields();
+        fieldList.addAll(Arrays.asList(fields));
+
+        Field[] superFields = clazz.getSuperclass().getDeclaredFields();
+        fieldList.addAll(Arrays.asList(superFields));
+
+        for (Field field : fieldList) {
+
+            field.setAccessible(true);
+
+            try {
+
+                map.put(field.getName(), field.get(entity));
+
+            } catch (IllegalAccessException e) {
+
+                e.printStackTrace();
+
+            }
+
+        }
+
+        return map;
+
+    }
+}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java
index eaa9de9ef..73829e372 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java
@@ -220,7 +220,7 @@ public class CommonUtils {
      */
     public static boolean limitFileSuffix(String fileName,String[] fileSuffixLimits){
         final List<String> fileNameList = Arrays.asList(fileSuffixLimits);
-        boolean isExists = fileNameList.stream().anyMatch(name -> fileName.substring(0,fileName.lastIndexOf('.')).contains(name)||fileName.substring(fileName.lastIndexOf('.')).equals(name));
+        boolean isExists = fileNameList.stream().anyMatch(name -> fileName.substring(0,fileName.lastIndexOf('.')).contains(name)||fileName.substring(fileName.lastIndexOf('.')).contains(name));
         return isExists;
     }
     /**
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
index 24788b2a5..040333ca3 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
@@ -127,7 +127,11 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	@Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#code+':'+#key+#cut")
 	public String queryDictTextByKeyEn(String code, String key,String cut) {
 		log.debug("无缓存dictText的时候调用这里！");
-		return sysDictMapper.queryDictTextByKeyEn(code, key);
+		if (CutEnum.CN.getValue().equals(cut)) {
+			return sysDictMapper.queryDictTextByKey(code, key);
+		}else{
+			return sysDictMapper.queryDictTextByKeyEn(code, key);
+		}
 	}
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
index 64eb78905..dfa97007a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
@@ -23,6 +23,7 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
 
     List<ParamsCollectManifestEO> listInfoOfTodoCenter(@Param("manifestIdList") List<String> manifestIdList);
     List<Map<String, Object>> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO, @Param("ids") String ids);
+    List<Map<String, Object>> listInfoForExportExportTitle(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO, @Param("ids") String ids);
     List<ParamsCollectManifestEO> listInfoOfTodoCenter();
 
     // 查询控件类型为 标题的 参数项
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 01139f7ac..35f81bc2f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -94,6 +94,19 @@
             </foreach>
     </select>
 
+    <select id="listInfoForExportExportTitle" resultType="java.util.LinkedHashMap">
+        select *
+        from params_collect_manifest
+        <include refid="BaseQuerySql"/>
+        <if test="ids !=null and ids !=''">
+            AND id in
+            <foreach collection="ids.split(',')" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
         select *
         from params_collect_manifest
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index c33192062..6c1dfd3c7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2134,7 +2134,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         List<ParamsCollectManifestEO> list = list(queryWrapper);
         int number = (int) list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
                 || CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count();
-        if (number == list.size() && list.size() > 0) {
+        if (number == list.size() && list.size() >= 0) {
             return true;
         } else {
             return false;
@@ -3520,7 +3520,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
         List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
         // 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
-        list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList());
+        list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
 
         List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(list)) {
@@ -3789,9 +3789,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         + "3.If the control type is drop-down multi-selection, multiple entries are separated by English or Chinese exclamation points\n"
                         + "4.Configuration data is filled in according to the sequence of control type, and if there are multiple control types, it needs to be separated by \"#\"\n"
                         + "5.When the control contains multiple component types, if you fill in only some of the information, you need to distinguish blank data with \"#\"\n"
-                        + "6.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
-                        + "7.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
-                        + "8.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
+                        + "6.If the value contains multiple parameters, copy the row, insert and paste the contents of the row, and enter the corresponding parameter values in the newly pasted row\n"
+                        + "7.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
+                        + "8.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
+                        + "9.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
             } else {
                 explanation = "填写说明\n"
                         + "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是示例数据，需要从第四行开始填写\n"
@@ -3799,9 +3800,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         + "3.控件类型为下拉多选时，填写多个时采用英文或中文感叹号分割\n"
                         + "4.配置数据按照控件类型顺序进行填写，若存在多种控件类型填写时需要通过“#”隔开\n"
                         + "5.控件中包含多种组件类型时，若只填写其中部分信息需要用#区分空白数据\n"
-                        + "6.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
-                        + "7.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
-                        + "8.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
+                        + "6.填写值中包含多值参数时，需要复制行并插入粘贴行内容，并在新粘贴的行内填写相对应配置的参数值\n"
+                        + "7.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
+                        + "8.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
+                        + "9.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
             }
             XSSFRow row2 = sheetItems.createRow(1);
             row2.setHeight((short) 2500);
@@ -4276,7 +4278,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         for (int i = 0; i < fieldList.size(); i++) {
             OnlCgformField onlCgformField = fieldList.get(i);
             String dbFieldName = onlCgformField.getDbFieldName();
-            if (!"deadline".equals(dbFieldName) && !"cert_category".equals(dbFieldName) && !"description".equals(dbFieldName)) {
+            if (!"deadline".equals(dbFieldName) && !"cert_category".equals(dbFieldName)) {
                 dbFieldList.add(dbFieldName);
 
                 if (CutEnum.CN.getValue().equals(cut)) {
@@ -4346,6 +4348,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         List<String> dbFieldExampleList = new LinkedList<>();
 
         // 固定列
+        int indexOfDescription = 1; // 参数名称的位置
         for (int i = 0; i < fieldList.size(); i++) {
             OnlCgformField onlCgformField = fieldList.get(i);
             String dbFieldName = onlCgformField.getDbFieldName();
@@ -4356,6 +4359,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                     || "control_type".equals(dbFieldName) || "control_verify".equals(dbFieldName) || "control_values".equals(dbFieldName)
                     || "is_must".equals(dbFieldName) || "references_col".equals(dbFieldName)) {
                 dbFieldList.add(dbFieldName);
+                if ("nio_number".equals(dbFieldName)) {
+                    indexOfDescription = i;
+                }
 
                 if (CutEnum.CN.getValue().equals(cut)) {
                     dbFieldNameList.add(onlCgformField.getDbFieldTxt()); // 字段中文名
@@ -4417,6 +4423,26 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         dbFieldList.addAll(dbFieldListConfig);
         dbFieldNameList.addAll(dbFieldNameListConfig);
 
+        // 认证类别列
+        List<String> dbFieldNameListCC = new LinkedList<>();
+        List<String> dbFieldListCC = new LinkedList<>();
+        // 查询所有认证类别
+        List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category");
+        if (CutEnum.EN.getValue().equals(cut)) {
+            sysDictItemList.forEach(sysDictItem -> {
+                dbFieldListCC.add(sysDictItem.getItemValue());
+                dbFieldNameListCC.add(sysDictItem.getEnName() + " Number");
+            });
+
+        } else {
+            sysDictItemList.forEach(sysDictItem -> {
+                dbFieldListCC.add(sysDictItem.getItemValue());
+                dbFieldNameListCC.add(sysDictItem.getItemText() + "编号");
+            });
+        }
+        dbFieldList.addAll(dbFieldListCC);
+        dbFieldNameList.addAll(dbFieldNameListCC);
+
         String[] title = new String[3];
         String dbFieldStr = StringUtils.join(dbFieldList, ",");
         String dbFieldNameStr = StringUtils.join(dbFieldNameList, ",");
@@ -4438,14 +4464,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
         ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO();
         queryEO.setParamsManifestId(paramsManifestId);
-
         String userTypes = paramsCollectManifestVO.getUserTypes();
         if (userTypes != null && CollectManifestUserTypeEnum.SDT.getValue().equals(userTypes)) {
             queryEO.setUserTypes(CollectManifestUserTypeEnum.SDT.getValue());
             queryEO.setSdt(loginUser.getUsername());
         }
 
-        List<Map<String, Object>> dataList = paramsCollectManifestEOMapper.listInfoForExport(queryEO, null); // 查询导出数据
+        List<Map<String, Object>> dataList = paramsCollectManifestEOMapper.listInfoForExportExportTitle(queryEO, null); // 查询导出数据
         if (dataList == null || dataList.isEmpty()) {
             // 没有查到数据，进行提示
             if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) {
@@ -4460,6 +4485,57 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
         List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
 
+        List<Map<String,Object>> exportDataList = new ArrayList<>();
+        // 配置列多行数据处理
+        for (Map<String, Object> data : dataList) {
+            String controlType = (String)data.get("control_type");
+            if("0".equals(paramsCollectManifestVO.getExportOption()) && "11".equals(controlType)){
+                //不要标题
+                continue;
+            }
+            String id = (String) data.get("id");
+
+            Map<String, List<ParamsConfigDataEO>> paramsConfigDataMap = paramsConfigDataEOList.stream().filter(configDataEO -> {
+                boolean flag = false;
+                if (StringUtils.equals(configDataEO.getParamsCollectManifestId(), id)) {
+                    flag = true;
+                }
+                return flag;
+            }).collect(Collectors.groupingBy(configDataEO -> configDataEO.getParamsConfigId()));
+
+            List<Map<String, Object>> paramsConfigDataCountList = new ArrayList<>();
+
+            for (Map.Entry<String, List<ParamsConfigDataEO>> map : paramsConfigDataMap.entrySet()) {
+                Map<String, Object> paramsConfigDataCountMap = new HashMap<>();
+                paramsConfigDataCountMap.put("key", map.getKey());
+                paramsConfigDataCountMap.put("paramsConfigDataCount", map.getValue().size());
+                paramsConfigDataCountMap.put("value", map.getValue());
+                paramsConfigDataCountList.add(paramsConfigDataCountMap);
+            }
+
+            // 排序 配置数据总数倒序排序
+            Collections.sort(paramsConfigDataCountList, new Comparator<Map<String, Object>>() {
+                @Override
+                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                    return o2.get("paramsConfigDataCount").toString().compareTo(o1.get("paramsConfigDataCount").toString());
+                }
+            });
+
+            // 获取出最多行的配置列。
+            if (!paramsConfigDataCountList.isEmpty()) {
+                Map<String, Object> paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0);
+                String key = (String) paramsConfigDataMaxCountMap.get("key");
+                List<ParamsConfigDataEO> paramsConfigDataEOs = paramsConfigDataMap.get(key);
+                for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) {
+                    Map<String, Object> dataTemp = new HashMap<>();
+                    data.entrySet().forEach(o -> dataTemp.put(o.getKey(), o.getValue()));
+                    exportDataList.add(dataTemp);
+                }
+            } else {
+                exportDataList.add(data);
+            }
+        }
+
         List<String> nioNumberList = dataList.stream().map(m -> (String) m.get("nio_number")).collect(Collectors.toList());
         List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOList = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsTemplateId, paramsTemplatePublishVersion, nioNumberList); //查询所有认证类别参数项
 
@@ -4475,7 +4551,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         Map<String, String> stateMap = CollectManifestStateEnum.toMap(cut);
 
         // 插入配置列和认证类别列数据
-        for (Map<String, Object> record1 : dataList) {
+        for (Map<String, Object> record1 : exportDataList) {
 
             String paramsCollectManifestId = (String) record1.get("id");
             String nioNumber = (String) record1.get("nio_number");
@@ -4545,7 +4621,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
 
                     String paramsConfigId = paramsConfigEO.getId();
-                    List<ParamsConfigDataEO> paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e -> paramsConfigId.equals(e.getParamsConfigId()) && paramsCollectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList()); // 参数配置数据
+                    List<ParamsConfigDataEO> paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e -> {
+                        boolean flag = false;
+                        if(StringUtils.equals(paramsConfigId,e.getParamsConfigId()) && StringUtils.equals(paramsCollectManifestId,e.getParamsCollectManifestId())){
+                            flag = true;
+                        }
+                        return flag;
+                    }).collect(Collectors.toList()); // 参数配置数据
                     StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
                     if (CollectionUtil.isNotEmpty(paramsConfigDataEOS)) {
                         ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOS.get(0);
@@ -4563,7 +4645,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                                 fileList.addAll(ossFileList);
                             }
                         }
-
+                        paramsConfigDataEOList.remove(paramsConfigDataEO);
                     }
 
                     String configData = configDataBuilder.toString();
@@ -4577,7 +4659,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 record1.put("fileList", fileList);
             }
         }
-        return dataList;
+        return exportDataList;
     }
 
     // 导出待填写数据，可以勾选导出
@@ -4595,6 +4677,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
+        String paramsTemplateId = paramsManifestEO.getParamsTemplateId();
+        Integer paramsTemplatePublishVersion = paramsManifestEO.getParamsTemplatePublishVersion();
 
         ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
         BeanUtils.copyProperties(paramsCollectManifestVO, paramsCollectManifestEO);
@@ -4832,6 +4916,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			result.add(record1);
 		}*/
 
+        List<String> nioNumberList = dataList.stream().map(m -> (String) m.getNioNumber()).collect(Collectors.toList());
+        List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOList = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsTemplateId, paramsTemplatePublishVersion, nioNumberList); //查询所有认证类别参数项
+
         for (ParamsCollectManifestEO collectManifestEO : exportDataList) {
             Map<String, Object> record1 = objectToMapDre(collectManifestEO);
             String controlType = (String) record1.get("control_type");
@@ -4844,6 +4931,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             record1.put("control_type", controlTypeMap.get(controlType));
             record1.put("control_verify", controlVerifyMap.get(controlVerify));
 
+            // 认证类别列
+            List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOList.stream().filter(e -> nioNumber.equals(e.getNioNumber())).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(certCategoryParamsInfoPublishEOS)) {
+                certCategoryParamsInfoPublishEOS.forEach(certCategoryParamsInfoPublishEO -> {
+                    record1.put(certCategoryParamsInfoPublishEO.getCertCategory(), certCategoryParamsInfoPublishEO.getParamsNumber());
+                });
+            }
+
             // 处理参考列，没引用过则不显示该列
             if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName()) && StringUtils.isNotEmpty(collectManifestEO.getReferencesCol())) {
                 List<String> referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#"));
@@ -5480,6 +5575,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         || "is_must".equals(key) || "references_col".equals(key)) {
                     continue;
                 }
+                if(key.length() < 15){
+                    continue;
+                }
                 //
                 ParamsConfigDataEO configDataEO = new ParamsConfigDataEO();
                 List<ParamsConfigDataEO> list = paramsConfigDataEOList.stream().filter(e -> collectManifestMap.get(nioNumber).equals(e.getParamsCollectManifestId())
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
index 4428fb8a9..e080b6c69 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
@@ -106,4 +106,8 @@ public class ParamsCollectManifestVO {
     //排序规则 ”1“ 顺序  ”2“逆序
     @TableField(exist = false)
     private String orderBy;
+
+    //是否导出标题 ”1“ 是  ”0“否
+    @TableField(exist = false)
+    private String exportOption;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
index 555d4312e..131a69b4c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
@@ -213,4 +213,13 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 		}
 	}
 
+	@ApiOperation(value = "上报库参数项-一般导出")
+	@GetMapping(value = "/exportGeneral")
+	@RequiresPermissions("report:detail:export:general")
+	public void exportGeneral(ParamsReportDetailVO paramsReportDetailVO,
+							  HttpServletResponse response,
+							  HttpServletRequest request) {
+		this.paramsReportDetailEOService.exportGeneral(paramsReportDetailVO, response, request);
+	}
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
index 6a4782be3..c87997cc9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
@@ -7,7 +7,8 @@ import java.util.Map;
 
 public enum ExportTypeEnum {
     NORMAL("常规导出","1","Normal export"),
-    CUSTOM("自定义导出","2","Custom export");
+    CUSTOM("自定义导出","2","Custom export"),
+    GENERAL("一般导出","3","General export");
 
     String name;
     String value;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 3fba744b4..1b9ee69da 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -100,6 +100,15 @@
                 <if test="paramsReportDetailVO.paramsManifestId !=null and paramsReportDetailVO.paramsManifestId !=''">
                     AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId}
                 </if>
+                <if test="paramsReportDetailVO.isMust !=null and paramsReportDetailVO.isMust !=''">
+                    AND prd.is_must = #{paramsReportDetailVO.isMust}
+                </if>
+                <if test="paramsReportDetailVO.dutyTerritory !=null and paramsReportDetailVO.dutyTerritory !=''">
+                    AND prd.duty_territory in
+                    <foreach collection="paramsReportDetailVO.dutyTerritory.split(',')" index="" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
 
             </if>
         </where>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
index 9314749c2..de27ca874 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
@@ -73,4 +73,10 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
 
 	// 导出参数项历史Log信息
 	void exportParamsReportDetailLog(String cut, XSSFWorkbook workbook, String sheetHistoryName, List<Map<String, Object>> allParamsInfoList, XSSFCellStyle headerCellStyle,XSSFCellStyle bodyCellStyle);
+
+	// 一般导出
+	void exportGeneral(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request);
+
+    // 处理数据
+	void disposeData(List<ParamsReportDetailEO> prdEoList, String cut);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 684750ec1..a85de08c4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -12,6 +12,7 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
@@ -32,7 +33,6 @@ import com.jero.modules.cert.template.enums.ParamsIsMustEnum;
 import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
-import com.jero.modules.project.entity.ProjectTaskInventoryEO;
 import com.jero.modules.project.util.Docx4jUtils;
 import com.jero.modules.project.util.ExcelUtil;
 import com.jero.modules.project.util.WordUtil;
@@ -55,6 +55,7 @@ import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.packages.SpreadsheetMLPackage;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
@@ -112,6 +113,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	@Autowired
 	private IParamsReportDetailLogEOService paramsReportDetailLogEOService;
 
+	@Autowired
+	private IReportCertCategoryParamsInfoEOService reportCertCategoryParamsInfoEOService;
 
 	@Value(value = "${jero.path.upload}")
 	private String uploadpath;
@@ -1398,11 +1401,12 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 									}
 
 									String configData = configDataBuilderTemp.toString();
-									if (configData.contains("#")) {
-										configData = configData.substring(0, configData.lastIndexOf("#"));
+									if(StringUtils.isNotEmpty(configData)){
+										if (configData.contains("#")) {
+											configData = configData.substring(0, configData.lastIndexOf("#"));
+										}
+										configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
 									}
-
-									configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
 								}
 							}
 
@@ -1423,7 +1427,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 					} else {
 						List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
 
-						StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
+						List<String> configDataList = new ArrayList<>(); // 重新组合配置数据
 
 						for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) {
 							StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
@@ -1458,17 +1462,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							}
 
 							configData = configDataBuilderTemp.toString();
-							if (configData.contains("#")) {
-								configData = configData.substring(0, configData.lastIndexOf("#"));
+							if(StringUtils.isNotEmpty(configData)){
+								if (configData.contains("#")) {
+									configData = configData.substring(0, configData.lastIndexOf("#"));
+								}
+								configDataList.add(configData);
 							}
-
-							configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
 						}
 
-						String configDataStr = configDataBuilder.toString();
-						if (configDataStr.contains(paramsReportDetailVO.getSeparator())) {
-							configDataStr = configDataStr.substring(0, configDataStr.lastIndexOf(paramsReportDetailVO.getSeparator()));
-						}
+						String configDataStr = configDataList.stream().distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
 						record1.put("params_value", configDataStr);
 
 					}
@@ -2357,4 +2359,549 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 //		}
 //		return map;
 //	}
+
+
+	@Override
+	public void exportGeneral(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request) {
+		OutputStream os = null;
+		OutputStream excelOS = null;
+		XSSFWorkbook workbook = new XSSFWorkbook();
+		String fileOriName = "一般导出";
+		if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
+			fileOriName = "general";
+		}
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
+			fileOriName = paramsReportDetailVO.getExportName();
+		}
+		//创建临时文件夹
+		String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-", "") + File.separator + fileOriName;
+		File nowFile = new File(fileNowPath);
+		if (nowFile.exists()) {
+			nowFile.delete();
+		}
+		nowFile.mkdirs();
+		try {
+			String fileName = fileOriName + ".xlsx";
+			// 设置表格相关属性
+			String sheetName = "参数项信息";
+			if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
+				sheetName = "Params data";
+			}
+			XSSFSheet sheetItems = workbook.createSheet(sheetName);
+			String[] titles = this.getWorkbookTitleForExportGeneral(paramsReportDetailVO); // 获取表头
+
+			String[] headers = titles[1].split(",");
+			XSSFCellStyle cellStyle = workbook.createCellStyle();
+			cellStyle.setWrapText(true);
+			cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
+			XSSFCellStyle cellStyle1 = workbook.createCellStyle();
+			cellStyle1.setAlignment(XSSFCellStyle.ALIGN_CENTER);
+			XSSFCellStyle cellStyleLink = workbook.createCellStyle();
+			XSSFFont font = workbook.createFont();
+			font.setColor(HSSFColor.LIGHT_BLUE.index);
+			cellStyleLink.setFont(font);
+			cellStyleLink.setWrapText(true);
+
+			// 查询需要导出的字段
+			String field = titles[0]; // 字符串形式
+			List<String> fieldList = Arrays.asList(field.split(",")); // list形式
+
+			//  查询导出数据
+			List<Map<String, Object>> allParamsInfoList = this.queryForExportGeneral(paramsReportDetailVO, request);
+
+			// 开始处理工作表
+			List<OSSFile> allRelevFileList = new ArrayList<>();
+
+			// 在excel表中添加表头
+			XSSFRow row = sheetItems.createRow(0);
+			for (int i = 0; i < headers.length; i++) {
+				XSSFCell cell = row.createCell(i);
+				XSSFRichTextString text = new XSSFRichTextString(headers[i]);
+				cell.setCellValue(text);
+				cell.setCellStyle(cellStyle1);
+				// 设置单元格宽度
+				String ParamsValues = "参数值";
+				if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
+					ParamsValues = "Params Values";
+				}
+				if (ParamsValues.equals(headers[i])) {
+					sheetItems.setColumnWidth(i, 80 * 256);
+				} else {
+					sheetItems.setColumnWidth(i, 20 * 256);
+				}
+			}
+			//放文字内容
+			int allRow = 0;
+			for (int rowNum = 0; rowNum < allParamsInfoList.size(); rowNum++) {
+				Map<String, Object> exportDto = allParamsInfoList.get(rowNum);
+
+				// 处理文件
+				List<OSSFile> fileList = (List<OSSFile>) exportDto.get("fileList");
+				if (CollectionUtil.isNotEmpty(fileList)) {
+					allRelevFileList.addAll(fileList);
+				}
+
+				allRow++;
+				XSSFRow row1 = sheetItems.createRow(allRow);
+				for (int cellNum = 0; cellNum < fieldList.size(); cellNum++) {
+					if (ObjectUtils.isNotEmpty(exportDto.get(fieldList.get(cellNum)))) {
+						row1.createCell(cellNum).setCellValue(exportDto.get(fieldList.get(cellNum)).toString());
+						row1.getCell(cellNum).setCellStyle(cellStyle);
+					}
+				}
+			}
+
+			//下载关联文件内容
+			if (allRelevFileList != null && !allRelevFileList.isEmpty()) {
+				allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList());
+				String exportFile = "导出文件";
+				if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
+					exportFile = "Export file";
+				}
+				this.downLoadFileList(allRelevFileList, fileNowPath + File.separator + exportFile);
+			}
+
+			String repFileName = fileName.replaceAll("/", "_");
+			excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName);
+			response.setHeader("Content-Disposition",
+					"attachment; filename=\"" + ReadExcel.encodeFileName(fileOriName + ".zip", request) + "\"");
+			response.setContentType("application/force-download");
+			response.flushBuffer();
+			os = response.getOutputStream();
+			workbook.write(excelOS);
+			excelOS.flush();
+			excelOS.close();
+			ZipUtil.zip(fileNowPath, fileNowPath + ".zip");
+			FileInputStream fis = new FileInputStream(fileNowPath + ".zip");
+			int len = 0;
+			while ((len = fis.read()) != -1) {
+				os.write(len);
+			}
+
+			// 添加导出历史
+			String uploadFileName = fileOriName + ".zip";
+			InputStream uploadFileio = new FileInputStream(new File(fileNowPath + ".zip"));
+			MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传
+			OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/report", "", CutEnum.CN.getValue()); // 上传导出的压缩包
+			ParamsReportExportHistoryEO paramsReportExportHistoryEO = new ParamsReportExportHistoryEO();
+			paramsReportExportHistoryEO.setExportType(ExportTypeEnum.GENERAL.getValue());
+			paramsReportExportHistoryEO.setExportFileId(ossFile.getId());
+			paramsReportExportHistoryEO.setParamsManifestId(paramsReportDetailVO.getParamsManifestId());
+			paramsReportExportHistoryEO.setExportTime(new Date());
+			paramsReportExportHistoryEOService.add(paramsReportExportHistoryEO);
+
+			uploadFileio.close();
+			os.flush();
+			os.close(); // 后开先关
+			fis.close(); // 先开后关
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error(e.getMessage(), e);
+			if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
+				throw new JeroBootException("Failed to download file, please try again");
+			} else {
+				throw new JeroBootException("下载文件失败，请重试");
+			}
+		} finally {
+			IOUtils.closeQuietly(os);
+			IOUtils.closeQuietly(excelOS);
+			File tempZipFile = new File(uploadpath + "/tempZip");
+			FileUtil.deleteContents(tempZipFile);
+		}
+	}
+
+	@Override
+	public void disposeData(List<ParamsReportDetailEO> datas, String cut) {
+		if (CollectionUtils.isNotEmpty(datas)) {
+			// 普通数据字典
+			List<SysDictItem> dictItemList = new ArrayList<>();
+			List<String> dictCodeList = new ArrayList<>();
+			dictCodeList.add("duty_territory");
+			dictCodeList.add("cert_category");
+			for (String dictCode : dictCodeList) {
+				List<SysDictItem> dictItems = sysDictItemService.selectItemsByDictCode(dictCode);
+				dictItemList.addAll(dictItems);
+			}
+
+			for (ParamsReportDetailEO data : datas) {
+				// 处理数据字典字段 中英文切换 认证类型，责任领域
+				List<String> certCategory = Arrays.asList(data.getCertCategory().split(","));
+				List<String> dutyTerritory = Arrays.asList(data.getDutyTerritory().split(","));
+				String certCategoryName = "";
+				String dutyTerritoryName = "";
+				if (CutEnum.CN.getValue().equals(cut)) {
+					certCategoryName = dictItemList.stream()
+							.filter(e -> certCategory.contains(e.getItemValue()))
+							.map(SysDictItem::getItemText)
+							.collect(Collectors.joining(","));
+
+					dutyTerritoryName = dictItemList.stream()
+							.filter(e -> dutyTerritory.contains(e.getItemValue()))
+							.map(SysDictItem::getItemText)
+							.collect(Collectors.joining(","));
+
+				} else if (CutEnum.EN.getValue().equals(cut)) {
+					certCategoryName = dictItemList.stream()
+							.filter(e -> certCategory.contains(e.getItemValue()))
+							.map(SysDictItem::getEnName)
+							.collect(Collectors.joining(","));
+
+					dutyTerritoryName = dictItemList.stream()
+							.filter(e -> dutyTerritory.contains(e.getItemValue()))
+							.map(SysDictItem::getEnName)
+							.collect(Collectors.joining(","));
+
+				}
+				data.setCertCategory(certCategoryName);
+				data.setDutyTerritory(dutyTerritoryName);
+
+				data.setIsMust(ParamsIsMustEnum.getTextByValue(data.getIsMust(),cut));
+			}
+		}
+	}
+
+	private List<Map<String, Object>> queryForExportGeneral(ParamsReportDetailVO paramsReportDetailVO,HttpServletRequest req) throws IOException {
+		List<Map<String, Object>> result = new ArrayList<>();
+
+		ParamsReportDetailEO paramsReportDetailEO = new ParamsReportDetailEO();
+		BeanUtils.copyProperties(paramsReportDetailVO, paramsReportDetailEO);
+		String certCategorys = paramsReportDetailEO.getCertCategory();
+		if (StringUtils.isNotEmpty(paramsReportDetailEO.getCertCategory())) {
+			paramsReportDetailEO.setCertCategory(null);
+		}
+
+		QueryWrapper<ParamsReportDetailEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsReportDetailEO, req.getParameterMap());
+
+		if (StringUtils.isNotEmpty(certCategorys)) {
+			queryWrapper.and(query -> {
+				query.lambda().like(ParamsReportDetailEO::getCertCategory, certCategorys);
+				if (StringUtils.contains(certCategorys, ",")) {
+					String[] certCategoryArr = certCategorys.split(",");
+					for (String certCategory : certCategoryArr) {
+						query.or().lambda().like(ParamsReportDetailEO::getCertCategory, certCategory);
+					}
+				}
+			});
+		}
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getAllNumber())) {
+			QueryWrapper<ReportCertCategoryParamsInfoEO> rccpiQueryWrap = new QueryWrapper<>();
+			rccpiQueryWrap.lambda().eq(ReportCertCategoryParamsInfoEO::getParamsNumber, paramsReportDetailVO.getAllNumber());
+			List<ReportCertCategoryParamsInfoEO> rccpiEoList = this.reportCertCategoryParamsInfoEOService.list(rccpiQueryWrap);
+			queryWrapper.and(query -> {
+				query.lambda().eq(ParamsReportDetailEO::getNioNumber, paramsReportDetailVO.getAllNumber());
+				if (CollectionUtils.isNotEmpty(rccpiEoList)) {
+					List<String> nioNumbers = rccpiEoList.stream().map(ReportCertCategoryParamsInfoEO::getNioNumber).distinct().collect(Collectors.toList());
+					query.or().lambda().in(ParamsReportDetailEO::getNioNumber, nioNumbers);
+				}
+			});
+		}
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getIds())) {
+			queryWrapper.lambda().in(ParamsReportDetailEO::getId, Arrays.asList(paramsReportDetailVO.getIds().split(",")));
+		}
+		queryWrapper.orderByDesc("sync_time").orderByAsc("nio_number");
+
+		List<ParamsReportDetailEO> prdEoList = this.list(queryWrapper);
+		this.disposeData(prdEoList, paramsReportDetailVO.getCut());
+
+		List<ParamsReportDetailEO> exportDataList = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(prdEoList)) {
+			QueryWrapper<ParamsReportConfigEO> prcQueryWrap = new QueryWrapper<>();
+			prcQueryWrap.lambda().eq(ParamsReportConfigEO::getParamsManifestId, paramsReportDetailVO.getParamsManifestId());
+			List<ParamsReportConfigEO> prcEoList = this.paramsReportConfigEOService.list(prcQueryWrap);
+
+			List<String> prcIdList = prcEoList.stream().map(ParamsReportConfigEO::getId).distinct().collect(Collectors.toList());
+			List<ParamsReportConfigDataEO> prcdEoList = this.paramsReportConfigDataEOService.queryListByConfigIdList(prcIdList);
+
+			for (ParamsReportDetailEO prdEo : prdEoList) {
+				// 配置列多行数据处理
+				String id = prdEo.getId();
+
+				if (CollectionUtils.isNotEmpty(prcdEoList)) {
+					Map<String, List<ParamsReportConfigDataEO>> paramsConfigDataMap = prcdEoList.stream().filter(configDataEO -> {
+						boolean flag = false;
+						if (StringUtils.equals(configDataEO.getParamsCollectManifestId(), id)) {
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.groupingBy(configDataEO -> configDataEO.getParamsConfigId()));
+
+					List<Map<String, Object>> paramsConfigDataCountList = new ArrayList<>();
+
+					for (Map.Entry<String, List<ParamsReportConfigDataEO>> map : paramsConfigDataMap.entrySet()) {
+						Map<String, Object> paramsConfigDataCountMap = new HashMap<>();
+						paramsConfigDataCountMap.put("key", map.getKey());
+						paramsConfigDataCountMap.put("paramsConfigDataCount", map.getValue().size());
+						paramsConfigDataCountMap.put("value", map.getValue());
+						paramsConfigDataCountList.add(paramsConfigDataCountMap);
+					}
+
+					// 排序 配置数据总数倒序排序
+					Collections.sort(paramsConfigDataCountList, new Comparator<Map<String, Object>>() {
+						@Override
+						public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+							return o2.get("paramsConfigDataCount").toString().compareTo(o1.get("paramsConfigDataCount").toString());
+						}
+					});
+
+					// 获取出最多行的配置列。
+					if (!paramsConfigDataCountList.isEmpty()) {
+						Map<String, Object> paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0);
+						String key = (String) paramsConfigDataMaxCountMap.get("key");
+						List<ParamsReportConfigDataEO> paramsConfigDataEOs = paramsConfigDataMap.get(key);
+						for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) {
+							ParamsReportDetailEO ParamsReportDetailEO = new ParamsReportDetailEO();
+							BeanUtils.copyProperties(prdEo, ParamsReportDetailEO);
+							exportDataList.add(ParamsReportDetailEO);
+						}
+					} else {
+						exportDataList.add(prdEo);
+					}
+				}
+			}
+
+			if (CollectionUtils.isNotEmpty(exportDataList)) {
+				// 排除的数据数组 等于将数组中的数据逻辑删除。
+				List<String> excludePrcdIdList = new ArrayList<>();
+
+				for (ParamsReportDetailEO prdEo : exportDataList) {
+					Map<String, Object> prdEoMap = com.jero.common.util.BeanUtils.entityToMap(prdEo);
+					String paramsCollectManifestId = prdEo.getId();
+					String controlType = prdEo.getControlType();
+					String nioNumber = prdEo.getNioNumber();
+
+					// 配置列
+					if (CollectionUtil.isNotEmpty(prcEoList)) {
+						List<OSSFile> fileList = new ArrayList<>();
+
+						prcEoList.forEach(prcEo -> { // 参数配置
+
+							String prcEoId = prcEo.getId();
+							// 参数配置数据
+							List<ParamsReportConfigDataEO> prcdEos = prcdEoList.stream().filter(e -> {
+								boolean flag = false;
+								if (StringUtils.equals(prcEoId, e.getParamsConfigId()) && paramsCollectManifestId.equals(e.getParamsCollectManifestId())) {
+									if (!excludePrcdIdList.contains(e.getId())) {
+										flag = true;
+									}
+								}
+								return flag;
+							}).collect(Collectors.toList());
+							StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
+							if (CollectionUtil.isNotEmpty(prcdEos)) {
+								ParamsReportConfigDataEO prcdEo = prcdEos.get(0);
+
+								if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {
+									if (StringUtils.isNotEmpty(prcdEo.getTextData())) {
+										configDataBuilder.append(prcdEo.getTextData());
+									}
+
+								} else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)
+										|| ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) {
+									if (StringUtils.isNotEmpty(prcdEo.getPullData())) {
+										configDataBuilder.append(prcdEo.getPullData().replaceAll(",", "！"));
+									}
+
+								} else if (ControlTypeEnum.FILE.getValue().equals(controlType)) {
+									if (StringUtils.isNotEmpty(prcdEo.getFileConnectId())) {
+										List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(prcdEo.getFileConnectId());
+										if (CollectionUtil.isNotEmpty(ossFileList)) {
+											configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName());
+
+											fileList.addAll(ossFileList);
+										}
+
+									}
+
+								} else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)
+										|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) {
+
+									if (StringUtils.isNotEmpty(prcdEo.getTextData())) {
+										configDataBuilder.append(prcdEo.getTextData());
+									}
+
+									configDataBuilder.append("#");
+
+									if (StringUtils.isNotEmpty(prcdEo.getPullData())) {
+										configDataBuilder.append(prcdEo.getPullData().replaceAll(",", "！"));
+									}
+
+								} else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) {
+									if (StringUtils.isNotEmpty(prcdEo.getTextData())) {
+										configDataBuilder.append(prcdEo.getTextData());
+									}
+
+									configDataBuilder.append("#");
+									if (StringUtils.isNotEmpty(prcdEo.getFileConnectId())) {
+										List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(prcdEo.getFileConnectId());
+										if (CollectionUtil.isNotEmpty(ossFileList)) {
+											configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName());
+
+											fileList.addAll(ossFileList);
+										}
+
+									}
+
+								} else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)
+										|| ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) {
+									if (StringUtils.isNotEmpty(prcdEo.getPullData())) {
+										configDataBuilder.append(prcdEo.getPullData().replaceAll(",", "！"));
+									}
+
+									configDataBuilder.append("#");
+									if (StringUtils.isNotEmpty(prcdEo.getFileConnectId())) {
+										List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(prcdEo.getFileConnectId());
+										if (CollectionUtil.isNotEmpty(ossFileList)) {
+											configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName());
+
+											fileList.addAll(ossFileList);
+										}
+
+									}
+
+								} else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
+									if (StringUtils.isNotEmpty(prcdEo.getTextData())) {
+										configDataBuilder.append(prcdEo.getTextData());
+									}
+									configDataBuilder.append("#");
+									if (StringUtils.isNotEmpty(prcdEo.getPullData())) {
+										configDataBuilder.append(prcdEo.getPullData().replaceAll(",", "！"));
+									}
+									configDataBuilder.append("#");
+									if (StringUtils.isNotEmpty(prcdEo.getFileConnectId())) {
+										List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(prcdEo.getFileConnectId());
+										if (CollectionUtil.isNotEmpty(ossFileList)) {
+											configDataBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName());
+
+											fileList.addAll(ossFileList);
+										}
+
+									}
+
+								}
+//								prcdEoList.remove(prcdEo);
+								excludePrcdIdList.add(prcdEo.getId());
+							}
+
+							String configData = configDataBuilder.toString();
+							if (StringUtils.isNotEmpty(configData) && "".equals(configData.replace("#", ""))) {
+								configData = configData.replace("#", "");
+							}
+
+							prdEoMap.put(prcEo.getId(), configData);
+						});
+
+						prdEoMap.put("fileList", fileList);
+					}
+					result.add(prdEoMap);
+				}
+			}
+		}
+		return result;
+	}
+
+
+	private String[] getWorkbookTitleForExportGeneral(ParamsReportDetailVO paramsReportDetailVO) {
+		String cut = paramsReportDetailVO.getCut();
+		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.PARAMS_REPORT_DETAIL.getValue());
+
+		List<String> dbFieldNameList = new ArrayList<>();
+		List<String> dbFieldList = new ArrayList<>();
+
+		if (fieldList.size() != 0) {
+			//过滤列表字段(is_show_list-->列表是否显示0否 1是)
+			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
+
+			// 设置排序字段，将字段重新排序
+			for (OnlCgformField onlCgformField : fieldList) {
+				String dbFieldName = this.fieldConvert(onlCgformField.getDbFieldName());
+				if (StringUtils.isNotEmpty(dbFieldName)) {
+					Integer fieldIndex = this.getFieldIndex(dbFieldName);
+
+					onlCgformField.setOrderNum(fieldIndex);
+				}
+			}
+
+			// 重新排序
+			fieldList = fieldList.stream().sorted(Comparator.comparingInt(o -> o.getOrderNum())).collect(Collectors.toList());
+		}
+
+		// 固定列
+		for (int i = 0; i < fieldList.size(); i++) {
+			OnlCgformField onlCgformField = fieldList.get(i);
+			String dbFieldName = this.fieldConvert(onlCgformField.getDbFieldName());
+			if (StringUtils.isNotEmpty(dbFieldName)) {
+				dbFieldList.add(dbFieldName);
+				if (CutEnum.CN.getValue().equals(cut)) {
+					dbFieldNameList.add(onlCgformField.getDbFieldTxt()); // 字段中文名
+				} else {
+					dbFieldNameList.add(onlCgformField.getDbFieldEnName()); // 字段英文名
+				}
+			}
+		}
+
+		// 配置列
+		QueryWrapper<ParamsReportConfigEO> queryWrap = new QueryWrapper<>();
+		queryWrap.lambda().in(ParamsReportConfigEO::getParamsManifestId, paramsReportDetailVO.getParamsManifestId());
+		queryWrap.lambda().orderByAsc(ParamsReportConfigEO::getDisplaySeq);
+		List<ParamsReportConfigEO> paramsReportConfigEOList = this.paramsReportConfigEOService.list(queryWrap);
+		if (CollectionUtil.isNotEmpty(paramsReportConfigEOList)) {
+			for (ParamsReportConfigEO paramsReportConfigEO : paramsReportConfigEOList) {
+				dbFieldList.add(paramsReportConfigEO.getId());
+				dbFieldNameList.add(paramsReportConfigEO.getConfigName());
+			}
+		}
+
+		String[] title = new String[2];
+		String dbFieldStr = StringUtils.join(dbFieldList, ",");
+		String dbFieldNameStr = StringUtils.join(dbFieldNameList, ",");
+
+		title[0] = dbFieldStr;
+		title[1] = dbFieldNameStr;
+		return title;
+	}
+
+	private String fieldConvert(String field) {
+		if (field == null) {
+			return null;
+		}
+		switch (field) {
+			case "nio_number":
+				return "nioNumber";
+			case "params_name":
+				return "paramsName";
+			case "cert_category":
+				return "certCategory";
+			case "is_must":
+				return "isMust";
+			case "description":
+				return "description";
+			default:
+				return null;
+		}
+	}
+
+	/**
+	 * 获取字段的下标，字段在excel表格中占据第几列
+	 * @param field
+	 * @return
+	 */
+	private Integer getFieldIndex(String field) {
+		if (field == null) {
+			return null;
+		}
+		switch (field) {
+			case "nioNumber":
+				return 1;
+			case "paramsName":
+				return 2;
+			case "certCategory":
+				return 3;
+			case "isMust":
+				return 4;
+			case "description":
+				return 5;
+			default:
+				return null;
+		}
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
index 766c7fa43..54ccc6952 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
@@ -72,4 +72,9 @@ public class ParamsReportDetailVO {
 
     @TableField(exist = false)
     private String orderBySql;
+
+    @TableField(exist = false)
+    private String isMust;
+    @TableField(exist = false)
+    private String dutyTerritory;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java
index 630579765..ef8eaa2d0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java
@@ -1,6 +1,7 @@
 package com.jero.modules.cert.template.enums;
 
 import com.jero.common.constant.enums.CutEnum;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -76,4 +77,19 @@ public enum ParamsIsMustEnum {
         return map;
     }
 
+    public static String getTextByValue(String value,String cut){
+        String result = "";
+        ParamsIsMustEnum[] paramsIsMustEnums = ParamsIsMustEnum.values();
+        for (ParamsIsMustEnum paramsIsMustEnum : paramsIsMustEnums) {
+            if(StringUtils.equals(value,paramsIsMustEnum.value)){
+                if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+                    result = paramsIsMustEnum.name;
+                }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                    result = paramsIsMustEnum.enName;
+                }
+            }
+        }
+        return result;
+    }
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
index fd915712e..820eb6978 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
@@ -148,6 +148,7 @@
         left join cert_category_params_info ccpi on (pi.nio_number = ccpi.nio_number and pi.params_template_id = ccpi.params_template_id)
         ) tmp_tb
         <include refid="BaseQuerySql"/>
+        order by tmp_tb.nio_number asc
     </select>
 
     <select id="selectListWithCertForEnExport" resultMap="ParamsInfoEOResultMapWithCertForEnExport" parameterType="com.jero.modules.cert.template.vo.ParamsInfoVO">
@@ -158,6 +159,7 @@
         left join cert_category_params_info ccpi on (pi.nio_number = ccpi.nio_number and pi.params_template_id = ccpi.params_template_id)
         ) tmp_tb
         <include refid="BaseQuerySql"/>
+        order by tmp_tb.nio_number asc
     </select>
 
     <select id="selectListByParamsTemplateIds" resultMap="ParamsInfoEOResultMap" parameterType="java.lang.String">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 63d524594..80e6d6b29 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -4384,25 +4384,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
         //处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
         String warnTime = (String) parameter.get("WarnTime");
-        if(StringUtils.isNotBlank(warnTime)){
-            if("0".equals(flag)){
-                //日期(区分单日期还时间范围)
-                if (warnTime.contains(",")) {
-                    conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'"
-                            + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'");
-                } else {
-                    conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'");
-                }
-            }else{
-                //日期(区分单日期还时间范围)
-                if (warnTime.contains(",")) {
-                    conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'"
-                            + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'");
-                } else {
-                    conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'");
-                }
-            }
-        }
+//        if(StringUtils.isNotBlank(warnTime)){
+//            if("0".equals(flag)){
+//                //日期(区分单日期还时间范围)
+//                if (warnTime.contains(",")) {
+//                    conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'"
+//                            + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'");
+//                } else {
+//                    conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'");
+//                }
+//            }else{
+//                //日期(区分单日期还时间范围)
+//                if (warnTime.contains(",")) {
+//                    conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'"
+//                            + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'");
+//                } else {
+//                    conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'");
+//                }
+//            }
+//        }
 
         //高级搜索  queryConditionVOList  List<QueryConditionVO>
         if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java
index c7f391a04..f7d8a3485 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java
@@ -6,9 +6,9 @@ package com.jero.modules.head.enums;
  * @auth zhn
  */
 public enum AffirmFlagEnum {
-    DESIGN_FLAG("设计符合性确认","Design Compliance Check","1"),
+    DESIGN_FLAG("设计符合性确认","Design Compliance Confirmation","1"),
     AFFIRM_FLAG("Pre-Homo确认","Pre-Homo Confirmation","2"),
-    VERIFY_FLAG("验证符合性确认","Validation Compliance Check","3");
+    VERIFY_FLAG("验证符合性确认","Validation Compliance Confirmation","3");
 
 
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
index aabf9ba83..004f10ccd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
@@ -12,6 +12,8 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.extRepo.entity.ExtRepoData;
 import com.jero.modules.ota.entity.OtaBaCxList;
 import com.jero.modules.ota.service.IOtaBaCxListService;
+import com.jero.modules.ota.utils.ComparisonUtil;
+import com.jero.modules.system.service.ISysDictService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +28,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,6 +46,8 @@ import java.util.Map;
 public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxListService> {
     @Autowired
     private IOtaBaCxListService otaBaCxListService;
+    @Autowired
+    private ISysDictService sysDictService;
 
     /**
      * 分页列表查询
@@ -94,7 +99,23 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
         }
         queryWrapper.orderByDesc(OtaBaCxList::getCreateTime);
         IPage<OtaBaCxList> pageList = otaBaCxListService.page(page, queryWrapper);
-        return Result.OK(pageList);
+        for (OtaBaCxList pa : pageList.getRecords()) {
+            pa.setBazt_dictText(sysDictService.queryDictTextByKeyEn("recordstatus", pa.getBazt(), req.getParameter("cut")));
+        }
+        Map<String, Object> resMap = new HashMap<>();
+        resMap.put("list", pageList);
+        //有审批周期的数据
+        int days = 0;
+        int spzqSum = 0;
+        List<OtaBaCxList> list = otaBaCxListService.list(queryWrapper);
+        for (OtaBaCxList cx : list) {
+            if (StringUtils.isNotEmpty(cx.getSpzq())) {
+                days++;
+                spzqSum += Integer.parseInt(cx.getSpzq());
+            }
+        }
+        resMap.put("pjspzq", days == 0 ? 0 : Math.floor(spzqSum / days));
+        return Result.OK(resMap);
     }
 
     /**
@@ -219,9 +240,10 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
         String ids = json.getString("ids");
         String bazt = json.getString("bazt");
         String batjsj = json.getString("batjsj");
+        String tgthsj = json.getString("tgthsj");
         String bz = json.getString("bz");
         String cut = json.getString("cut");
-        otaBaCxListService.batchRecord(ids, bazt, batjsj, bz, cut);
+        otaBaCxListService.batchRecord(ids, bazt, batjsj,tgthsj, bz, cut);
         return Result.OK("备案维护成功!");
     }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
index 5cbc98052..424f542da 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
@@ -12,6 +12,8 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.ota.entity.OtaBaCxList;
 import com.jero.modules.ota.entity.OtaBaSjList;
 import com.jero.modules.ota.service.IOtaBaSjListService;
+import com.jero.modules.ota.utils.ComparisonUtil;
+import com.jero.modules.system.service.ISysDictService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +27,9 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -41,6 +45,8 @@ import java.util.List;
 public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjListService> {
     @Autowired
     private IOtaBaSjListService otaBaSjListService;
+    @Autowired
+    private ISysDictService sysDictService;
 
     /**
      * 分页列表查询
@@ -90,8 +96,24 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
         }
         queryWrapper.orderByDesc(OtaBaSjList::getCreateTime);
         IPage<OtaBaSjList> pageList = otaBaSjListService.page(page, queryWrapper);
-        this.otaBaSjListService.disposeData(pageList.getRecords(),otaBaSjList);
-        return Result.OK(pageList);
+        for (OtaBaSjList pa : pageList.getRecords()) {
+            pa.setBazt_dictText(sysDictService.queryDictTextByKeyEn("recordstatus", pa.getBazt(), req.getParameter("cut")));
+        }
+        this.otaBaSjListService.disposeData(pageList.getRecords(), otaBaSjList);
+        Map<String, Object> resMap = new HashMap<>();
+        resMap.put("list", pageList);
+        //有审批周期的数据
+        int days = 0;
+        int spzqSum = 0;
+        List<OtaBaSjList> list = otaBaSjListService.list(queryWrapper);
+        for (OtaBaSjList sj : list) {
+            if (StringUtils.isNotEmpty(sj.getSpzq())) {
+                days++;
+                spzqSum += Integer.parseInt(sj.getSpzq());
+            }
+        }
+        resMap.put("pjspzq", days == 0 ? 0 : Math.floor(spzqSum / days));
+        return Result.OK(resMap);
     }
 
     /**
@@ -215,9 +237,10 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
         String ids = json.getString("ids");
         String bazt = json.getString("bazt");
         String batjsj = json.getString("batjsj");
+        String tgthsj = json.getString("tgthsj");
         String bz = json.getString("bz");
         String cut = json.getString("cut");
-        otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut);
+        otaBaSjListService.batchRecord(ids, bazt, batjsj, tgthsj, bz, cut);
         return Result.OK("备案维护成功!");
     }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java
index f95073ec7..3accc3042 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java
@@ -4,6 +4,7 @@ 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;
@@ -97,6 +98,9 @@ public class OtaBaCxList implements Serializable {
     @Dict(dicCode = "recordstatus")
     private java.lang.String bazt;
 
+    @TableField(exist = false)
+    private java.lang.String bazt_dictText;
+
 	/**备案提交时间*/
 	@Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -126,6 +130,22 @@ public class OtaBaCxList implements Serializable {
     @ApiModelProperty(value = "在线升级驾驶附件")
     private java.lang.String zxsjjsfj;
 
+
+    /**通过退回时间*/
+    @Excel(name = "通过退回时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "通过退回时间")
+    private java.util.Date tgthsj;
+
+    /**审批周期*/
+    @Excel(name = "审批周期", width = 15)
+    @ApiModelProperty(value = "审批周期")
+    private java.lang.String spzq;
+
+
+
+
     public void updateData(OtaBaCxJbxx otaBaCxJbxx){
         this.cpdjbh = otaBaCxJbxx.getDjbh();
         this.ggpc = otaBaCxJbxx.getGgpc();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java
index 74a0b8adc..4d9055ff4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java
@@ -125,6 +125,9 @@ public class OtaBaSjList implements Serializable {
     @Dict(dicCode = "recordstatus")
     private java.lang.String bazt;
 
+    @TableField(exist = false)
+    private java.lang.String bazt_dictText;
+
     /**
      * 备案提交时间
      */
@@ -168,6 +171,18 @@ public class OtaBaSjList implements Serializable {
     @TableField(exist = false)
     private String rwmc;
 
+    /**通过退回时间*/
+    @Excel(name = "通过退回时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "通过退回时间")
+    private java.util.Date tgthsj;
+
+    /**审批周期*/
+    @Excel(name = "审批周期", width = 15)
+    @ApiModelProperty(value = "审批周期")
+    private java.lang.String spzq;
+
     public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) {
         this.cpdjbh = otaBaSjSjmbcx.getBabh();
         this.ggpc = otaBaSjSjmbcx.getBapc();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java
index b55d818df..7943db507 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java
@@ -64,7 +64,7 @@ public interface IOtaBaCxListService extends IService<OtaBaCxList> {
     /**
      * 备案维护
      */
-    void batchRecord(String ids, String bazt, String batjsj, String bz, String cut);
+    void batchRecord(String ids, String bazt, String batjsj, String tgthsj,String bz, String cut);
 
     void exportTemplate(HttpServletResponse response, HttpServletRequest request);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java
index ebbd83ddd..0d586026b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java
@@ -66,7 +66,7 @@ public interface IOtaBaSjListService extends IService<OtaBaSjList> {
     /**
      * 备案维护
      */
-    void batchRecord(String ids, String bazt, String batjsj, String bz, String cut);
+    void batchRecord(String ids, String bazt, String batjsj, String tgthsj,String bz, String cut);
 
     void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception;
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
index 808090940..8cdc31add 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
@@ -63,17 +63,17 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
      * @return
      */
     public OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) throws Exception {
-        String ggpc = otaBaCxJbxx.getGgpc();
+        String djbh = otaBaCxJbxx.getDjbh();
         //对比填写记录用的
         OtaBaCxJbxx otaBaCxJbxxOld = new OtaBaCxJbxx();
         Date now = new Date();
         OtaBaCxList otaBaCxList;
         if (StringUtils.isEmpty(otaBaCxJbxx.getOtaId())) {
-            if (StringUtils.isNotEmpty(ggpc)) {
+            if (StringUtils.isNotEmpty(djbh)) {
                 List<OtaBaCxJbxx> xxList = this.list();
                 for (OtaBaCxJbxx xx : xxList) {
-                    if (ggpc.equals(xx.getGgpc())) {
-                        throw new JeroBootException("公告批次重复");
+                    if (djbh.equals(xx.getDjbh())) {
+                        throw new JeroBootException("产品登记编号重复");
                     }
                 }
             }
@@ -87,11 +87,11 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
             otaBaCxJbxx.setCreateTime(now);
         } else {
             otaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId());
-            if (StringUtils.isNotEmpty(ggpc)) {
+            if (StringUtils.isNotEmpty(djbh)) {
                 List<OtaBaCxJbxx> xxList = this.list();
                 for (OtaBaCxJbxx xx : xxList) {
-                    if (!xx.getOtaId().equals(otaBaCxJbxx.getOtaId()) && ggpc.equals(xx.getGgpc())) {
-                        throw new JeroBootException("公告批次重复");
+                    if (!xx.getOtaId().equals(otaBaCxJbxx.getOtaId()) && djbh.equals(xx.getDjbh())) {
+                        throw new JeroBootException("产品登记编号重复");
                     }
                 }
             }
@@ -241,26 +241,25 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
         if (cpbh.length() > 500) {
             throw new JeroBootException("产品登记编号字数超过500");
         }
-        jbxx.setDjbh(cpbh);
-
-        row = s.getRow(4);
-        cell = row.getCell(1);
-        String ggpc = ImportFileUtil.getCellValue(cell, wb);
-        if (StringUtils.isNotEmpty(ggpc)) {
+        if (StringUtils.isNotEmpty(cpbh)) {
             List<OtaBaCxJbxx> xxList = this.list();
             for (OtaBaCxJbxx xx : xxList) {
-                if (ggpc.equals(xx.getGgpc())) {
-                    throw new JeroBootException("公告批次重复");
+                if (cpbh.equals(xx.getDjbh())) {
+                    throw new JeroBootException("产品登记编号重复");
                 }
             }
         }
-        jbxx.setGgpc(ggpc);
+        jbxx.setDjbh(cpbh);
+
         row = s.getRow(1);
         cell = row.getCell(1);
         jbxx.setQymc(ImportFileUtil.getCellValue(cell, wb));
         row = s.getRow(3);
         cell = row.getCell(1);
         jbxx.setCplb(ImportFileUtil.getCellValueDict(cell, wb, "product_category", sysDictService, cut));
+        row = s.getRow(4);
+        cell = row.getCell(1);
+        jbxx.setGgpc(ImportFileUtil.getCellValue(cell, wb));
         row = s.getRow(5);
         cell = row.getCell(1);
         jbxx.setCpsb(ImportFileUtil.getCellValue(cell, wb));
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
index 29b06bca5..0b3e47927 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -152,15 +153,33 @@ public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBa
      * 备案维护
      */
     @Override
-    public void batchRecord(String ids, String bazt, String batjsj, String bz, String cut) {
+    public void batchRecord(String ids, String bazt, String batjsj, String tgthsj,String bz, String cut) {
         try {
             if (StringUtils.isNotEmpty(ids)) {
                 String[] idList = ids.split(",");
                 for (String id : idList) {
                     OtaBaCxList otaBaCxList = this.queryById(id);
                     otaBaCxList.setBazt(bazt);
-                    otaBaCxList.setBatjsj(sdf.parse(batjsj));
+                    otaBaCxList.setBatjsj(null);
+                    if (StringUtils.isNotEmpty(batjsj)) {
+                        otaBaCxList.setBatjsj(sdf.parse(batjsj));
+                    }
+                    otaBaCxList.setTgthsj(null);
+                    if (StringUtils.isNotEmpty(tgthsj)) {
+                        otaBaCxList.setTgthsj(sdf.parse(tgthsj));
+                    }
+                    otaBaCxList.setSpzq(null);
+                    if(null != otaBaCxList.getBatjsj() &&  null != otaBaCxList.getTgthsj()){
+                        Calendar calendar1 = Calendar.getInstance();
+                        calendar1.setTime(otaBaCxList.getBatjsj());
+
+                        Calendar calendar2 = Calendar.getInstance();
+                        calendar2.setTime(otaBaCxList.getTgthsj());
+                        int daysDifference = (int) Math.floor((calendar2.getTimeInMillis() - calendar1.getTimeInMillis()) / (1000 * 60 * 60 * 24));
+                        otaBaCxList.setSpzq(String.valueOf(daysDifference));
+                    }
                     otaBaCxList.setBz(bz);
+                    this.deleteById(otaBaCxList.getId());
                     this.saveOrUpdate(otaBaCxList);
                     //添加历史记录数据
                     OtaBaCxLsjl lsjl = new OtaBaCxLsjl();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java
index 8dc9643e2..6abfcea2d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java
@@ -141,7 +141,7 @@ public class OtaBaSjGnxtwhServiceImpl extends ServiceImpl<OtaBaSjGnxtwhMapper, O
         for (OtaBaSjGnxtwh wh : list) {
             String[] strs = wh.getDykzq().split(",");
             for (String str : strs) {
-                if (str.equals(kzq)) {
+                if (kzq.contains(str)) {
                     return wh.getGnxt();
                 }
             }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
index b4e87a9f3..cded72b97 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
@@ -1,6 +1,7 @@
 package com.jero.modules.ota.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.ota.entity.OtaBaSjList;
@@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -67,6 +69,10 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
     @Autowired
     private IOtaBaSjQtsjxxService otaBaSjQtsjxxService;
 
+    @Override
+    public <E extends IPage<OtaBaSjList>> E page(E page) {
+        return super.page(page);
+    }
 
     /**
      * 保存
@@ -150,15 +156,33 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
      * 备案维护
      */
     @Override
-    public void batchRecord(String ids, String bazt, String batjsj, String bz, String cut) {
+    public void batchRecord(String ids, String bazt, String batjsj,String tgthsj, String bz, String cut) {
         try {
             if (StringUtils.isNotEmpty(ids)) {
                 String[] idList = ids.split(",");
                 for (String id : idList) {
                     OtaBaSjList otaBaSjList = this.queryById(id);
                     otaBaSjList.setBazt(bazt);
-                    otaBaSjList.setBatjsj(sdf.parse(batjsj));
+                    otaBaSjList.setBatjsj(null);
+                    if (StringUtils.isNotEmpty(batjsj)) {
+                        otaBaSjList.setBatjsj(sdf.parse(batjsj));
+                    }
+                    otaBaSjList.setTgthsj(null);
+                    if (StringUtils.isNotEmpty(tgthsj)) {
+                        otaBaSjList.setTgthsj(sdf.parse(tgthsj));
+                    }
+                    otaBaSjList.setSpzq(null);
+                    if(null != otaBaSjList.getBatjsj() &&  null != otaBaSjList.getTgthsj()){
+                        Calendar calendar1 = Calendar.getInstance();
+                        calendar1.setTime(otaBaSjList.getBatjsj());
+
+                        Calendar calendar2 = Calendar.getInstance();
+                        calendar2.setTime(otaBaSjList.getTgthsj());
+                        int daysDifference = (int) Math.floor((calendar2.getTimeInMillis() - calendar1.getTimeInMillis()) / (1000 * 60 * 60 * 24));
+                        otaBaSjList.setSpzq(String.valueOf(daysDifference));
+                    }
                     otaBaSjList.setBz(bz);
+                    this.deleteById(otaBaSjList.getId());
                     this.saveOrUpdate(otaBaSjList);
                     //添加历史记录数据
                     OtaBaSjLsjl lsjl = new OtaBaSjLsjl();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
index 22cdf4d23..a32b99547 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
@@ -31,9 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
+import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -213,8 +211,8 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
     private OtaBaSjSjmbcl parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception {
         OtaBaSjSjmbcl mbcl = new OtaBaSjSjmbcl();
         OtaBaSjSjmbcx mbcx = otaBaSjSjmbcxService.queryByOtaId(otaId, "");
-        if (ObjectUtils.isNotEmpty(mbcx) && StringUtils.isNotEmpty(mbcx.getCpxh())) {
-            String cx = mbcx.getCpxh();
+        if (ObjectUtils.isNotEmpty(mbcx) && StringUtils.isNotEmpty(mbcx.getCpmc())) {
+            String mc = mbcx.getCpmc();
             Workbook wb = ImportFileUtil.readExcel(upFile);
             Sheet s = wb.getSheetAt(0);
 
@@ -227,7 +225,7 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
                 vinObj.setVin(ImportFileUtil.getCellValue(cell, wb));
                 cell = row.getCell(1);
                 vinObj.setCx(ImportFileUtil.getCellValue(cell, wb));
-                if (!cx.equals(vinObj.getCx())) {
+                if (!mc.equals(vinObj.getCx())) {
                     continue;
                 }
                 cell = row.getCell(2);
@@ -262,19 +260,35 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
                 mbcl.setVinList(vinList.get(0).getVin() + "-" + vinList.get(vinList.size() - 1).getVin());
 
                 //生成VIN码文件
-                LinkedHashMap map = new LinkedHashMap();
-                map.put("1", "VIN");
-                List exportData = new ArrayList<Map>();
-                Map vrow = null;
-                for (int i = 0; i < vinList.size(); i++) {
-                    vrow = new LinkedHashMap<String, String>();
-                    vrow.put("1", vinList.get(i).getVin());
-                    exportData.add(vrow);
-                }
+//                LinkedHashMap map = new LinkedHashMap();
+//                map.put("1", "VIN");
+//                List exportData = new ArrayList<Map>();
+//                Map vrow = null;
+//                for (int i = 0; i < vinList.size(); i++) {
+//                    vrow = new LinkedHashMap<String, String>();
+//                    vrow.put("1", vinList.get(i).getVin());
+//                    exportData.add(vrow);
+//                }
+//                String fileName = "VIN码.csv";
+//                File file = CSVUtil.createCSVFile(exportData, map, uploadPath + System.currentTimeMillis(), fileName);
+//                String filePath = uploadPath + "/" + file.getName();
+
                 String fileName = "VIN码.csv";
-                File file = CSVUtil.createCSVFile(exportData, map, uploadPath + System.currentTimeMillis(), fileName);
-                String filePath = uploadPath + "/" + file.getName();
-                OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "/ota", "", CutEnum.CN.getValue());
+                File csvFileDir = new File(uploadPath + System.currentTimeMillis());
+                csvFileDir.mkdirs();
+                File csvFile = new File(csvFileDir.getAbsolutePath() + "/" + fileName);
+                try (BufferedWriter writer = new BufferedWriter(new FileWriter(csvFile))) {
+                    // 写入数据
+                    for (VinObj data : vinList) {
+                        String row = data.getVin();
+                        writer.write(row);
+                        writer.newLine();
+                    }
+                } catch (IOException e) {
+                    System.err.println("生成CSV文件失败：" + e.getMessage());
+                }
+
+                OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(csvFile), "/ota", "", CutEnum.CN.getValue());
                 mbcl.setCsv(ossFile.getId());
             }
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
index 0f425e829..faa958233 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
@@ -19,6 +19,7 @@ import com.jero.modules.ota.utils.ComparisonUtil;
 import com.jero.modules.ota.utils.ImportFileUtil;
 import com.jero.modules.project.util.WordUtil;
 import com.jero.modules.split.common.FileUnZip;
+import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.service.ISysDictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -193,6 +194,17 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
         if (ObjectUtil.isEmpty(res)) {
             res = getByOtaId(otaIdT);
         }
+        if (ObjectUtil.isNotEmpty(res)) {
+            Collections.sort(res, (arg0, arg1) -> {
+                if (null == arg0.getXtmc()) {
+                    arg0.setXtmc("");
+                }
+                if (null == arg1.getXtmc()) {
+                    arg1.setXtmc("");
+                }
+                return arg0.getXtmc().compareTo(arg1.getXtmc());
+            });
+        }
         JSONObject json = new JSONObject();
         json.put("list", res);
         return json;
@@ -257,13 +269,15 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
         List<String> oldYjbbList = otaBaSjSjxtbh.stream().map(OtaBaSjSjxtbh::getYjbb).distinct().collect(Collectors.toList());
         List<String> oldTempFileNameList = new ArrayList<>();
         oldYjbbList.forEach(sjSjxtbh -> {
-            oldTempFileNameList.add(sjSjxtbh.replaceAll("见","")  + ".docx");
+            if (StringUtils.isNotEmpty(sjSjxtbh)) {
+                oldTempFileNameList.add(sjSjxtbh.replaceAll("见", "") + ".docx");
+            }
         });
 
         int tempFileIndex = 1;
         String tempFilePath = uploadPath + "tempFile" + "/" + otaId;
         File tempFile = new File(tempFilePath);
-        if(!tempFile.exists()){
+        if (!tempFile.exists()) {
             tempFile.mkdirs();
         }
         List<String> tempFileNames = new ArrayList<>();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java
index dbe384066..6d2a0c2da 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java
@@ -415,11 +415,11 @@ public class ToDoCenterServiceImpl implements IToDoCenterService {
                         data.setTaskDefinitionKeyName(taskDefinitionKeyName);
                     }
                 }
-                // 如果是清单确认流程，将任务节点设置为  清单校核：Checklist verification
+                // 如果是清单确认流程，将任务节点设置为  任务发起：Task initiation
                 if (StringUtils.equals(data.getFlowType(), FlowTypeEnum.QDQR.getValue())) {
-                    String taskDefinitionKeyName = "清单校核";
+                    String taskDefinitionKeyName = "任务发起";
                     if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
-                        taskDefinitionKeyName = "Checklist verification";
+                        taskDefinitionKeyName = "Task initiation";
                     }
                     data.setTaskDefinitionKeyName(taskDefinitionKeyName);
                 }
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 b78cfc973..7f79a896b 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
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.system.entity.SysRole;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -59,7 +60,26 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
+		String flowStatusStr = "";
+		if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getFlowStatus())) {
+			flowStatusStr = projectCertificationInventoryEO.getFlowStatus();
+			projectCertificationInventoryEO.setFlowStatus(null);
+		}
 		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap());
+		if (StringUtils.isNotEmpty(flowStatusStr)) {
+			String finalflowStatusStr = flowStatusStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectCertificationInventoryEO::getFlowStatus, finalflowStatusStr);
+				if(StringUtils.contains(finalflowStatusStr,",")){
+					String[] flowStatusArr = finalflowStatusStr.split(",");
+					for (String fs : flowStatusArr) {
+						query.or(q -> {
+							q.like("flow_status",fs);
+						});
+					}
+				}
+			});
+		}
 		queryWrapper.orderByDesc("create_time");
 		Page<ProjectCertificationInventoryEO> page = new Page<ProjectCertificationInventoryEO>(pageNo, pageSize);
 		IPage<ProjectCertificationInventoryEO> pageList = this.projectCertificationInventoryEOService.queryPage(queryWrapper,page,projectCertificationInventoryEO,cut);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
index ae498ef27..d3a21eb4f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
@@ -303,6 +303,8 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 		 try {
 			 projectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
 		 } catch (Exception e) {
+			 e.printStackTrace();
+			 log.error("批量设置失败：" + e.getMessage());
 			 if(CutEnum.CN.getValue().equals(cut)){
 				 return Result.error("批量设置失败！");
 			 }else{
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
index 32324c8c2..ef06a26d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
@@ -147,4 +147,20 @@ public class ProjectTaskPlanning implements Serializable {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date eight;
+
+    /**mp*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date mp;
+
+    /**地方批准1*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date localapproval1;
+
+    /**地方批准2*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date localapproval2;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java
index 34609c13c..09adf3b2d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java
@@ -25,7 +25,7 @@ public enum CertificationFlowNodeEnum {
          * 任务办理 -> 责任人接受之后，等待提交交付物
          * 任务审查 -> 责任人提交交付物之后，认证工程师审查。
      */
-    CHECKLIST_VERIFICATION ("Checklist verification","清单校核","Checklist verification"),
+    CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task initiation"),
     TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Task responsibility confirmation"),
     TASK_HANDLING ("Task handling","任务办理","Task handling"),
     TASK_REVIEW ("Task Review","任务审查","Task Review"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
index 77397cd88..ae3e31c20 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationInventoryFlowStatusEnum.java
@@ -25,7 +25,7 @@ public enum CertificationInventoryFlowStatusEnum {
      */
 
     LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
-    LIST_TO_BE_CHECKED("清单待校核","List to be checked","List to be checked"),
+    LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
     CERTIFICATION_RETURNED("认证退回","Certification returned","Certification returned"),
     TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
     REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
index 767676d4c..5a4bf5f6d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
@@ -11,13 +11,15 @@ public enum ProjectTaskPlanningNameEnum {
 //    ATTESTATION_START_TIME("认证试验结束","Homo Completion"),//  name:认证开始   value:Certification begins
     ATTESTATION_END_TIME("认证批准","Homo KO"),//  name:认证结束   value:End of certification
 
-    LIST_CONFIRMATION("清单发布","List Publishing"),
-    LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirmation"),
-    DESIGN_DEADLINE("设计核查","Design Verification"),
-    PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo   value:Pre-Homo
-    ATTESTATION_START_TIME("认证开始","Certification Start"),//  name:认证开始   value:Certification begins
-    VERIFY_DEADLINE("验证核查","Verification And Verification"),
-    CERTIFICATION_SUBMISSION("认证提交","Certification Submission"),
+    LIST_CONFIRMATION("清单发布","List Release"),
+    LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirm"),
+    DESIGN_DEADLINE("设计核查","Design Check"),
+    PREHOMO_DEADLINE("摸底开始","Pre-Homo Starts"), // name:Pre-Homo   value:Pre-Homo
+    ATTESTATION_START_TIME("认证开始","Homo Starts"),//  name:认证开始   value:Certification begins
+    VERIFY_DEADLINE("验证核查","Validation Check"),
+    CERTIFICATION_SUBMISSION("认证提交","Application Submitted"),
+    LOCALAPPROVAL_1("地方批准1","Local Approval 1"),
+    LOCALAPPROVAL_2("地方批准2","Local Approval 2"),
     G_ZERO("G0","G0"),
     G_ONE("G1","G1"),
     G_TWO("G2","G2"),
@@ -26,6 +28,7 @@ public enum ProjectTaskPlanningNameEnum {
     G_FIVE("G5","G5"),
     G_SIX("G6","G6"),
     G_SEVEN("G7","G7"),
+    G_MP("MP","MP"),
 
 //    VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"),
     ;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
index f30894f6b..515c52d2c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
@@ -203,7 +203,6 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	 * @return
 	 */
 	public boolean checkData(String projectLibraryId,String id,String cut){
-		boolean result = false;
 		int roleCode = checkUserRole(projectLibraryId);
 		if(roleCode != Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
 			String message = "";
@@ -215,31 +214,31 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 			throw new JeroBootException(message);
 		}
 
-		try{
-			if(StringUtils.isNotEmpty(id)){
-				QueryWrapper<ProjectCertificationDirectoryEO> queryWrapper = new QueryWrapper<>();
-				queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getId,id);
-				LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-				queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getCreateBy,currentUser.getUsername());
-				Integer integer = this.baseMapper.selectCount(queryWrapper);
-				if(integer > 0){
-					result = true;
-				}else {
-					String message = "";
-					if(StringUtils.equals(cut, CutEnum.CN.getValue())){
-						message = "用户只能对自己创建的数据进行操作。";
-					}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
-						message = "Users can only operate data created by themselves.";
-					}
-					throw new JeroBootException(message);
-				}
-			}else {
-				result = true;
-			}
-		}catch (Exception ex){
-			log.error("验证项目库-认证目录数据异常：" + ex.getMessage());
-			throw new JeroBootException("验证项目库-认证目录数据异常！");
-		}
-		return result;
+//		try{
+//			if(StringUtils.isNotEmpty(id)){
+//				QueryWrapper<ProjectCertificationDirectoryEO> queryWrapper = new QueryWrapper<>();
+//				queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getId,id);
+//				LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//				queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getCreateBy,currentUser.getUsername());
+//				Integer integer = this.baseMapper.selectCount(queryWrapper);
+//				if(integer > 0){
+//					result = true;
+//				}else {
+//					String message = "";
+//					if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+//						message = "用户只能对自己创建的数据进行操作。";
+//					}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
+//						message = "Users can only operate data created by themselves.";
+//					}
+//					throw new JeroBootException(message);
+//				}
+//			}else {
+//				result = true;
+//			}
+//		}catch (Exception ex){
+//			log.error("验证项目库-认证目录数据异常：" + ex.getMessage());
+//			throw new JeroBootException("验证项目库-认证目录数据异常！");
+//		}
+		return true;
 	}
 }
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 c1076d716..158d627ff 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
@@ -392,27 +392,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
 			if(allList.size()>0){
 				if(!allList.contains(dutyPerson)){
-
-					if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
-						if(relatedPersonnel.getEngineeringInterfacePerson() != null){
-							String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson();
-							relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
-						}else {
-							relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
-						}
-					}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
-						if(relatedPersonnel.getEngineerLawSet() != null){
-							String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet();
-							relatedPersonnel.setEngineerLawSet(engineerLawSet);
-						}else {
-							relatedPersonnel.setEngineerLawSet(dutyPerson);
-						}
-					}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
-						if(relatedPersonnel.getEngineerAttSet() !=null){
-							String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet();
-							relatedPersonnel.setEngineerAttSet(engineerAttSet);
-						}else {
-							relatedPersonnel.setEngineerAttSet(dutyPerson);
+					if (StringUtils.isNotEmpty(roleCode)) {
+						if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
+							if(relatedPersonnel.getEngineeringInterfacePerson() != null){
+								String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson();
+								relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
+							}else {
+								relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
+							}
+						}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
+							if(relatedPersonnel.getEngineerLawSet() != null){
+								String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet();
+								relatedPersonnel.setEngineerLawSet(engineerLawSet);
+							}else {
+								relatedPersonnel.setEngineerLawSet(dutyPerson);
+							}
+						}else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
+							if(relatedPersonnel.getEngineerAttSet() !=null){
+								String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet();
+								relatedPersonnel.setEngineerAttSet(engineerAttSet);
+							}else {
+								relatedPersonnel.setEngineerAttSet(dutyPerson);
+							}
 						}
 					}
 				}
@@ -5935,7 +5936,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	public void syncProcessInfoDetailEndTime(Date newEndTime, List<ProjectCertificationInventoryEO> pciEoList) {
 		pciEoList = pciEoList.stream().filter(pciEo -> {
 			boolean flag = false;
-			if(!newEndTime.equals(pciEo.getEndTime())){
+			if(null != newEndTime && !newEndTime.equals(pciEo.getEndTime())){
 				flag = true;
 			}
 			return flag;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 781436b00..0ca361866 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -618,29 +618,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				if (allList.size() > 0) {
 					for (String allDuty : allDutyList) {
 						String dutyPerson = allDuty;
-						if (!StringUtils.isEmpty(dutyPerson)) {
-							if (!allList.contains(dutyPerson)) {
-								if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
-									if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
-										String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
-										relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
-									} else {
-										relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
-									}
-								} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
-									if (relatedPersonnel.getEngineerLawSet() != null) {
-										String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
-										relatedPersonnel.setEngineerLawSet(engineerLawSet);
-									} else {
-										relatedPersonnel.setEngineerLawSet(dutyPerson);
-									}
-								} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
-									if (relatedPersonnel.getEngineerAttSet() != null) {
-										String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
-										relatedPersonnel.setEngineerAttSet(engineerAttSet);
-									} else {
-										relatedPersonnel.setEngineerAttSet(dutyPerson);
-									}
+						if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) {
+							if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+								if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
+									String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
+									relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
+								} else {
+									relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
+								}
+							} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
+								if (relatedPersonnel.getEngineerLawSet() != null) {
+									String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
+									relatedPersonnel.setEngineerLawSet(engineerLawSet);
+								} else {
+									relatedPersonnel.setEngineerLawSet(dutyPerson);
+								}
+							} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
+								if (relatedPersonnel.getEngineerAttSet() != null) {
+									String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
+									relatedPersonnel.setEngineerAttSet(engineerAttSet);
+								} else {
+									relatedPersonnel.setEngineerAttSet(dutyPerson);
 								}
 							}
 						}
@@ -928,7 +926,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 
 				String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId();
-				// 给法规工程师发消息
+				// 给设计符合性-责任人发消息
 				Map<String, Object> params = new HashMap<>();
 				params.put("contentCn", "您好，您以下任务已被发起人撤回。");
 				params.put("contentEn", "Hello! Your task has been withdrawn by the initiator.");
@@ -936,6 +934,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime", endTime);
 				params.put("userIdList", Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(",")));
 				params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber());
+				params.put("flowTypeCn","设计符合性流程");
+				params.put("flowTypeEn","Design Compliance Process");
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -952,7 +952,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
 					params.put("Initiator", regulationOwnerUserName);
 
-					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
+					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
 				}
 			}
 		}
@@ -970,7 +970,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 
 				String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId();
-				// 给法规工程师发消息
+				// 给设计符合性-责任人发消息
 				Map<String, Object> params = new HashMap<>();
 				params.put("contentCn", "您好，您以下任务已被发起人撤回。");
 				params.put("contentEn", "Hello! Your task has been withdrawn by the initiator.");
@@ -978,6 +978,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime", endTime);
 				params.put("userIdList", Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(",")));
 				params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber());
+				params.put("flowTypeCn","设计符合性流程");
+				params.put("flowTypeEn","Design Compliance Process");
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -994,7 +996,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
 					params.put("Initiator", regulationOwnerUserName);
 
-					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
+					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
 				}
 			}
 		}
@@ -4429,171 +4431,165 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 
-			String DesdutyId = projectLawsInventoryEOList.get(0).getDesignDutyId();
-			String VerdutyId = projectLawsInventoryEOList.get(0).getVerifyDutyId();
+			String desdutyId = projectLawsInventoryEO.getDesignDutyId();
+			String verdutyId = projectLawsInventoryEO.getVerifyDutyId();
 
 			List<String> dutyTerritoryList = new ArrayList<>();
 			//获取批量设置中责任领域
-			String dutyTerritory = projectLawsInventoryEOList.get(0).getDutyTerritory();
-			if (!StringUtils.isEmpty(dutyTerritory)) {
+			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			if (StringUtils.isNotEmpty(dutyTerritory)) {
 				for (ProjectLawsInventoryEO info : infoList) {
 					info.setDutyTerritory(dutyTerritory);
 				}
-			}
-			if (!StringUtils.isEmpty(DesdutyId)) {
+				dutyTerritoryList = Arrays.asList(dutyTerritory.split(","));
+			} else {
 				for (ProjectLawsInventoryEO info : infoList) {
-					info.setDesignDutyId(DesdutyId);
-				}
-			}
-			if (!StringUtils.isEmpty(VerdutyId)) {
-				for (ProjectLawsInventoryEO info : infoList) {
-					info.setVerifyDutyId(VerdutyId);
+					if (StringUtils.isNotEmpty(info.getDutyTerritory())) {
+						dutyTerritoryList.addAll(Arrays.asList(info.getDutyTerritory().split(",")));
+					}
 				}
 			}
 
-			if (!StringUtils.isEmpty(dutyTerritory)) {
-				dutyTerritoryList = Arrays.asList(dutyTerritory.split(","));
-				dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
-			} else {
+			dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
+
+			if (StringUtils.isNotEmpty(desdutyId)) {
 				for (ProjectLawsInventoryEO info : infoList) {
-					List<String> dutyList = new ArrayList<>();
-					dutyList = Arrays.asList(info.getDutyTerritory().split(","));
-					dutyTerritoryList.addAll(dutyList);
+					info.setDesignDutyId(desdutyId);
+				}
+			}
+			if (StringUtils.isNotEmpty(verdutyId)) {
+				for (ProjectLawsInventoryEO info : infoList) {
+					info.setVerifyDutyId(verdutyId);
 				}
-				dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
 			}
 
 //			获取当前的projectLibrartId
-			String projectLibrartId = infoEOList.get(0).getProjectLibraryId();
-			String cut = infoEOList.get(0).getCut();
+			String projectLibrartId = infoList.get(0).getProjectLibraryId();
+			String cut = projectLawsInventoryEO.getCut();
 			Map<String, Object> params = new HashMap<>();
 			params.put("projectLibraryId", projectLibrartId);
 			params.put("userId", currentUser.getId());
 			params.put("modelType", RoleRelModelTypeEnum.LAWS_INVENTORY.getValue());
 			ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.queryByProjectLibraryIdAndUserId(params);
+
+			//获取当前项目库id的studio工程师和认证工程师
+			List<String> studionList = new ArrayList<>();
+			List<String> certificationEngineerList = new ArrayList<>();
+			List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut);
+
 			String roleCode1 = projectLibraryRoleRelEO.getRoleCode();
+			if(CollectionUtils.isNotEmpty(dutyTerritoryList)){
+				//获取相关责任领域下的和projectLibrartId的相关人员名单的信息
+				List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList);
+				if(CollectionUtils.isNotEmpty(projectRelatedPersonnelList)){
+					List<ProjectRelatedPersonnel> updatePrpEoList = new ArrayList<>();
 
-			//获取相关责任领域下的和projectLibrartId的相关人员名单的信息
-			List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList);
+					for (ProjectLawsInventoryEO projectLawsInventoryEO1 : infoList) {
 
-			List<ProjectRelatedPersonnel> list = new ArrayList<>();
+						//分别获取当前编辑中的设计符合性和认证符合性责任人
+						List<String> designDutyIdList = new ArrayList<>();
+						if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getDesignDutyId())) {
+							designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(","));
+						}
 
-			for (ProjectLawsInventoryEO projectLawsInventoryEO1 : infoList) {
+						List<String> verifyDutyIdList = new ArrayList<>();
+						if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getVerifyDutyId())) {
+							verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(","));
+						}
 
-				//分别获取当前编辑中的设计符合性和认证符合性责任人
-				List<String> designDutyIdList = new ArrayList<>();
-				designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(","));
-				List<String> verifyDutyIdList = new ArrayList<>();
-				verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(","));
+						//allDutyList 为法规工程师中验证符合性和确认符合中的责任人
+						List<String> allDutyList = new ArrayList<>();
+						allDutyList.addAll(designDutyIdList);
+						allDutyList.addAll(verifyDutyIdList);
+						allDutyList = allDutyList.stream().distinct().collect(Collectors.toList());
 
-				//allDutyList 为法规工程师中验证符合性和确认符合中的责任人
-				List<String> allDutyList = new ArrayList<>();
-				allDutyList.addAll(designDutyIdList);
-				allDutyList.addAll(verifyDutyIdList);
-				allDutyList = allDutyList.stream().distinct().collect(Collectors.toList());
+						List<String> allList = new ArrayList<>();
+						List<String> enginnerList = new ArrayList<>();
+						List<String> lawEnginnerList = new ArrayList<>();
+						List<String> enginnerLawSetList = new ArrayList<>();
+						List<String> enginnerAttSetList = new ArrayList<>();
 
-				List<String> allList = new ArrayList<>();
-				List<String> enginnerList = new ArrayList<>();
-				List<String> lawEnginnerList = new ArrayList<>();
-				List<String> enginnerLawSetList = new ArrayList<>();
-				List<String> enginnerAttSetList = new ArrayList<>();
-				//根据相关人员名单获取的工程接口人
-				for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
-					String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson();
-					if (!StringUtils.isEmpty(enginneringInterfacePerson)) {
-						enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList());
-						allList.addAll(enginnerList);
-					}
-				}
-				//获取相关人员名单中的法规工程师
-				for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
-					String lawEngineer = relatedPersonnel.getLawEngineer();
-					if (!StringUtils.isEmpty(lawEngineer)) {
-						lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList());
-						allList.addAll(lawEnginnerList);
-					}
-				}
-				//获取相关人员名单中的工程接口-法规工程师设置
-				for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
-					String engineerLawSet = relatedPersonnel.getEngineerLawSet();
-					if (!StringUtils.isEmpty(engineerLawSet)) {
-						enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList());
-						allList.addAll(enginnerLawSetList);
-					}
-				}
-				//获取相关人员名单中的工程接口-认证工程师设置
-				for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
-					String engineerAttSet = relatedPersonnel.getEngineerAttSet();
-					if (!StringUtils.isEmpty(engineerAttSet)) {
-						enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList());
-						allList.addAll(enginnerAttSetList);
-					}
-				}
-				//获取当前项目库id的studio工程师和认证工程师
-				List<String> studionList = new ArrayList<>();
-				List<String> certificationEngineerList = new ArrayList<>();
-				List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut);
-				for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) {
-					studionList.add(projectLibraryBase.getStudioEngineer());
+						for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
+							// 工程接口人
+							String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson();
+							if (!StringUtils.isEmpty(enginneringInterfacePerson)) {
+								enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList());
+								allList.addAll(enginnerList);
+							}
 
-					String certificationEngineer = projectLibraryBase.getCertificationEngineer();
-					if (!StringUtils.isEmpty(certificationEngineer)) {
-						certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList());
-						allList.addAll(certificationEngineerList);
-					}
-				}
-				allList = allList.stream().filter(all -> {
-					return StringUtils.isNotBlank(all);
-				}).distinct().collect(Collectors.toList());
-			/*
-			for(String all : allList){
-				if(all.equals("")){
-					allList.remove(all);
-				}
-			}
-			*/
-				//遍历所有人alllist中是否包含责任人,如果包含，不用操作。
-				//-------如果不包含,再去判断当前用户的角色是studio、法规还是认证
-				for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
-					if (allList.size() > 0) {
-						for (String allDuty : allDutyList) {
-							String dutyPerson = allDuty;
-							if (!StringUtils.isEmpty(dutyPerson)) {
-								if (!allList.contains(dutyPerson)) {
-									if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
-										if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
-											String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
-											relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
-										} else {
-											relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
-										}
-									} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
-										if (relatedPersonnel.getEngineerLawSet() != null) {
-											String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
-											relatedPersonnel.setEngineerLawSet(engineerLawSet);
-										} else {
-											relatedPersonnel.setEngineerLawSet(dutyPerson);
-										}
-									} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
-										if (relatedPersonnel.getEngineerAttSet() != null) {
-											String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
-											relatedPersonnel.setEngineerAttSet(engineerAttSet);
-										} else {
-											relatedPersonnel.setEngineerAttSet(dutyPerson);
+							// 法规工程师
+							String lawEngineer = relatedPersonnel.getLawEngineer();
+							if (!StringUtils.isEmpty(lawEngineer)) {
+								lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList());
+								allList.addAll(lawEnginnerList);
+							}
+
+							// 工程接口-法规工程师设置
+							String engineerLawSet = relatedPersonnel.getEngineerLawSet();
+							if (!StringUtils.isEmpty(engineerLawSet)) {
+								enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList());
+								allList.addAll(enginnerLawSetList);
+							}
+
+							// 工程接口-认证工程师设置
+							String engineerAttSet = relatedPersonnel.getEngineerAttSet();
+							if (!StringUtils.isEmpty(engineerAttSet)) {
+								enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList());
+								allList.addAll(enginnerAttSetList);
+							}
+						}
+
+						for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) {
+							studionList.add(projectLibraryBase.getStudioEngineer());
+
+							String certificationEngineer = projectLibraryBase.getCertificationEngineer();
+							if (!StringUtils.isEmpty(certificationEngineer)) {
+								certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList());
+								allList.addAll(certificationEngineerList);
+							}
+						}
+						allList = allList.stream().filter(all -> {
+							return StringUtils.isNotBlank(all);
+						}).distinct().collect(Collectors.toList());
+						//遍历所有人alllist中是否包含责任人,如果包含，不用操作。
+						//-------如果不包含,再去判断当前用户的角色是studio、法规还是认证
+						for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) {
+							if (allList.size() > 0) {
+								for (String allDuty : allDutyList) {
+									String dutyPerson = allDuty;
+									if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) {
+										if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
+											if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
+												String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
+												relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
+											} else {
+												relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
+											}
+										} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
+											if (relatedPersonnel.getEngineerLawSet() != null) {
+												String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
+												relatedPersonnel.setEngineerLawSet(engineerLawSet);
+											} else {
+												relatedPersonnel.setEngineerLawSet(dutyPerson);
+											}
+										} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
+											if (relatedPersonnel.getEngineerAttSet() != null) {
+												String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
+												relatedPersonnel.setEngineerAttSet(engineerAttSet);
+											} else {
+												relatedPersonnel.setEngineerAttSet(dutyPerson);
+											}
 										}
 									}
 								}
 							}
 						}
+
+						updatePrpEoList.addAll(projectRelatedPersonnelList);
 					}
+					this.projectRelatedPersonnelService.updateBatchById(updatePrpEoList);
 				}
-
-				list.addAll(projectRelatedPersonnelList);
-//				this.projectRelatedPersonnelService.updateBatchById(projectRelatedPersonnelList);
 			}
-			this.projectRelatedPersonnelService.updateBatchById(list);
-
-
 			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
 				//更新三个符合性流程中的处理人。
 				this.updateFlowInfo(projectLawsInventory);
@@ -6846,7 +6842,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			params.put("projectLawsInventoryIds", projectLawsInventoryIds);
 			params.put("pIds", pIds);
 			//根据流程实例id 、 法规清单id  删除相关流程。
-			workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params);
+//			workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params);
 
 			//清除流程中心对应的数据
 			params.put("ids", ids);
@@ -10688,7 +10684,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
 
 				List<String> userIdList = Arrays.asList(verifyDutyId.split(","));
-				// 给设计符合性流程责任人发消息
+				// 给验证符合性流程责任人发消息
 				Map<String, Object> params = new HashMap<>();
 				params.put("contentCn", "您好，请及时查看确认以下任务要求，谢谢！");
 				params.put("contentEn", "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!");
@@ -10696,6 +10692,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime", endTime);
 				params.put("userIdList", userIdList);
 				params.put("serialNumbers", serialNumbers);
+				params.put("flowTypeCn","验证符合性流程");
+				params.put("flowTypeEn","Validation Compliance Process");
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -10714,7 +10712,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
 					params.put("Initiator", regulationOwnerUserName);
 
-					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
+					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
 				}
 			}
 		}
@@ -10950,6 +10948,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("endTime", endTime);
 				params.put("userIdList", userIdList);
 				params.put("serialNumbers", serialNumbers);
+				params.put("flowTypeCn","设计符合性流程");
+				params.put("flowTypeEn","Design Compliance Process");
 
 				ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
 				if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -10968,7 +10968,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
 					params.put("Initiator", regulationOwnerUserName);
 
-					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
+					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
 				}
 			}
 		}
@@ -11729,6 +11729,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		List<String> userIdList = new ArrayList<>();
 		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 
+		//交付物类型为NA，写远了不好找，写在这里方便以后优化
+		String naType = "1645667531513237506";
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
 			//未发起或拒绝 可以发起清单确认
 			boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
@@ -11739,15 +11741,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//如果该数据的法规工程师不为空
 			boolean checkUser = (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()));
 			if (checkStatus && checkUser) {
-				if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+				//如果交付物为NA则流程状态直接为不涉及
+				if(StringUtils.equals(projectLawsInventoryEO.getDesignDeliverableType(),naType)){
+					projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
+				}else if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
 						|| StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())) {
 					projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				}
-				if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+				if(StringUtils.equals(projectLawsInventoryEO.getVerifyDeliverableType(),naType)){
+					projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
+				}else if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
 						|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())) {
 					projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 				}
-
 				projectLawsInventoryEO.setInventoryAffirmDueDate(endTime);
 
 				userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
@@ -12917,6 +12923,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						if (CollectionUtils.isNotEmpty(pliEoListTemp)) {
 							ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
 
+							Map<String, Object> params = new HashMap<>();
+
 							String endTime = "";
 							String contentCn = "";
 							String contentEn = "";
@@ -12924,9 +12932,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							String taskDefinitionKey = pidEo.getTaskDefinitionKey();
 							if (StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.ZRRQR.getValue())
 									|| StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.DEZRRQR.getValue())) {
+
+								params.put("flowTypeCn","设计符合性流程");
+								params.put("flowTypeEn","Design Compliance Process");
 								contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
 								contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!";
-								templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue();
+								templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue();
 								endTime = DateUtils.formatDate(pliEoTemp.getDesignDutyDueDate());
 							} else if (StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
 									|| StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())) {
@@ -12936,7 +12947,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								endTime = DateUtils.formatDate(pliEoTemp.getDesignDueDate());
 							}
 
-							Map<String, Object> params = new HashMap<>();
 							params.put("userIdList", Arrays.asList(designTransferUserId.split(",")));
 							params.put("projectLibraryId", projectLibraryId);
 							params.put("endTime", endTime);
@@ -13023,6 +13033,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						if (CollectionUtils.isNotEmpty(pliEoListTemp)) {
 							ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
 
+							Map<String, Object> params = new HashMap<>();
+
 							String endTime = "";
 							String contentCn = "";
 							String contentEn = "";
@@ -13030,9 +13042,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							String taskDefinitionKey = pidEo.getTaskDefinitionKey();
 							if (StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.ZRRQR.getValue())
 									|| StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.DEZRRQR.getValue())) {
+								params.put("flowTypeCn","验证符合性流程");
+								params.put("flowTypeEn","Validation Compliance Process");
+
 								contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
 								contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!";
-								templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue();
+								templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue();
 								endTime = DateUtils.formatDate(pliEoTemp.getVerifyDutyDueDate());
 							} else if (StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
 									|| StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())) {
@@ -13042,7 +13057,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								endTime = DateUtils.formatDate(pliEoTemp.getVerifyDueDate());
 							}
 
-							Map<String, Object> params = new HashMap<>();
 							params.put("userIdList", Arrays.asList(verifyTransferUserId.split(",")));
 							params.put("projectLibraryId", projectLibraryId);
 							params.put("endTime", endTime);
@@ -13433,6 +13447,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			dutyTerritoryStr = projectLawsInventoryEO.getDutyTerritory();
 			projectLawsInventoryEO.setDutyTerritory(null);
 		}
+		String designFlowStatusStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignFlowStatus())) {
+			designFlowStatusStr = projectLawsInventoryEO.getDesignFlowStatus();
+			projectLawsInventoryEO.setDesignFlowStatus(null);
+		}
+		String verifyFlowStatusStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyFlowStatus())) {
+			verifyFlowStatusStr = projectLawsInventoryEO.getVerifyFlowStatus();
+			projectLawsInventoryEO.setVerifyFlowStatus(null);
+		}
 
 		// 根据一级责任领域（统计节点），查询该一级责任领域下所有子责任领域的法规清单数据。
 		if(StringUtils.isNotEmpty(projectLawsInventoryEO.getFirstLevelDutyTerritory())){
@@ -13467,6 +13491,35 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			});
 		}
+		if (StringUtils.isNotEmpty(designFlowStatusStr)) {
+			String finalDesignFlowStatusStr = designFlowStatusStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getDesignFlowStatus, finalDesignFlowStatusStr);
+				if(StringUtils.contains(finalDesignFlowStatusStr,",")){
+					String[] designFlowStatusArr = finalDesignFlowStatusStr.split(",");
+					for (String dsf : designFlowStatusArr) {
+						query.or(q -> {
+							q.like("design_flow_status",dsf);
+						});
+					}
+				}
+			});
+		}
+		if (StringUtils.isNotEmpty(verifyFlowStatusStr)) {
+			String finalVerifyFlowStatusStr = verifyFlowStatusStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getVerifyFlowStatus, finalVerifyFlowStatusStr);
+				if(StringUtils.contains(finalVerifyFlowStatusStr,",")){
+					String[] verifyFlowStatusArr = finalVerifyFlowStatusStr.split(",");
+					for (String vsf : verifyFlowStatusArr) {
+						query.or(q -> {
+							q.like("verify_flow_status",vsf);
+						});
+					}
+				}
+			});
+		}
+
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
 		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 03acddbfc..0ba3101b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -2055,7 +2055,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	private void projectDetailsStatisticsGroupByTerritoryHearSort(List<Map<String, Object>> dataList,Map<String,Object> params) {
 		String orderByField = (String) params.get("orderByField");
 		String orderBy = (String) params.get("orderBy");
-		if(CollectionUtils.isNotEmpty(dataList) && StringUtils.isNotEmpty(orderByField) && StringUtils.isNotEmpty(orderBy)){
+		if(CollectionUtils.isNotEmpty(dataList)){
 			Collator comparator = Collator.getInstance(Locale.CHINESE);
 			Collections.sort(dataList,(data1,data2)->{
 				String param1 = "";
@@ -2064,21 +2064,31 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				if("dutyTerritoryName".equals(orderByField)){
 					param1 = StringUtils.isNotEmpty((String) data1.get("dutyTerritoryName")) ? (String) data1.get("dutyTerritoryName") : "";
 					param2 = StringUtils.isNotEmpty((String) data2.get("dutyTerritoryName")) ? (String) data2.get("dutyTerritoryName") : "";
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return comparator.compare(param1,param2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return comparator.compare(param2,param1);
+					}
 				}
 				// 数量
-				if("amount".equals(orderByField)){
-					param1 = StringUtils.isNotEmpty(String.valueOf(data1.get("amount"))) ? String.valueOf(data1.get("amount")) : "";
-					param2 = StringUtils.isNotEmpty(String.valueOf(data2.get("amount"))) ? String.valueOf(data2.get("amount")) : "";
+				if(StringUtils.isEmpty(orderByField) || "amount".equals(orderByField)){
+					double p1 = data1.get("amount") != null ? (double) data1.get("amount") : 0;
+					double p2 = data2.get("amount") != null ? (double) data2.get("amount") : 0;
+					if(StringUtils.isEmpty(orderBy) || OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return (int)(p1 - p2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return (int)(p2 - p1);
+					}
 				}
 				// 占比
 				if("percentage".equals(orderByField)){
-					param1 = StringUtils.isNotEmpty((String) data1.get("percentage")) ? (String) data1.get("percentage") : "";
-					param2 = StringUtils.isNotEmpty((String) data2.get("percentage")) ? (String) data2.get("percentage") : "";
-				}
-				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
-					return comparator.compare(param1,param2);
-				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
-					return comparator.compare(param2,param1);
+					double p1 = StringUtils.isNotEmpty((String) data1.get("percentage")) ? Double.parseDouble (((String) data1.get("percentage")).replace("%","")) : 0;
+					double p2 = StringUtils.isNotEmpty((String) data2.get("percentage")) ? Double.parseDouble (((String) data2.get("percentage")).replace("%","")) : 0;
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return (int)(p1 - p2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return (int)(p2 - p1);
+					}
 				}
 				return 0;
 			});
@@ -3016,8 +3026,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		dataRow.createCell(3).setCellValue(submitAmount);
 		dataRow.createCell(4).setCellValue(syncReporAmount);
 		double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-		double parameterCollectingPercentage = (syncReporAmount / parameterCollectingCount) * 100;
-		String parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
+		double completionCount = submitAmount + syncReporAmount;
+		double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
+		String parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
 		dataRow.createCell(5).setCellValue(parameterCollectingPercentageStr + percentSign);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index bc204e2b7..792951058 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -15,6 +15,7 @@ import com.jero.modules.cert.collect.entity.ParamsManifestEO;
 import com.jero.modules.cert.collect.enums.CollectManifestStatisticsStateEnum;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsManifestEOService;
+import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.project.entity.*;
 import com.jero.modules.project.enums.*;
@@ -50,6 +51,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
@@ -171,7 +173,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
                 }
             }
-            Collections.sort(projectLibraryBaseList);
+            //Collections.sort(projectLibraryBaseList);
+
 
             List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
@@ -194,6 +197,67 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 }
             }
         }
+        Collections.sort(result, new Comparator<Map<String,Object>>() {
+            @Override
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                ProjectLibraryBase p1 = (ProjectLibraryBase) o1.get("projectInfo");
+                ProjectLibraryBase p2 = (ProjectLibraryBase) o2.get("projectInfo");
+                Date defaultTime = null;
+                try {
+                    defaultTime = sdf.parse("2099-01-01");
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                Date HomoKoTime1 = defaultTime;
+                List<List<TimeNodeVO>> tnvList1 = (List<List<TimeNodeVO>>) o1.get("data");
+                if (CollectionUtils.isNotEmpty(tnvList1)) {
+                    List<TimeNodeVO> tnList1 = tnvList1.get(0);
+                    if (CollectionUtils.isNotEmpty(tnList1)) {
+                        for (TimeNodeVO tnv1 : tnList1) {
+                            if (tnv1.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName())
+                                    || tnv1.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getValue())) {
+                                HomoKoTime1 = tnv1.getTime();
+                            }
+                        }
+                    }
+                }
+                Date HomoKoTime2 = defaultTime;
+                List<List<TimeNodeVO>> tnvList2 = (List<List<TimeNodeVO>>) o2.get("data");
+                if (CollectionUtils.isNotEmpty(tnvList2)) {
+                    List<TimeNodeVO> tnList2 = tnvList2.get(0);
+                    if (CollectionUtils.isNotEmpty(tnList2)) {
+                        for (TimeNodeVO tnv2 : tnList2) {
+                            if (tnv2.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName())
+                                    || tnv2.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getValue())) {
+                                HomoKoTime2 = tnv2.getTime();
+                            }
+                        }
+                    }
+                }
+
+                //首先排序-认证批准
+                if(!HomoKoTime1.equals(HomoKoTime2)){
+                    return HomoKoTime1.compareTo(HomoKoTime2);//升序
+                }
+                if (!p1.getProjectName().equals(p2.getProjectName())) {
+                    return p1.getProjectName().compareTo(p2.getProjectName());//升序
+                }
+                if (!p1.getYearName().equals(p2.getYearName())) {
+                    if (p1.getYearName().length() != p2.getYearName().length()) {
+                        return p1.getYearName().length() - p2.getYearName().length();
+                    } else {
+                        return p1.getYearName().compareTo(p2.getYearName());//升序
+                    }
+                }
+                if (!p1.getTargetMarket().equals(p2.getTargetMarket())) {
+                    return p1.getTargetMarket().compareTo(p2.getTargetMarket());//升序
+                }
+                if (!p1.getProjectVersion().equals(p2.getProjectVersion())) {
+                    return Integer.valueOf(p1.getProjectVersion()) - Integer.valueOf(p2.getProjectVersion());//升序
+                }
+                return 0;
+            }
+        });
         return result;
     }
 
@@ -984,8 +1048,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 syncReporAmount = (double) syncReporMap.get("amount");
 
                 double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-                double parameterCollectingPercentage = ((submitAmount + syncReporAmount) / parameterCollectingCount) * 100;
-                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
+                double completionCount = submitAmount + syncReporAmount;
+                double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
+                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
             }
             dataRow.createCell(51).setCellValue(notStartAmount);
             dataRow.createCell(52).setCellValue(collectingAmount);
@@ -1187,8 +1252,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 double syncReporAmount = (double) syncReporMap.get("amount");
 
                 double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-                double parameterCollectingPercentage = (submitAmount + syncReporAmount) / parameterCollectingCount;
-                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? parameterCollectingPercentage : 0;
+                double completionCount = submitAmount + syncReporAmount;
+                double parameterCollectingPercentage = (completionCount) / parameterCollectingCount;
+                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? parameterCollectingPercentage : 0;
             }
 
             Map<String,Object> certificationProgressMap = this.projectCertificationInventoryEOService.groupByCertificationProgress(pciEos);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
index 478d48fd1..2130aae07 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
@@ -299,6 +299,52 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				timeNodeVOS.add(certificationSubmissionVo);
 			}
 
+			//地方批准1
+			if(ObjectUtils.isNotEmpty(projectTaskPlanning.getLocalapproval1())){
+				TimeNodeVO certificationSubmissionVo = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_1.getName());
+				}else{
+					certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_1.getValue());
+				}
+
+				certificationSubmissionVo.setTime(projectTaskPlanning.getLocalapproval1());
+				if(projectTaskPlanning.getLocalapproval1().after(trueNow)){
+					certificationSubmissionVo.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getLocalapproval1().before(trueNow)){
+					certificationSubmissionVo.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					certificationSubmissionVo.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				certificationSubmissionVo.setProjectId(projectTaskPlanning.getProjectId());
+				certificationSubmissionVo.setG(false);
+				timeNodeVOS.add(certificationSubmissionVo);
+			}
+
+			//地方批准2
+			if(ObjectUtils.isNotEmpty(projectTaskPlanning.getLocalapproval2())){
+				TimeNodeVO certificationSubmissionVo = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_2.getName());
+				}else{
+					certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.LOCALAPPROVAL_2.getValue());
+				}
+
+				certificationSubmissionVo.setTime(projectTaskPlanning.getLocalapproval2());
+				if(projectTaskPlanning.getLocalapproval2().after(trueNow)){
+					certificationSubmissionVo.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getLocalapproval2().before(trueNow)){
+					certificationSubmissionVo.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					certificationSubmissionVo.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				certificationSubmissionVo.setProjectId(projectTaskPlanning.getProjectId());
+				certificationSubmissionVo.setG(false);
+				timeNodeVOS.add(certificationSubmissionVo);
+			}
+
 			// G0 - G7
 			if(ObjectUtils.isNotEmpty(projectTaskPlanning.getZero())){
 				TimeNodeVO timeNodeVO = new TimeNodeVO();
@@ -453,6 +499,26 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				timeNodeVOS.add(timeNodeVO);
 			}
 
+			if(ObjectUtils.isNotEmpty(projectTaskPlanning.getMp())){
+				TimeNodeVO timeNodeVO = new TimeNodeVO();
+				if(CutEnum.CN.getValue().equals(cut)){
+					timeNodeVO.setName(ProjectTaskPlanningNameEnum.G_MP.getName());
+				}else{
+					timeNodeVO.setName(ProjectTaskPlanningNameEnum.G_MP.getValue());
+				}
+				timeNodeVO.setTime(projectTaskPlanning.getMp());
+				if(projectTaskPlanning.getMp().after(trueNow)){
+					timeNodeVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getMp().before(trueNow)){
+					timeNodeVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					timeNodeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				timeNodeVO.setProjectId(projectTaskPlanning.getProjectId());
+				timeNodeVO.setG(true);
+				timeNodeVOS.add(timeNodeVO);
+			}
+
 			// 排序
 //				Collections.sort(timeNodeVOS, listConfirmationVO);
 			timeNodeVOS = timeNodeVOS.stream()
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
index adb8eaa99..83914450d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
@@ -44,6 +44,7 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.swing.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -223,7 +224,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 mapSortTemp.put(orderByField,mapSort);
             }
         }else{
-            mapSortTemp.put("issue_time","desc");
+            mapSortTemp.put("create_time","desc");
         }
         sort.putAll(mapSortTemp);
         jsonArrySort.add(sort);
@@ -413,6 +414,8 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         }
         if(StringUtils.isBlank(searchVO.getSelectValue())){
             searchVO.setSelectValue(SEARCH_FLAG);
+        }else{
+            searchVO.setSelectValue(searchVO.getSelectValue().replaceAll("/", "\\\\/"));
         }
 
         //判断索引是否存在
@@ -428,6 +431,9 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         }
         String selectValue = searchVO.getSelectValue();
         String selectValueTwo = searchVO.getSelectValueTwo();
+        if(StringUtils.isNotEmpty(selectValueTwo)){
+            selectValueTwo = selectValueTwo.replaceAll("/", "\\\\/");
+        }
         //1. 需要查询的字段
         List<String> fieldList = new ArrayList<>();
         fieldList.add("serial_number");//权重6
@@ -532,7 +538,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){
             Map<String,Object> createTime = new HashMap<>();
             Map<String,Object> createTime1 = new HashMap<>();
-            createTime.put("order","desc");
+            createTime.put("order", "desc");
             createTime1.put("create_time",createTime);
             sort.putAll(createTime1);
         }else {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index 1a4c5a5aa..d7a52229f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -778,11 +778,11 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						data.setTaskDefinitionKeyName(taskDefinitionKeyName);
 					}
 				}
-				// 如果是清单确认流程，将任务节点设置为  清单校核：Checklist verification
+				// 如果是清单确认流程，将任务节点设置为  verdutyId：Task initiation
 				if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.QDQR.getValue())){
-					String taskDefinitionKeyName = "清单校核";
+					String taskDefinitionKeyName = "任务发起";
 					if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-						taskDefinitionKeyName = "Checklist verification";
+						taskDefinitionKeyName = "Task initiation";
 					}
 					data.setTaskDefinitionKeyName(taskDefinitionKeyName);
 				}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
index 1fd7b4b88..7ab80fe57 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
@@ -98,11 +98,15 @@ public class LawsWarnService {
         //处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
         String flag = String.valueOf(parameter.get("flag"));
         if(StringUtils.equals(flag,"0")){
-            parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
+            if(ObjectUtils.isEmpty(parameter.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){
+                parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
+            }
         } else if(StringUtils.equals(flag,"1")){
-            parameter.put("implement_time",parameter.get("WarnTime"));
+            if(ObjectUtils.isEmpty(parameter.get("implement_time"))){
+                parameter.put("implement_time",parameter.get("WarnTime"));
+            }
         }
-        parameter.remove("WarnTime");
+//        parameter.remove("WarnTime");
 
         String cut = (String) parameter.get("cut");//中英文切换标识
         List<OnlCgformField> onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
@@ -122,6 +126,8 @@ public class LawsWarnService {
                 fieldListNew.add(fieldTemp);
             }
         }
+
+
         //封装查询条件
         String condition = bussDocumentLibraryEOService.getConditionStr(parameter);
         int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
@@ -247,7 +253,9 @@ public class LawsWarnService {
 
                 Date newCarModelDate = null;
                 try {
-                    newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd");
+                    if(ObjectUtils.isNotEmpty(data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){
+                        newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd");
+                    }
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -267,7 +275,9 @@ public class LawsWarnService {
                 }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList());
                 Date implementTime = null;
                 try {
-                    implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd");
+                    if(ObjectUtils.isNotEmpty(data.get("implement_time"))){
+                        implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd");
+                    }
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index c8baa8421..668711b6f 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -282,7 +282,7 @@ jero :
     type: STANDALONE
     enabled: true
   # 文件限制后缀黑名单
-  fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin
+  fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA
   # 跨站白名单
   whiteUrls:
 #cas单点登录
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml
index e42c282f8..dd13647ef 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml
@@ -253,7 +253,7 @@ jero :
     type: STANDALONE
     enabled: true
   # 文件限制后缀黑名单
-  fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin
+  fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA
   # 跨站白名单
   whiteUrls:
 #cas单点登录
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml
index 3c9365ccf..b80f02cb7 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml
@@ -257,7 +257,7 @@ jero :
     type: STANDALONE
     enabled: true
   # 文件限制后缀黑名单
-  fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin
+  fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA
   # 跨站白名单
   whiteUrls:
 #cas单点登录
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1e95b4b86..5a15385a1 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -66,11 +66,11 @@ module.exports = {
   withStart: 'Start with',
   withEnd: 'End with',
   in: 'In',
-  notEqual: 'Not Equal To',
-  granter: 'Greater Than',
-  greaterOrEqual: 'Greater Than Or Equal To',
-  less: 'Less Than',
-  lessOrEqual: 'Less Than Or Equal To',
+  notEqual: 'Not equal to',
+  granter: 'Greater than',
+  greaterOrEqual: 'Greater than or equal to',
+  less: 'Less than',
+  lessOrEqual: 'Less than or equal to',
   user: 'User',
   numericalValue: 'Value',
   not: 'No',
@@ -85,7 +85,7 @@ module.exports = {
   name: 'Name',
   AlreadyExists: 'Already exists, overwrite?',
   SavedSuccessfully: 'Saved',
-  DeleteQuery: 'Delete current Search?',
+  DeleteQuery: 'Delete current search?',
   VersionNotSupported: 'Version Not Supported',
   SaveQueryCriteria: 'Save Search Conditions',
   roleName: 'Role Name',
@@ -114,7 +114,7 @@ module.exports = {
   DeleteMultiplePiecesData: 'Delete Multiple Items',
   CurrentSelection: 'Current Selection',
   Deselect: 'Deselect',
-  enterDepartmentName: 'Please enter Department name',
+  enterDepartmentName: 'Please enter department name',
   addTo: 'Add',
   cancel: 'Cancel',
   checkAll: 'Check All',
@@ -200,7 +200,7 @@ module.exports = {
   enterSearchKeyword: 'Please enter a search keyword',
   enterSearchContent:'Please enter Search Content',
   enterStandard:'Please enter No.',
-  entertitle:'Please enter Title',
+  entertitle:'Please enter title',
   OperationType: 'Operation Type',
   selectOperationType: 'Please select Operation type',
   selectProblemClassification:'Please select Problem Classification',
@@ -314,7 +314,7 @@ module.exports = {
   selectUserRole: 'Please select user role',
   DepartmentAllocation: 'Department Allocation',
   ClickSelectDepartment: 'Click to select a Department',
-  choice: 'Choice',
+  choice: 'Select',
   identity: 'Identity',
   OrdinaryUsers: 'Ordinary Users',
   superior: 'Superior',
@@ -501,8 +501,8 @@ module.exports = {
   feedback: 'Feedback',
   approvalHistory: 'Approval History',
   cannotExceed500characters: 'Cannot Exceed 500 characters',
-  accord: 'Compliance',
-  nonConformity: 'Non-Compliant',
+  accord: 'Compliant',
+  nonConformity: 'Non-compliant',
   Tracked: 'To Be Tracked',
   notInvolved: 'NA',
   Operator: 'Operator',
@@ -531,7 +531,7 @@ module.exports = {
   list: 'List',
   paragraph: 'Paragraph',
   enterNumber: 'Please enter No.',
-  enterTitle: 'Please enter Title',
+  enterTitle: 'Please enter title',
   backDocument: 'Back To Document Library',
   fileName: 'File Name',
   splitTime: 'Split Time',
@@ -601,7 +601,7 @@ module.exports = {
   selectSplitListDisplay: 'Please select whether to split the document list for display',
   selectDisplayList: 'Please select whether to display in list',
   documentSplitDisplay: 'Document splitting module display',
-  VirtualListName: 'Market List',
+  VirtualListName: 'Market Regulation List',
   CertificationListName:'Homologation List',
   listStatus: 'List Status',
   creater: 'Created by',
@@ -615,11 +615,11 @@ module.exports = {
   certificationType: 'Homo Type',
   certificationLevel: 'Homo Level',
   areaOfResponsibility: 'Responsible Field',
-  confirmationOfDesignConformity: 'Design Compliance Check ',
+  confirmationOfDesignConformity: 'Design Compliance Confirmation',
   Deliverables: 'Deliverables',
   personLiable: 'Owner',
   PrehomoConfirmation: 'Pre-Homo Check',
-  verificationAndConformityconfirmation: 'Validation Compliance Check',
+  verificationAndConformityconfirmation: 'Validation Compliance Confirmation',
   StandardImplementationDate: 'Standard Effective Date',
   regulatoryEngineer: 'Regulation Engineer',
   certifiedEngineer: 'Homo Engineer',
@@ -671,7 +671,7 @@ module.exports = {
   GSO: 'GSO',
   onlyOnefileUploaded: 'Only One File can be uploaded',
   typeCannotUploaded: 'This Type of File Cannot be Uploaded',
-  confirmWithdraw: 'Confirm Withdraw ?',
+  confirmWithdraw: 'Confirm to Withdraw ?',
   OperationDetails: 'Operation Details',
   OperationTime: 'Operation Time',
   oneTableAdded: 'Only one table can be added',
@@ -692,7 +692,7 @@ module.exports = {
   initiateListConfirmation: 'Initiate List Confirmation',
   initiateTaskConfirmation: 'Initiate Task Confirmation',
   alteration: 'Change',
-  fixedPlate: 'Final Version',
+  fixedPlate: 'Finalization',
   taskAffirmStatus: 'Task Confirmation Status',
   taskAffirm: 'Task Confirmation',
   listConfirmationStatus: 'List Confirmation Status',
@@ -735,7 +735,7 @@ module.exports = {
   regulatoryTaskConfirmation: 'Regulation Task Confirmed ',
   certificationStart: 'Homo Completed ',
   preHomoCompletion: 'Pre-Homo Completed ',
-  certificationEnd: 'Homo KO',
+  certificationEnd: 'Homo Approved',
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',
@@ -800,7 +800,7 @@ module.exports = {
   Battery: 'Battery',
   Model: 'Model',
   configurationName: 'Configuration Name',
-  historicalVersion: 'Historical Version',
+  historicalVersion: 'History Version',
   configure: 'Configuration',
   parameter: 'Parameter',
   changeExtension: 'Extension',
@@ -859,7 +859,7 @@ module.exports = {
   cannotExceed: 'Cannot Exceed',
   Characters: 'Characters',
   standardInformation: 'Standard Information',
-  VirtualList: 'MarketList',
+  VirtualList: 'Market List',
   importTemplate: 'Import Template',
   verificationConfirmationDeadline: 'Validation Compliance Confirmation Deadline',
   technicalEvaluationResults: 'Technical Evaluation Result',
@@ -894,7 +894,7 @@ module.exports = {
   toBeConfirmed: 'To Be Confirmed',
   designComplianceReview: 'Design Compliance Check',
   preHomeConfirmation: 'Pre-Homo Check',
-  verificationComplianceReview: 'Validation Compliance Check',
+  verificationComplianceReview: 'Validation Compliance Confirmation',
   verificationComplianceExamine:'Validation Compliance Review',
   Deployment: 'Deploy',
   pleaseDesignConformityConfirmation: 'Please complete the data of design compliance confirmation',
@@ -905,14 +905,14 @@ module.exports = {
   VirtualAuthenticationList: 'Virtual Homo List',
   maintainVirtualList: 'Maintain Market List',
   certificationListMaintenance: 'Homo List Maintenance',
-  reasonsForRejection: 'Reasons For Rejection',
-  inconformity: 'Non-Compliant',
+  reasonsForRejection: 'Reason for Rejection',
+  inconformity: 'Non-compliant',
   toTrack: 'To Be Tracked',
   Launch: 'Initiate',
   maintainProgress: 'Maintain Schedule',
-  redSchedule: 'Red: unqualified without available solutions or timeline. ',
-  yellowSchedule: 'Yellow: unqualified and with available solutions and timeline. ',
-  greenRequirements: 'Green: qualified and confirmed.',
+  redSchedule: 'Red: non-compliant, without acceptable solutions or timeline ',
+  yellowSchedule: 'Yellow: non-compliant/to be tracked, with acceptable solutions and timeline ',
+  greenRequirements: 'Green: compliant or meeting the requirements',
   blueUndeterminedState: 'Blue: pending',
   authenticationMessage: 'Homo Parameter Task',
   taskRegulationComplianceTask: 'Regulation Compliance Task',
@@ -953,7 +953,7 @@ module.exports = {
   pleaseSubmitStatus: 'Please change the status of engineering data to Confirmed before submission',
   modelName: 'Model Name',
   modelYear: 'Model Year',
-  NoteConfirmTheChange: 'Note: After resetting, the selected item data will change to a list pending release status, and the historical data will disappear. Please confirm whether to perform a process reset',
+  NoteConfirmTheChange: 'Note: After resetting, the status of the selected items will be changed to To Be Released and the historical data will disappear. Please confirm whether to reset',
   onlyDataChanged: 'Only data with task confirmation status of Accepted can be changed',
   inquiry: 'Inquiry',
   ConfirmationDeadline: 'Confirm Deadline',
@@ -990,7 +990,7 @@ module.exports = {
   Filledreturn: 'Rejected by the applicant',
   Submitted: 'Submitted',
   ReturnedEngineer: 'Rejected by homo engineer',
-  SynchronizedLibrary: 'Synced to library',
+  SynchronizedLibrary: 'Synced to Library',
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
   and: 'And',
@@ -1000,7 +1000,7 @@ module.exports = {
   setCreator: 'Set Creator',
   documentLibraryDetails: 'Document Library Details',
   question: 'Reminder',
-  ConfirmQuestion: 'Confirm Question',
+  ConfirmQuestion: 'Confirm to remind?',
   disableInput: 'Disable Input',
   taskConfirmationDeadline: 'Task Confirmation Deadline',
   OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out',
@@ -1058,7 +1058,7 @@ module.exports = {
   standardNameEn: 'Standard Title En',
   deadlineForComments: 'Deadline for Comments',
   standardNo: 'Standard No.',
-  implemenDate: 'Effective Date',
+  implemenDate: 'Implementation Date',
 //  上报库
   Enable: 'Enable',
   Latestupdatetime: 'Latest Update Time',
@@ -1271,7 +1271,7 @@ module.exports = {
   turnOnAutoMatch:'Turn On Auto Match',
   Adjustareasofresponsibility:'Adjust areas of responsibility',
   regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
-  punctuationmark:'You can only enter English punctuation marks except the # sign and commas',
+  punctuationmark:'You can only enter English punctuation marks except the # sign',
   created: 'Time of Creation',
   updated:'Last Updated',
   OpenOne:'Open',
@@ -1333,6 +1333,7 @@ module.exports = {
   inRecentMonths6:'In recent 6 months',
   inRecentYear1:'In recent 1 year',
   inRecentYear2:'In recent 2 year',
+  inRecentYear3:'In recent 3 year',
   selectAll:'Select All',
   importLocalDisassemblyOrder:'Import local disassembly order',
   notExport:'Not exported',
@@ -1351,14 +1352,14 @@ module.exports = {
   projectVersion:'Project Version',
   softwareVersion:'Homo Software Version',
   versionStatistics:'Version statistics',
-  addSubproject:'Add Subitem',
+  addSubproject:'Add Subproject',
   Topping:'Top',
   cancelTopping:'Cancel Topping',
   relatedProjectVersion:'Related Project Version',
   taskType:'Task Type',
   taskStatus:'Task Status',
   taskConfirmationHandling:'Task confirmation handling',
-  relatedVersion:'Related version',
+  relatedVersion:'Related Version',
   filledBy:'Filled by',
   parameterToBeInitiated:'Parameter to be initiated',
   listTaskConfirmation:'List task confirmation',
@@ -1373,7 +1374,7 @@ module.exports = {
   projectVersion:'Project Version',
   softwareVersion:'Homo Software Version',
   versionStatistics:'Version statistics',
-  addSubproject:'Add Subitem',
+  addSubproject:'Add Subproject',
   Topping:'Top',
   cancelTopping:'Cancel Topping',
   relatedProjectVersion:'Related Project Version',
@@ -1383,12 +1384,12 @@ module.exports = {
   allsubitemsitem:'Delete all subitems under this item?',
   contactTheFounder:'Contact author',
   certificationCategoryNumber: 'certification Category Number',
-  historicalrecord:'Historical Record',
+  historicalrecord:'Revision History',
   Referenceparametercolumn:'Reference Parameter Column',
   Updateparametercolumn:'Update The Parameter Column',
   columnfirst:'Reference the parameter column first',
   columnforced:'Confirm a forced retraction?',
-  customize:'List setting',
+  customize:'List Setting',
   customColumn:'Custom column',
   afterdate:'In... After the date',
   afterdatein:'In... After date (inclusive)',
@@ -1404,10 +1405,10 @@ module.exports = {
   DeliverablesResult:'Delivery Result',
   reportNo:'Report No.',
   productModel:'Product Model',
-  nameOfManufacturer:'Name Of Manufacturer',
+  nameOfManufacturer:'Manufacturer Name',
   regulationNo:'Regulation No.',
   itemInformation:'Item Information',
-  modifyHistory:'Historical Record',
+  modifyHistory:'Revision History',
   returnToStudio:'Return to Studio',
   Approved:'Approved',
   returnedForApproval:'Returned',
@@ -1415,10 +1416,10 @@ module.exports = {
   referenceDeliverables:'Reference Deliverable',
   missionAccepted:'Task Accepted',
   missionRejection:'Task Rejected',
-  turnToDo:'Turn To',
-  initiateTask:'Initiate a Task',
-  compliancereport:'Generate compliance report',
-  todocenter:'To-do center',
+  turnToDo:'Forward',
+  initiateTask:'Initiate Task',
+  compliancereport:'Generate Compliance report',
+  todocenter:'To-Do Center',
   areYouReturnToStudio:'Confirm to return to studio?',
   confirmLaunchTask:'Confirm to initiate a task ?',
   conditionsNotMet:'Conditions not met',
@@ -1426,13 +1427,13 @@ module.exports = {
   onlyProcessReturned:'Only data with a process status of list to be verified and rejected by the responsible person can be initiated, and the delivery type, engineering interface person, responsible person, and deadline cannot be empty',
   confirmToAcceptTheTask:'Confirm to accept the task?',
   confirmRejectTask:'Confirm to reject the task ?',
-  onlyDataStatusConfirmedSelected:'Only data with process status of task to be confirmed can be selected',
-  onlyDataStatusSubmittedCanBeSelected:'Only data with process status of result to be submitted can be selected',
+  onlyDataStatusConfirmedSelected:'Only data with process status of Task to Be Confirmed can be selected',
+  onlyDataStatusSubmittedCanBeSelected:'Only data with process status of Result to Be Submitted can be selected',
   operationWithoutPermission:'No access',
   data:"'s data",
-  confirmApproval:'Confirm pass review?',
-  confirmReturnForApproval:'Confirm Return for review ?',
-  onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected',
+  confirmApproval:'Confirm to approve?',
+  confirmReturnForApproval:'Confirm to reject?',
+  onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of Result to Be Reviewed can be selected',
   confirmResetProcess:'Confirm to reset the process?',
   confirmUrging:'Confirm to remind?',
   confirmWithdrawal:'Confirm to withdraw?',
@@ -1443,16 +1444,16 @@ module.exports = {
   youCannotStatusListToBeReleasedAndApproved:'Data with process status of List to Be Released and Approved cannot be selected',
   batchmodify:'Modify in batch?',
   onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with process status of List to Be Released and Returned in Homo can be selected and the deadline cannot be empty',
-  type:'type',
+  type:'Type',
   select:'select',
-  onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted',
+  onlyDataWithProcessStatusDeleted:'Only data with process status of List to Be Released and Approved can be deleted',
   complianceCertificationProgram:'Compliance & Homologation Program',
-  listPublishing:'List Publishing',
-  responsibilityConfirmation:'Responsibility Confirmation',
-  designVerification:'Design Verification',
-  getStarted:'Get Started',
-  certificationStartOne:'Certification Start',
-  verificationAndVerification:'Verification And Verification',
+  listPublishing:'List Release',
+  responsibilityConfirmation:'Responsibility Confirm',
+  designVerification:'Design Check',
+  getStarted:'Pre-Homo Starts',
+  certificationStartOne:'Homo Starts',
+  verificationAndVerification:'Validation Check',
   projectInterfacePersonRegulationEngineerSetting:'Project Interface Person - Regulation Engineer Setting',
   projectInterfacePersonCertificationEngineerSetting:'Project Interface Person - Certification Engineer Setting',
   registrationnumber:'Product registration number',
@@ -1527,6 +1528,7 @@ module.exports = {
   Taskresponsibilityrecognition:'Responsibility Confirm',
   uploadattachment:'Upload',
   Processhistory:'Process history',
+  historyData:'1. Regulatory Engineer, 2. Responsible person, 3. Responsible person, 4. Regulatory Engineer',
   resultofhandling:'Result of handling',
   cause:'cause',
   networksecurityrequirements:'Network security requirements',
@@ -1670,8 +1672,8 @@ module.exports = {
   Taskconfirmationresult:'Task confirmation result',
   Compliancetaskhandling:'Compliance task handling',
   theDataYouSelectedContainsSkip:'The data selected contains empty deliverable; please confirm whether to skip',
-  designComplianceProcessFor:'Design compliance process for',
-  validationComplianceProcessFor:'Validation compliance process for',
+  designComplianceProcessFor:'Design Compliance Process for',
+  validationComplianceProcessFor:'Validation Compliance Process for',
   thePersonResponsibleForVerifyingEmpty:'The owner for validation compliance process cannot be empty',
   theDeadlineComplianceProcessCannotEmpty:'The deadline for validation compliance process cannot be empty',
   theDeadlineForTheDesignCannotBeEmpty:'The deadline for design compliance process cannot be empty',
@@ -1696,7 +1698,7 @@ module.exports = {
   taskNodeMismatch:'Task Node Mismatch',
   ifNot:'If not, fill in "none" or "not involved"',
   designComplianceProcess:'Design Compliance Process',
-  validationComplianceProcess:'Verify Compliance Process',
+  validationComplianceProcess:'Validation Compliance Process',
   onlyDataInTheReminderProcessBanBeProcessed:'Only data in the reminder process can be processed',
   expeditionProcess:'Reminder Process',
   addfunction:'Add function',
@@ -1705,7 +1707,7 @@ module.exports = {
   softwareversion:'Software version',
   returntofill:'Return to fill',
   thereAreCurrentlyNoRegulationsToHandle:'No regulations to be processed now',
-  certificationSubmission:'Certification Submission',
+  certificationSubmission:'Application Submitted',
   upgradecompletion:'Upgrade completion',
   implementedupgrade:'Whether the implemented upgrade is consistent with the record',
   numberofvehicles:'Number of vehicles that have completed upgrades',
@@ -1714,7 +1716,7 @@ module.exports = {
   implementationrecords:'Fault handling measures and emergency response implementation records',
   onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted',
   implementationDateTwo:'Implementation Date',
-  reasonForReturn:'Reason For Return',
+  reasonForReturn:'Reason for Reject',
   pleaseFillInTheInformationTaskProcess:'Please fill in the information of the Eng. Interface and the owner before initiating the task process',
   complianceReporting:'Compliance Reporting',
   youCanOnlySelectStatusClearSubmit:'You can only select data with a process status of Clear to Submit',
@@ -1737,7 +1739,7 @@ module.exports = {
   dykzq:'Corresponding controller',
   releaseRegulatoryList:'Regulation List Release',
   preHomoFlow:'Pre-Homo Process',
-  verifyConformanceConfirmation:'Validation Compliance Check',
+  verifyConformanceConfirmation:'Validation Compliance Confirmation',
   designConformanceVerification:'Design Compliance Check',
   nomorethan:'No more than 10',
   marketCertificationList:'Market Certification List',
@@ -1753,7 +1755,7 @@ module.exports = {
   resultsToBeSubmitted:'Results to be submitted',
   resultsToBeReviewed:'Results to be reviewed',
   compliance:'Compliant',
-  nonCompliance:'Non-Compliant',
+  nonCompliance:'Non-compliant',
   toBeTracked:'To Be Tracked',
   NA:'NA',
   electroniccontrollerparameter:'Electronic controller parameter',
@@ -1839,6 +1841,17 @@ module.exports = {
   toResubmit:'To Resubmit',
   selectDesignConformanceAsConformance:'Select Design Conformance verification process state as Conformance or Verify conformance verification process state as conformance obtained data',
   submissionProcess:'Submission Process',
+  localapproval1:'Local Approval1',
+  localapproval2:'Local Approval2',
+  averageapprovalperiod:'Average approval period',
+  day:'day',
+  passreturntime:'Pass/return time',
+  approvalcycle:'Approval cycle(day)',
+  transittime:'Transit Time',
+  returntime:'Return time',
+  operationguide:'Project operation guide',
+  copyLink:'Copy link',
+  successfulReplication:'Successful replication',
 
   //手机端
   myCollection:'My Collection',
@@ -1884,5 +1897,8 @@ module.exports = {
   browsingTime:'Browsing Time',
   pleaseViewOnPc:'Please view on PC',
   taskHandling:'Task Handling',
-  backToHomePage:'Back to home page',
+  pleaseEnterUserAccountSearchFor:'Please enter a user account to search for',
+  exportOption:'Export Option',
+  includeTitle:'Include title',
+  Notitleincluded:'No title included',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index b36ed1689..7913edf5c 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1985,5 +1985,1883 @@ module.exports = {
   browsingTime:'浏览时间',
   pleaseViewOnPc:'请在pc的查看',
   taskHandling:'任务办理',
-  backToHomePage:'返回首页',
+  notOnlyRz: '否',
+  EnterValue: '请输入值',
+  SavedQuery: '保存的查询',
+  NoQueriesSaved: '没有保存任何查询',
+  SavedName: '保存的名称',
+  CannotQueryEmpty: '不能查询空条件',
+  EmptyCannotSaved: '空条件不能保存',
+  cannotEmpty: '不能为空',
+  name: '名称',
+  AlreadyExists: '已存在，是否覆盖？',
+  SavedSuccessfully: '保存成功',
+  DeleteQuery: '是否删除当前查询',
+  VersionNotSupported: '版本不支持',
+  SaveQueryCriteria: '保存查询条件',
+  roleName: '角色名称',
+  newRole: '新建角色',
+  RoleManagement: '角色管理',
+  toGrantAuthorization: '授权',
+  newUser: '新增用户',
+  ExistingUsers: '已有用户',
+  total: '共',
+  strip: '条',
+  RoleCode: '角色编码',
+  createTime: '创建时间',
+  userName: '用户名称',
+  userManual: '用户手册',
+  selectOneRule: '请选择一个角色！',
+  setAttribute: '请设置url.list2属性!',
+  setDelAttribute: '请设置url.delete2 属性!',
+  setDelBatAttribute: '请设置url.deleteBatch2 属性!',
+  selectARecored: '请选择一条记录！',
+  confirmDeletion: '确认删除',
+  deleteAData: '是否删除选中数据？',
+  AddDepartment: '添加部门',
+  AddSubordinate: '添加下级',
+  DepartmentInformation: '部门信息',
+  BatchDelete: '批量删除',
+  DeleteMultiplePiecesData: '删除多条数据',
+  CurrentSelection: '当前选择',
+  Deselect: '取消选择',
+  enterDepartmentName: '请输入部门名称',
+  addTo: '添加',
+  cancel: '取消',
+  checkAll: '全部勾选',
+  DeselectAll: '取消全选',
+  ExpandAll: '展开所有',
+  MergeAll: '合并所有',
+  TreeOperation: '树操作',
+  essentialInformation: '基本信息',
+  DetailsPhasedImplementation: '分阶段实施详情',
+  Statutenumberclause: '法规编号/条款',
+  Typeofimplementation: '实施类型',
+  ImplementationDate: '实施时间',
+  OrganizationName: '机构名称',
+  EnterOrganizationDepartment: '请输入机构/部门名称',
+  SuperiorDepartment: '上级部门',
+  enterOrganizationCode: '请输入机构编码',
+  nothing: '无',
+  OrganizationType: '机构类型',
+  PleaseSelectOrganizationType: '请选择机构类型',
+  company: '公司',
+  post: '岗位',
+  sort: '排序',
+  enterMobileNumber: '请输入手机号',
+  enterAddress: '请输入地址',
+  address: '地址',
+  remarks: '备注',
+  enterComments: '请输入备注',
+  selectDepartmentFirst: '请先选择一个部门！',
+  OrganizationCode: '机构编码',
+  fax: '传真',
+  enterOrganizationType: '请输入机构类型',
+  sureDeleteSelected: '确定要删除所选中的',
+  pieceData: '条数据，以及子节点数据吗?',
+  selectSuperiorDepartmentFirst: '请先点击选中上级部门',
+  deleteDepartmentData: '确定要删除此部门以及子节点数据吗？',
+  DeleteSucceeded: '删除成功',
+  DeletionFailed: '删除失败',
+  departmentInformationDepartment: '您的部门下暂无有效部门信息',
+  permissionTemporrily: '普通员工暂此权限',
+  DepartmentRole: '部门角色',
+  DictionaryName: '字典名称',
+  DictionaryEnName: '字典英文名称',
+  enterDictionary: '请输入字典名称',
+  enterEnDictionary: '请输入字典英文名称',
+  DictionaryNumber: '字典编号',
+  enterDictionaryNumber: '请输入字典编号',
+  DictionaryInformation: '字典信息',
+  RefreshCache: '刷新缓存',
+  recycleBin: '回收站',
+  DictionaryConfiguration: '字典配置',
+  dataDictionaryPage: '这是数据字典页面',
+  describe: '描述',
+  DescriptionRefreshCache: '刷新缓存完成!',
+  FailedRefreshCache: '刷新缓存失败!',
+  refreshFailed: '刷新失败',
+  ClassificationDictionary: '分类字典',
+  ClassifManagementPage: '分类字典管理页面',
+  ClassificationName: '分类名称',
+  ClassificationCode: '分类编码',
+  AddSubcategory: '添加子分类',
+  DataRules: '数据规则',
+  menuMnagementPage: '这是菜单管理页面',
+  MenuName: '菜单名称',
+  MenuType: '菜单类型',
+  menu: '菜单',
+  ButtonsPermissions: '按钮/权限',
+  ConventionalExport: '常规导出',
+  CustomExport: '自定义导出',
+  CustomTemplateName: '自定义模板名称',
+  assembly: '组件',
+  route: '路径',
+  AddSubmenu: '添加子菜单',
+  NoPicture: '无图片',
+  noFile: '无文件',
+  adadManagementPage: 'adad管理页面',
+  TenantName: '租户名称',
+  TenantNumber: '租户编号',
+  startTime: '开始时间',
+  endTime: '结束时间',
+  LoginLog: '登录日志',
+  OperationLog: '操作日志',
+  SearchLog: '搜索日志',
+  enterSearchKeyword: '请输入搜索关键词',
+  enterSearchContent: '请输入搜索内容',
+  enterStandard: '请输入编号',
+  entertitle: '请输入标题',
+  OperationType: '操作类型',
+  selectOperationType: '请选择操作类型',
+  selectProblemClassification: '请选择问题分类',
+  selectClassification: '请选择分类',
+  selectTranslationResults: '请选择翻译结果',
+  selectMarket: '请选择市场',
+  RequestMethod: '请求方法',
+  RequestParameters: '请求参数',
+  logManagementPage: '这是日志管理页面',
+  LogContent: '日志内容',
+  OperatorID: '操作人ID',
+  OperatorName: '操作人名称',
+  ElapsedTime: '耗时(毫秒)',
+  LogType: '日志类型',
+  tableName: '表名',
+  enterTableName: '请输入表名',
+  DataID: '数据ID',
+  enterID: '请输入ID',
+  DataComparison: '数据比较',
+  DataLogManagementPage: '数据日志管理页面',
+  VersionNumber: '版本号',
+  DataContent: '数据内容',
+  creator: '创建人',
+  selectTwoPiecesData: '请选择两条数据',
+  selectSameDatabase: '请选择相同的数据库表和数据ID进行比较',
+  DataComparison: '数据比较',
+  PromptInformation: '提示信息',
+  enterAccountNumber: '请输入账号',
+  AddExistingUsers: '添加已有用户',
+  newUser: '新建用户',
+  disassociate: '取消关联',
+  AssignDepartmentRoles: '分配部门角色',
+  userDetail: '用户详情',
+  AreYouCancelAssociation: '确定取消与选中部门关联吗?',
+  setURLListAttribute: '请设置url.list属性!',
+  setURLDeletebatchAttribute: '请设置url.deleteBatch属性!',
+  NoDepartmentSelected: '未选中任何部门，无法取消部门与用户的关联!',
+  ConfirmCancellation: '确认取消',
+  CancelAssociation: '是否取消用户与选中部门的关联?',
+  SuccessfullyDeleted: '删除用户与选中部门关系成功！',
+  setURLDeleteAttribute: '请设置url.delete属性!',
+  DepartmentRole: '部门角色分配',
+  DepartmentRoleName: '部门角色名称',
+  enterDepartmentRole: '请输入部门角色',
+  NewDepartmentRole: '新建部门角色',
+  DepartmentRoleInformation: '部门角色信息',
+  DepartmentRoleCode: '部门角色编码',
+  enterUserAccount: '请输入用户账号',
+  NoConfigurableRoles: '无可配置角色！',
+  AreYouWantDiscardEditing: '确定放弃编辑？',
+  determine: '确定',
+  DictionaryCoding: '字典编码',
+  enterDictionaryCode: '请输入字典编码',
+  DictionaryList: '字典列表',
+  enterName: '请输入名称',
+  disable: '禁用',
+  DataValue: '数据值',
+  enterDataValue: '请输入数据值',
+  DictionaryRetrieval: '字典取回',
+  CompletelyDelete: '彻底删除',
+  FirstLevelMenu: '一级菜单',
+  Submenu: '子菜单',
+  ButtonsPermissions: '按钮/权限',
+  enterMenuName: '请输入菜单名称',
+  SuperiorMenu: '上级菜单',
+  selectSuperiorMenu: '请选择上级菜单',
+  selectParentMenu: '请选择父级菜单',
+  MenuPath: '菜单路径',
+  enterMenuPath: '请输入菜单路径',
+  FrontAssembly: '前端组件',
+  enterFrontComponents: '请输入前端组件',
+  DefaultJumpAddress: '默认跳转地址',
+  enterRoutingParameters: '请输入路由参数',
+  AuthorizationID: '授权标识',
+  enterAuthorizationID: '请输入授权标识, 如:',
+  PleaseEnterAuthorizationID: '请输入授权标识！',
+  AuthorizationPolicy: '授权策略',
+  selectAuthorizationPolicy: '请选择授权策略',
+  selectStatus: '请选择状态',
+  MenuIcon: '菜单图标',
+  ClickSelectIcon: '点击选择图标',
+  enterMenuSort: '请输入菜单排序',
+  RouteMenu: '是否路由菜单',
+  HideRoute: '隐藏路由',
+  CacheRoute: '是否缓存路由',
+  AggregateRouting: '聚合路由',
+  OpenMode: '打开方式',
+  external: '外部',
+  inside: '内部',
+  enterMenuTitle: '请输入菜单标题',
+  enterAuthorizationPolicy: '请输入授权策略',
+  AuthorizationIDExists: '授权标识已存在',
+  enterPositiveInteger: '请输入整数',
+  RuleName: '规则名称',
+  enterRuleName: '请输入规则名称',
+  RuleField: '规则字段',
+  enterRuleField: '请输入规则字段',
+  ConditionalRules: '条件规则',
+  enterConditionRule: '请输入条件规则',
+  RuleValue: '规则值',
+  enterRuleValue: '请输入规则值',
+  effective: '有效',
+  invalid: '无效',
+  selectCondition: '请选择条件',
+  DataPermissionRules: '数据权限规则',
+  LoginPassword: '登录密码',
+  enterLoginPassword: '请输入登录密码',
+  ConfirmPassword: '确认密码',
+  reenterLoginPassword: '请重新输入登录密码',
+  enterUserName: '请输入用户姓名',
+  RoleAssignment: '角色配置',
+  selectUserRole: '请选择用户角色',
+  DepartmentAllocation: '部门分配',
+  ClickSelectDepartment: '点击选择部门',
+  choice: '选择',
+  identity: '身份',
+  OrdinaryUsers: '普通用户',
+  superior: '上级',
+  ResponsibleDepartment: '负责部门',
+  selectResponsibleDepartment: '请选择负责部门',
+  selectGender: '请选择性别',
+  mailbox: '邮箱',
+  enterEmailAddress: '请输入邮箱',
+  enterMobileNumber: '请输入手机号码',
+  submit: '提交',
+  passwordConsists: '密码由8位数字、大小写字母和特殊符号组成!',
+  enterUserName: '请输入用户名称',
+  enterJobNumber: '请输入工号',
+  enterCorrectLandline: '请输入正确的座机号码',
+  passwordsEnteredTwice: '两次输入的密码不一样',
+  PnumberExists: '手机号已存在',
+  enterPhoneCorrect: '请输入正确格式的手机号码',
+  MailboxExists: '邮箱已存在',
+  enterMailboxCorrect: '请输入正确格式的邮箱',
+  UserExists: '用户名已存在',
+  nameExists: '工号已存在',
+  uploadPictures: '请上传图片',
+  DepartmentSearch: '部门搜索',
+  selectSuperiorDepartment: '请选择上级部门',
+  upload1: '上传',
+  UploadFailed: '上传失败',
+  ResetPassword: '重新设定密码',
+  ClearSelection: '清空选择',
+  BatchRestore: '批量还原',
+  RestoreUser: '还原用户',
+  FailedQuery: '查询已删除的用户失败：',
+  headPortrait: '头像',
+  RestorUser: '恢复用户',
+  sureRestore: '您确定要恢复这',
+  Users: '个用户吗？',
+  reduction: '还原',
+  UsersSucceeded: '个用户成功!',
+  standard: '编号',
+  title: '标题',
+  TextStatus: '文本状态',
+  PleaseEnter: '请输入',
+  PleaseSelect: '请选择',
+  PleaseEnterOrSelect: '请输入或选择',
+  ModificationTime: '修改时间',
+  ModificationContent: '修改内容',
+  personnel: '人员',
+  dataExport: '数据导出',
+  exportWithFile: '带文件导出',
+  Push: '推送',
+  templateDownload: '模板下载',
+  textInformation: '文本信息',
+  relatedInformation: '关联信息',
+  RetrieveFiles: '调取已入库文件',
+  SplitText: '拆分已入库文本',
+  ImportResults: '导入拆分结果',
+  copy: '复制',
+  TemplateDownload: '模板下载',
+  MergerClause: '合并条款',
+  BatchSetting: '批量设置',
+  BatchCancel: '批量取消收藏',
+  SubscriptionManagement: '订阅领域管理',
+  BatchCancellation: '批量取消',
+  enterMenuEnName: '请输入菜单英文名称',
+  MenuEnName: '菜单英文名称',
+  clickUpload: '点击上传',
+  viewUploadedFiles: '查看已上传文件',
+  standardSelection: '标准选择',
+  Collection: '收藏',
+  CancelCollection: '取消收藏',
+  deleteLib: '删除',
+  subscribe: '订阅',
+  CancelSubscribe: '取消订阅',
+  ConfirmCollection: '确定收藏？',
+  cancelConfirmCollection: '确定取消收藏？',
+  ConfirmSubscribe: '确定订阅?',
+  cancelConfirmSubscribe: '确定取消订阅?',
+  ConfirmDelete: '确定删除?',
+  ConfirmBatchDeletion: '确定批量删除？',
+  download: '下载',
+  UpdateLog: '更新log',
+  DocumentSplitting: '文档拆分',
+  DocumentTranslation: '文档翻译',
+  DocumentComparison: '文档对比',
+  KnowledgeDatabase: '知识问答库',
+  StandardDetails: '标准详情',
+  whole: '全部',
+  DocumentLibrary: '文档库',
+  GeneralExportInformation: '常规导出信息',
+  CustomizeExportInformation: '自定义导出信息',
+  DocumentComparisonLibrary: '文档对比库',
+  weekly: '周报',
+  SyncLibrary: '同步至文档库',
+  check: '校核',
+  enName: '英文名称',
+  selectLeastOne: '请选择至少一条数据',
+  selectFileType: '请选择文件类型',
+  sureVerified: '确定对该文件未进行校验?',
+  sureSynchronize: '该文件未进行校验，确定要同步至文档库?',
+  UploadFile: '上传文件',
+  TagItemManagement: '标签项管理',
+  LabelContentManagement: '标签内容管理',
+  InputBoxType: '输入框类型',
+  DropDownType: '下拉选类型',
+  ExhibitionAreaManagement: '展示区域管理',
+  NewLabelItem: '新增标签项',
+  editLabelItem: '编辑标签项',
+  NodeQuickLookup: '节点快速查找',
+  AreAllLabelsRead: '是否全部标记已读',
+  AllLabelsRead: '标记已读',
+  SubscriptionNotification: '订阅通知',
+  warningInformation: '预警信息',
+  ForwardPush: '转发推送',
+  PleaseSelectData: '请先选择数据',
+  MessageContent: '消息内容',
+  MessageTitle: '消息标题',
+  MessageType: '消息类型',
+  NotificationTime: '通知时间',
+  MessageNotification: '消息通知',
+  MessageCenter: '消息中心',
+  SeeMore: '查看更多',
+  OperationSuccessful: '操作成功',
+  Intheexport: '导出中...',
+  operationFailed: '操作失败',
+  PersonnelSelection: '人员选择',
+  EmployeeNumber: '员工号',
+  EmployeeType: '员工类型',
+  LabeItemName: '标签项名称',
+  PleaseEnterLabelName: '请输入标签名称',
+  DisplayArea: '展示区域',
+  ChineseName: '属性名称',
+  AttributeType: '属性类型',
+  FieldLength: '字段长度',
+  DisplayOrder: '展示顺序',
+  LabelName: '标签名称',
+  LabelType: '标签类型',
+  PleaseSelectLabelType: '请选择标签类型',
+  PleaseEnterDescription: '请输入描述',
+  LengthBe1to100: '长度在 1 - 100字符',
+  Module: '所属模块',
+  PleaseSelectModule: '请选择所属模块',
+  AttributeName: '属性名称',
+  PleaseEnterPropertyName: '请输入属性名称',
+  PleaseEnterYourEnglishName: '请输入英文名称',
+  PleaseSelectAttributeType: '请选择属性类型',
+  OptionContent: '选项内容',
+  PleaseSelectOptionContent: '请选择选项内容',
+  PleaseEnterFieldLength: '请输入字段长度',
+  DisplayOrder: '展示顺序',
+  PleaseEnterDisplayOrder: '请输入展示顺序',
+  Required: '是否必填',
+  DocumentLibraryModuleDisplay: '文档库模块展示',
+  DocumentLibraryListDisplay: '文档库列表展示',
+  SelectWhetherDisplayList: '请选择是否文档库列表展示',
+  SelectDisplayArea: '请选择展示区域',
+  Search: '是否搜索',
+  SelectWhetherToSearch: '请选择是否搜索',
+  DisplayOtherModules: '其它模块展示',
+  RegulationsListDisplay: '法规清单展示',
+  selectDisplayListRegulations: '请选择法规清单是否展示',
+  SearchCenterDisplay: '搜索中心展示',
+  selectSearchCenterDisplayed: '请选择搜索中心是否展示',
+  selectWhetherRequired: '请选择是否必填',
+  SortNumber: '排序号',
+  enterDisplayArea: '请输入展示区域',
+  charactersLength: '长度在 1 - 50字符',
+  enterSortingNumber: '请输入排序号',
+  ParentName: '父级名称',
+  charactersLength130: '长度在 1 - 30字符',
+  charactersLength1to300: '长度在 1 - 300字符',
+  OnlyOneSelected: '只能选择一条数据',
+  OnlyPDF: '只能导入pdf文件',
+  open: '展开',
+  away: '收起',
+  terminationProcess: '终止流程',
+  issue: '下发',
+  projectInformation: '项目信息',
+  standardContent: '标准内容',
+  complianceReview: '符合性审查',
+  reviewResults: '审查结果',
+  selectReviewResult: '请选择审查结果',
+  feedback: '反馈意见',
+  approvalHistory: '审批历史',
+  cannotExceed500characters: '不能超过500个字符',
+  accord: '符合',
+  nonConformity: '不符合',
+  Tracked: '待追踪',
+  notInvolved: '不涉及',
+  toBeConfirmed: '待确认',
+  Operator: '操作人',
+  role: '角色',
+  OperationContent: '操作内容',
+  operationTime: '操作时间',
+  toDoProcess: '待办流程',
+  processDone: '已办流程',
+  sentProcess: '已发流程',
+  monitoringProcess: '监控流程',
+  ConfirmDeployment: '确认部署？',
+  Deployment: '部署',
+  ConfirmReplication: '确认复制？',
+  ProcessName: '流程名称',
+  ProcessType: '流程类型',
+  AddProcess: '添加流程',
+  RelatedItems: '相关项目',
+  Sponsor: '发起人',
+  CurrentProcessor: '当前操作人',
+  LastProcessor: '上一操作人',
+  ProcessingTime: '办理时间',
+  cutoffTime: '截止时间',
+  ProcessStatus: '流程状态',
+  CompletionTime: '完成时间',
+  draft: '草稿',
+  CannotExceed100characters: '不能超过100字符',
+  cantExeed: '不能超过',
+  characters: '字符',
+  Processing: '办理',
+  See: '查看',
+  labelNameCannotDuplicate: '标签名称不能重复',
+  list: '列表',
+  paragraph: '段落',
+  enterNumber: '请输入编号',
+  enterTitle: '请输入标题',
+  backDocument: '回传至文档库',
+  fileName: '文件名称',
+  splitTime: '拆分时间',
+  splitResult: '拆分结果',
+  collectionTime: '收藏时间',
+  split: '拆分',
+  splitFile: '拆分文件',
+  clauseName: '条款名称',
+  clauseContent: '条款内容',
+  newClause: '新增条款',
+  clauseNo: '条款号',
+  functionalAreas: '功能领域',
+  technicalField: '技术领域',
+  informationCategory: '信息类别',
+  contentValidity: '内容简介',
+  TechnicalfieldSupplementCn: '技术领域补充(中文)',
+  TechnicalfieldSupplementEn: '技术领域补充(英文)',
+  content: '内容',
+  Add: '增加',
+  subscriptionTime: '订阅时间',
+  confirmBulkUnsubscribe: '确认批量取消订阅?',
+  BatchCancelCollection: '确认批量取消收藏?',
+  unsubscribeConfirm: '确认取消订阅?',
+  confirmCancelCollection: '确认取消收藏?',
+  theRelease: '发布日期不能大于标 准实施日期',
+  zoneOfApplication: '适用地区',
+  releaseDate: '发布日期',
+  standardImplementationTime: '标准实施时间',
+  onlyPicture: '只能上传图片！',
+  fileUploadFailed: '文件上传失败',
+  deletedSuccessfully: '删除成功',
+  uploadSuccessful: '上传成功',
+  noDelete: '该展示区域有关联数据，无法删除！',
+  numberRows: '行数',
+  numberColumns: '列数',
+  table: '表格',
+  tableRowsColumns: '表格行数列数',
+  addQuantity: '添加数量',
+  enterQuantity: '请输入数量',
+  text: '文本',
+  picture: '图片',
+  searchScope: '检索范围',
+  newNode: '新增节点',
+  modifyNode: '修改节点',
+  deleteNode: '删除节点',
+  ImplementationDate: '新车型实施日期',
+  ImplementationDateOne: '新车型实施日期',
+  vehicleInProductionDate: '在产车实施日期',
+  deleteNodes: '该节点下若有子节点将同步删除，确认删除该条数据？',
+  leastTwo: '请选择至少两条数据',
+  mergeTerms: '确定合并条款',
+  documentSplitTemplate: '文档拆分模板',
+  batSetting: '批量设置',
+  batchSettingInformation: '批量设置信息',
+  batchSettingPersonnel: '批量设置人员',
+  selectDirectoryTerms: '请选择添加条款的目录位置',
+  selectDirectorylocation: '请选择添加文件夹的目录位置',
+  OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
+  OnlyWord: '只能导入word文件',
+  labelAreaDeleted: '若进行删除，则该展示区域下标签项都将被删除',
+  StandardBreakdown: '标准分解单',
+  searchInResults: '结果中检索',
+  searchContent: '搜索内容',
+  viewFile: '查看已上传文件',
+  fileFormatIncorrect: '文件格式不正确',
+  pleaseUploadFile: '请上传文件',
+  documentSplitList: '文档拆分列表展示',
+  selectSplitListDisplay: '请选择是否文档拆分列表展示',
+  selectDisplayList: '请选择是否列表展示',
+  documentSplitDisplay: '文档拆分模块展示',
+  VirtualListName: '市场法规清单名称',
+  CertificationListName: '认证清单名称',
+  VirtualList: '市场清单',
+  listStatus: '清单状态',
+  creater: '创建人',
+  withdraw: '撤回',
+  maintenanceList: '维护清单',
+  instructionForUse: '使用说明',
+  subtitle: '子标题',
+  scopeOfApplication: '适用范围',
+  correspondingStandard: '对应标准',
+  implementationCategory: '实施类别',
+  certificationType: '认证类型',
+  certificationLevel: '认证级别',
+  areaOfResponsibility: '责任领域',
+  confirmationOfDesignConformity: '设计符合性确认',
+  Deliverables: '交付物',
+  personLiable: '责任人',
+  PrehomoConfirmation: 'Pre-Homo确认',
+  verificationAndConformityconfirmation: '验证符合性确认',
+  StandardImplementationDate: '标准实施日期',
+  regulatoryEngineer: '法规工程师',
+  certifiedEngineer: '认证工程师',
+  regulatoryEngineerOrcertifiedEngineer: '法规工程师/认证工程师',
+  judge: '判断',
+  engineeringInterfacePerson: '工程接口人',
+  typeOfDeliverables: '交付物类型',
+  deliverableTemplate: '交付物模板',
+  entryName: '项目名称',
+  targetMarket: '目标市场',
+  projectStatus: '项目状态',
+  StudioEngineer: 'R&H Studio',
+  CertificationTime: '认证时间',
+  NTplatform: 'NT平台',
+  NPplatform: 'NP平台',
+  IPDInformation: 'IPD信息',
+  certificationProgramInformation: '认证计划信息',
+  taskReleaseStatus: '认证发布状态',
+  task: '任务',
+  TaskCutOffTime: '截止时间',
+  Transfer: '调取',
+  CertificationDirectory: '认证目录',
+  TaskRequirements: '任务要求',
+  CertificationProgress: '认证进度',
+  CurrentProjectStatusEvaluation: '当前项目状态评估',
+  NiONumber: 'NIO编号',
+  ParameterName: '参数名称',
+  ParameterDescription: '参数说明',
+  Version: '版本',
+  certificationProgramTime: '认证计划时间',
+  ArchitecturePlatform: '架构平台',
+  ModelPlatform: '车型平台',
+  ListOfRelevantPersonnel: '相关人员名单',
+  DeliverableStatus: '交付物状态',
+  CurrentStatusOfTheProject: '项目当前状态',
+  CurrentStatus: '当前状态',
+  NonConformance: '未符合项',
+  listSubclauses: '清单条目',
+  fileType: '文件类型',
+  view: '查看',
+  KMVSS_Table: 'KMVSS Table',
+  KMVSS_Article: 'KMVSS Article',
+  CFR: 'CFR',
+  UNECE: 'UNECE',
+  JPN_Attachment: 'JPN Attachment',
+  JPN_Article: 'JPN Article',
+  GB: 'GB',
+  GBT: 'GB/T',
+  GSO: 'GSO',
+  onlyOnefileUploaded: '只能上传一个文件',
+  typeCannotUploaded: '不支持上传该类型的文件',
+  confirmWithdraw: '确认撤回？',
+  OperationDetails: '操作详情',
+  OperationTime: '操作时间',
+  oneTableAdded: '只能添加一个表格',
+  addATable: '请添加一个表格',
+  pleaseUploadSplitFile: '请上传拆分文件',
+  release: '发布',
+  confirmRelease: '确认发布？',
+  UploadMost: '最多只能上传二十个',
+  FileUploadFailed: '文件上传失败',
+  FileUploadedSuccessfully: '文件上传成功',
+  DeletedSuccessfully: '删除成功',
+  confirmCopy: '确定复制？',
+  DigitalPlatform: '数字平台',
+  dehicleDevelopmentPlan: '整车开发计划',
+  certificationProgram: '认证计划',
+  DocumentStandard: '文档标准',
+  standardName: '标准名称',
+  initiateListConfirmation: '发起清单确认',
+  initiateTaskConfirmation: '发起任务确认',
+  alteration: '变更',
+  fixedPlate: '定版',
+  taskAffirmStatus: '任务确认状态',
+  taskAffirm: '任务确认',
+  listConfirmationStatus: '清单确认状态',
+  listConfirmation: '清单确认',
+  ListConfirmationDeadline: '清单确认截止时间',
+  dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
+  pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据',
+  pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
+  TheEngineerAndCertification: '的法规工程师不能为空',
+  taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
+  theProjectContactEmpty: '的工程接口人不能为空',
+  PleaseTaskConfirmationRejected: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据',
+  pleaseSelectPersonFirst: '请先选择人员',
+  onlyOnePersonCanBeSelected: '只能选择一个人员',
+  overrule: '驳回',
+  confirmSubmit: '确认提交？',
+  confirmOverrule: '确认驳回？',
+  The: '第',
+  submitted: '条数据已提交不能重复提交',
+  incorrectsubmitted: '条数据状态有误；只能提交状态为待确认或拒绝的数据',
+  basicInformationOfParameters: '项目基本信息',
+  regulatoryCertificationTaskPlan: '法规/认证任务计划',
+  bringInRelevantPersonnel: '带入相关人员',
+  confirmBringInRelevantPersonnel: '确认带入相关人员？',
+  problemType: '问题类型',
+  projectDetails: '项目详情',
+  listOfRegulations: '法规清单',
+  taskList: '任务清单',
+  TaskParameterCollection: '认证参数列表',
+  nonConformance: '未符合项',
+  deadlineForConfirmationOfDesignCompliance: '设计符合性确认截止时间',
+  prehomoConfirmationDeadline: 'Pre-Homo确认截止时间',
+  verificationComplianceConfirmationDeadline: '验证符合性确认截止时间',
+  pleaseEnterTheCorrectWebAddress: '请输入正确的网址',
+  updateTime: '更新时间',
+  comment: '评论',
+  historicalVersion: '历史版本',
+  versionName: '版本名称',
+  finalizationTime: '定版时间',
+  setting: '设定',
+  date: '日期',
+  time: '时间',
+  uploadMaximumATime: '一次最多上传二十张图片',
+
+  time: '时间',
+  confirmationOfRegulationsList: '法规清单确认',
+  regulatoryTaskConfirmation: '法规任务确认',
+  certificationStart: '认证试验结束',
+  preHomoCompletion: '摸底试验结束',
+  certificationEnd: '认证批准',
+  directoryName: '目录名称',
+  batch: '批次',
+  uploadTime: '上传时间',
+  enclosure: '附件',
+  // 认证
+  // 认证状态
+  timeoperation: '时，才有权限操作此按钮。',
+  NiOnumberis: 'NIO编号为',
+  NoOperationPermissionForthisbutton: '没有此按钮的操作权限',
+  Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。',
+  Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。',
+  Datastatusis: '数据状态为',
+  Datastateexcept: '数据状态除了',
+  Dropdownradio: '下拉单选',
+  Dropdownmultipleselection: '下拉多选',
+  a: '+',
+  positiveInteger: '正整数',
+  // 参数收集
+  MaintainConfigureInfo: '维护配置信息',
+  ParameteItemCollectionList: '参数项收集清单',
+  ParameterViewPage: '参数项查看页',
+  Areyousureparameteritems: '确认提交所选参数项嘛?',
+  Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置',
+  NoConfigurationNotStart: '未添加任何配置信息，无法查看',
+  theCurrent: '此数据当前状态为',
+  thisbuttonCompleted: '当状态为"已完成或未收集"时，才可操作此按钮',
+  Frozenstatus: '冻结状态,仅可以查看',
+  chinese: '中文',
+  integerOrDecimal: '整数或小数',
+  OneDecimalPlace: '一位小数',
+  TwoDecimalplaces: '两位小数',
+  Threedecimalplaces: '三位小数',
+  FourDecimalplaces: '四位小数',
+  Positivefloatingpointnumber: '正浮点数',
+  oneconfigurationInformation: '至少含有一个配置信息',
+  Correspondingstandarddeleted: '对应标准已删除',
+  changeTheTitle: '标题已存在，请更换标题',
+  resetPassword: '重置密码',
+  departmentAllocation: '部门配置',
+  ListTitle: '清单标题',
+  CopyProjectCollectionparameters: '复制项目收集参数',
+  from: '从',
+  ReferenceTo: '引用到',
+  checkTheDeadline: '选中参数项收集截止时间',
+  accountNumber: '账号',
+  fullName: '姓名',
+  configurationInformation: '配置信息',
+  modifyprojectInterfacePerson: '修改工程接口人',
+  operatethisbutton: '没有权限操作此按钮',
+  ParameterLibrary: '参数库',
+  referenceparameter: '引用参数',
+  tempSave: '暂存',
+  Assignedby: '分配填写人',
+  CompulsoryWithdrawal: '强制撤回',
+  SynchronousReportLibrary: '同步上报库',
+  FreezeConfiguration: '冻结配置',
+  distributionAndCollection: '下发收集',
+  OneclickCollection: '一键下发收集',
+  deleteConfiguration: '删除配置',
+  addConfiguration: '添加配置',
+  electricMachinery: '电机',
+  Battery: '电池',
+  Model: '车型',
+  configurationName: '配置名称',
+  historicalVersion: '历史版本',
+  configure: '配置',
+  parameter: '参数',
+  changeExtension: '变更扩展',
+  addDetailList: '添加清单',
+  editDetailList: '编辑清单',
+  detailedList: '清单',
+  copyParamDetailList: '复制参数清单',
+  collectionCompletionTime: '收集完成时间',
+  parameterTemplateName: '参数模板名称',
+  onlyThree: '只能输入字母，数字，横杠（-），左斜杠，空格五种内容',
+  templateName: '模板名称',
+  pleaseSelectData: '请选择数据',
+  templateCopy: '模板复制',
+  NiOnumberalreadyexists: 'NIO编号已存在,请更换NIO编号',
+  attachmentTemplate: '附件模板',
+  controlAlternatives: '控件备选值',
+  controlVerification: '控件校验',
+  controlType: '控件类型',
+  certificationCategory: '认证类别',
+  parameterBatch: '参数批次',
+  releaseVersion: '发布版本',
+  parameterTemplate: '参数模板',
+  contentDescription: '内容说明',
+  WhetherMergeParameters: '是否合并参数',
+  merge: '合并',
+  nonjoinder: '不合并',
+  MergeSeparator: '合并分隔符',
+  parameterTemplateExportName: '参数项列表',
+  parameterDataExport: '参数项导出数据',
+  // 参数收集结束
+  circulationInformation: '流转信息',
+  circulationHistory: '流转历史',
+  agree: '同意',
+  disagree: '拒绝',
+  feedbackMessage: '反馈意见',
+  result: '结果',
+  opinion: '意见',
+  OperationNode: '操作节点',
+  selectInquiry: '选择询问人',
+  sendBack: '退回',
+  taskConfirmationProcess: '任务确认流程',
+  notFinished: '未完成',
+  Finished: '已完成',
+  theRequirementst: '工程接口人确认符合性要求',
+  dataLoading: '数据加载中...',
+  Submitting: '提交中...',
+  Returning: '退回中',
+  terminationProcessing: '终止流程中',
+  publishComment: '发表评论',
+  record: '记录',
+  replyToComments: '回复评论',
+  noComment: '暂无评论',
+  theReceived: '所有流程数据均完成任务责任确认节点后才能进行定版操作',
+  notEvaluated: '未评估',
+  cannotExceed: '不能超出',
+  Characters: '个字符',
+  standardInformation: '标准信息',
+  importTemplate: '导入模板',
+  verificationConfirmationDeadline: '验证符合性确认截止时间',
+  technicalEvaluationResults: '技术评估结果',
+  engineeringConfirmation: '工程交付',
+  feedbackFromTheEngineer: '工程师反馈意见',
+  completedBy: '填写人',
+  completedTime: '填写时间',
+  replyFromProjectContactPerson: '责任人回复',
+  answer: '回复',
+  distributionEngineer: '分发工程师',
+  reminderHandling: '提醒办理',
+  addFeedback: '添加反馈',
+  engineer: '工程师',
+  engineeringConfirmationDetails: '工程交付详情',
+  reminder: '提醒',
+  adopt: '通过',
+  reviewedByThePersonInCharge: '负责人审核',
+  onlyDeleted: '只能删除流程未开始和流程结束的数据',
+  experimentPassed: '实验通过',
+  experimentFailed: '实验失败',
+  toBeStarted: '待开始',
+  inProgress: '进行中',
+  Underway: '进行中',
+  green: '绿',
+  red: '红',
+  blue: '蓝',
+  yellow: '黄',
+  resultReported: '结果报告',
+  TheDoesNotContainData: '该市场清单的维护清单中没有数据,是否需要添加',
+  number: '序号',
+  Deadline: '截止时间',
+  designComplianceReview: '设计符合性确认',
+  preHomeConfirmation: 'Pre-Homo确认',
+  verificationComplianceReview: '验证符合性确认',
+  verificationComplianceExamine: '验证符合性审查',
+  pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
+  pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据',
+  pleaseConformityVerification: '请补全验证符合性确认的数据',
+  virtualListDetails: '市场清单详情',
+  virtualAuthenticationListDetails: '虚拟认证清单详情',
+  VirtualAuthenticationList: '虚拟认证清单',
+  maintainVirtualList: '维护市场清单',
+  certificationListMaintenance: '市场认证清单维护',
+  reasonsForRejection: '驳回原因',
+  inconformity: '不符合',
+  toTrack: '待追踪',
+  Launch: '发起',
+  notLaunch: '未发起',
+  maintainProgress: '维护进度',
+  redSchedule: '红：不符合，且无可接受的方案和时间表',
+  yellowSchedule: '黄：不符合/待追踪，有可接受的方案和时间表',
+  greenRequirements: '绿：确认符合或满足当前要求',
+  blueUndeterminedState: '蓝：未判断状态',
+  authenticationMessage: '认证参数任务',
+  taskRegulationComplianceTask: '法规符合性任务',
+  accept: '接受',
+  refuse: '拒绝',
+  taskTermination: '任务终止',
+  projectStatusAndProgress: '项目状态进度',
+  listConfirmationProgress: '清单确认进度',
+  taskConfirmationProgress: '任务确认进度',
+  designComplianceConfirmationProgress: '设计符合性确认进度',
+  preHomeConfirmProgress: 'Pre-Homo确认进度',
+  verificationComplianceConfirmationProgress: '验证符合性确认进度',
+  totalTable: '总数',
+  applicableSupplement: '适用增补件',
+  taskDescription: '任务说明',
+  descriptionDeliverables: '交付物说明',
+  startMonth: '开始日期',
+  endMonth: '结束日期',
+  Importing: '导入中...',
+  projectDeliveryDescription: '工程交付说明',
+  cancelConfirm: '取消确认',
+  currentInformation: '当前信息',
+  deliveryHistory: '交付历史',
+  projectDeliveryRequirements: '工程交付说明',
+  personLiableConfirm: '责任人确认',
+  complianceResults: '符合性结果',
+  noData: '暂无数据',
+  confirmOperation: '确认操作',
+  sponsorReview: '发起人审查',
+  fillInProjectDelivery: '填写工程交付',
+  Resubmit: '重新提交',
+  Quantity: '数量',
+  pleaseConfirmationResults: '请根据工程确认结果选择符合性状态',
+  pleaseReviewTask: '请您添加对该条审查任务的工程确认信息',
+  pleaseWillBeReturned: '请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回',
+  pleaseSubmitStatus: '请把工程确认的数据都点为确认状态进行提交',
+  modelName: '车型名称',
+  modelYear: '年款',
+  NoteConfirmTheChange: '注意：重置后所选条目数据将变为清单待发布状态，历史数据将消失，请确认是否进行流程重置',
+  onlyDataChanged: '只能变更任务确认状态为接受的数据',
+  inquiry: '询问',
+  ConfirmationDeadline: '确认截止时间',
+  regulatoryCertificationTaskConfirmation: '法规认证任务确认',
+  confirmationEngineeringInterfacePerson: '工程接口人确认',
+  engineerReply: '工程师回复',
+  catalogFile: '目录文件',
+  testScheme: '试验方案',
+  testReportLocation: '检测报告位置',
+  explain: '说明',
+  dataCannotEmpty: '数据不能为空',
+  documentDynamics: '文档动态',
+  theNumberAgain: '编号已存在不能重复添加',
+  myList: '我的待办',
+  myNews: '我的消息',
+  monthlyReportRegulations: '法规月报',
+  Pending: '待处理',
+  custom: '自定义',
+  notSelected: '未选择',
+  ExportReport: '导出报告',
+  basicInformation: '基础信息',
+  replyFromProjectContact: '工程接口人回复',
+  pleaseUpload: '请上传',
+  fullScreenView: '全屏查看',
+  systemPrompt: '系统提示',
+  loginExpired: '登录已过期',
+  reportNotUploaded: '报告未上传',
+  position: '职位',
+//  认证权限状态
+  CollectionInitiated: '待发起收集',
+  handledInterface: '待工程接口人处理',
+  ReturnedPerson: '工程接口人退回',
+  completed: '待填写',
+  Filledreturn: '填写人退回',
+  Submitted: '已提交',
+  ReturnedEngineer: '认证工程师退回',
+  SynchronizedLibrary: '已同步至上报库',
+  Statusis: '状态为',
+  toHavePermission: '才有权限',
+  and: '并且',
+  pleaseWaitWhileRunning: '运行中请稍等',
+  roleSwitching: '角色切换',
+  setCreator: '设置创建人',
+  documentLibraryDetails: '文档库详情',
+  question: '催办',
+  ConfirmQuestion: '确认催办？',
+  OnlyOrTaskconfirmationOut: '只有清单确认状态或任务确认状态为待确认时才可以进行催办',
+  disableInput: '禁止输入',
+  taskConfirmationDeadline: '任务确认截止时间',
+  taskConfirmationResponsiblePerson: '责任人任务确认',
+  or: '或',
+  warningTime: '预警时间',
+  RegulationMonthlyManagement: '月报管理',
+  RegulationMonthlyFill: '月报填写',
+  RegulationMonthlyName: '月报名称',
+  monthlyLanguage: '月报语种',
+  releaseStatus: '发布状态',
+  uploadedBy: '上传人',
+  uploadMonthly: '上传月报',
+  chapterContents: '章节目录',
+  chineseTitle: '中文标题',
+  englishTitle: '英文标题',
+  regulatoryContact: '法规联系人',
+  exportStatus: '导出状态',
+  monthlyTitleTemplate: '月报标题模板',
+  monthlyIntegrationAndExport: '月报整合导出',
+  addContent: '新增内容',
+  editContent: '编辑内容',
+  viewContent: '查看内容',
+  monthSelection: '月份选择',
+  fillInTheMonth: '填写月份',
+  contentTemplate: '内容模板',
+  bringInStandardInformation: '带入标准信息',
+  moveUp: '上移',
+  moveDown: '下移',
+  vehicleType: '适用车型',
+  usage: '用法',
+  implementationModel: '实施车型',
+  primaryCoverageCn: '主要内容(中文)',
+  primaryCoverageEn: '主要内容(英文)',
+  workProgressCn: 'NIO工作进展(中文)',
+  workProgressEn: 'NIO工作进展(英文)',
+  initiatingProcess: '发起流程',
+  collectResults: '收集结果',
+  dateOfInitiation: '发起日期',
+  closingDate: '截止日期',
+  viewProcess: '查看流程',
+  evaluationResults: '评估结果',
+  regulatoryTechnicalEvaluationResults: '法规技术评估结果',
+  Assessor: '评估人',
+  collectionOfRegulatoryOpinions: '法规意见收集',
+  collectionOfRegulatoryOpinionsProcess: '法规意见收集流程',
+  feedbackInformation: '反馈信息',
+  relevantSections: '相关章节',
+  questionsSuggestions: '问题/建议',
+  link: '链接',
+  reason: '理由',
+  planNoChinese: '计划号',
+  feedbackPoint: '反馈点',
+  standardNameCn: '标准名称中文',
+  standardNameEn: '标准名称英文',
+  deadlineForComments: '征求意见截止日期',
+  proposedTime: '提出时间',
+  standardNo: '标准编号',
+  implemenDate: '实施日期',
+//  上报库
+  Enable: '启用',
+  Latestupdatetime: '最新更新时间',
+  Exporthistory: '导出历史',
+  Exporttype: '导出类型',
+  Exporttime: '导出时间',
+  file: '文件',
+//  中英修改-全局
+  Copysuccessful: '复制成功',
+  Copyfailed: '复制失败',
+  Synchronizedatabase: '是否同步选中行数据至上报库?',
+  Aftersynchronization: '同步后的参数项将不可修改',
+  FNumber: '账号',
+  NNNiONumber: 'NIO编号',
+  NNiONumber: 'NIO编号',
+  ParameterNo: '编号',
+  NRequired: '是否必填',
+  NParameterName: '参数名称',
+  NtechnicalField: '技术领域',
+  NparameterBatch: '参数批次',
+  NareaOfResponsibility: '责任领域',
+  NParameterDescription: '参数说明',
+  NcertificationCategory: '认证类别',
+  NcontrolType: '控件类型',
+  NcontrolVerification: '控件校验',
+  NcontrolAlternatives: '控件备选值',
+  DefaultValue: '默认值',
+  NattachmentTemplate: '附件模板',
+  Ntext: '文本',
+  NDropdownradio: '下拉单选',
+  NDropdownmultipleselection: '下拉多选',
+  Nenclosure: '附件',
+  Atext: '下拉单选+文本',
+  Btext: '下拉多选+文本',
+  Ctext: '文本+附件',
+  Dtext: '下拉单选+附件',
+  Etext: '下拉多选+附件',
+  Ftext: '下拉单选+文本+附件',
+  Gtext: '标题',
+  Nnothing: '无',
+  Nchinese: '中文',
+  NpositiveInteger: '整数',
+  NPositivefloatingpointnumber: '正浮点数',
+  NintegerOrDecimal: '整数或小数',
+  NOneDecimalPlace: '一位小数',
+  NTwoDecimalplaces: '两位小数',
+  NThreedecimalplaces: '三位小数',
+  NFourDecimalplaces: '四位小数',
+  Copyparameterlist: '复制参数清单',
+  Templatenamelist: '模板名称-参数项收集清单',
+  newNiONumber: 'NIO编号',
+  English: '英文',
+  requiredParametersEmpty: '必填参数不能为空',
+  theResponsiblePersonAndDeadlineClank: '的责任人、截止时间不能为空',
+  bringInTheProjectInterface: '带入工程接口人',
+  theCurrentListSaved: '当前列表数据已全部提交，无法进行暂存',
+  defaultTemplate: '默认模板',
+  newRequestCommentListTemplate: '新征求意见清单模板',
+  NewReleasedStandardTemplate: '新发布标准模板',
+  pleaseSelectStandard: '请选择标准',
+  theResponsiblePersonEmpty: '的责任人不能为空',
+  theDeadlineEmpty: '的截止时间不能为空',
+  theDeliveryTypeCannotBeEmpty: '的交付物类型不能为空',
+  For: '针对于',
+  markedRejection: '标注的驳回意见',
+  RegulationListConfirmationTask: '清单确认任务',
+  RegulationListConfirmationNotification: '清单确认通知',
+  RegulationTaskConfirmation: '任务确认任务',
+  DesignComplianceTask: '设计符合性任务',
+  PreHomoTask: 'Pre-Homo任务',
+  ValidationTask: '验证符合性任务',
+  DesignComplianceNotification: '设计符合性通知',
+  PreHomoNotification: 'Pre-Homo通知',
+  ValidationComplianceNotification: '验证符合性通知',
+  RegulationTaskConfirmationNotification: '任务确认通知',
+  evaluationMethod: '评估方式',
+  uploadRelevantMaterials: '相关资料上传',
+  RelevantMaterials: '相关资料',
+  processBackground: '流程背景',
+  selectedStandard: '所选标准',
+  standardDecompositionDocument: '带入标准分解单',
+  pleaseSelectStandardFirst: '请先选择标准',
+  evaluatorFeedback: '评估人反馈',
+  nameTechnicalDocument: '技术文件名称',
+  chapter: '章节',
+  problemDescription: '问题说明',
+  filingExternalOpinions: '对外意见归档',
+  initiateProcessForCurrentStandard: '针对当前标准发起流程',
+  engineerFeedbackResults: '工程师反馈结果',
+  fileExport: '文件导出',
+  feedbackTime: '反馈时间',
+  regulatoryTechnologyAssessmentProcess: '法规技术评估流程',
+  feedbackEvaluation: '反馈评估',
+  clauseEvaluation: '条款评估',
+  standardDocuments: '标准文件',
+  reviewComments: '审核意见',
+  PleaseCompleteList: '请补全列表中符合性结果',
+  sponsorFeedback: '发起人反馈',
+  processNumber: '流程编号',
+  processName: '流程名称',
+  feedbackResults: '反馈结果',
+  theDoesNotSupportPreview: '当前文件格式不支持预览',
+  releaseSituation: '发布情况',
+  comparisonResults: '对比结果',
+  Published: '已发布',
+  initiateComparison: '发起对比',
+  translationLanguage: '翻译语言',
+  translationResults: '翻译结果',
+  conversionTime: '转换时间',
+  category: '类别',
+  RegulatoryProcessEvaluationResults: '法规流程评估结果',
+  ViewConformanceResults: '查看符合性结果',
+  TechnicalEvaluationResultsForReference: '技术评估结果参考',
+  ComplianceConfirmationRecord: '符合性确认记录',
+  complianceConfirmation: '符合性确认',
+  Deriveconformanceresults: '导出符合性结果',
+  Regulatorycompliancekanban: '法规符合性看板',
+  noComparisonDocumentSelected: '未选择对比文档',
+  RemarkInfo: '备注信息',
+  initiateDocumentComparison: '发起文档对比',
+  comparativeComments: '对比评论',
+  Comparisonofarticles: '条款对比评论',
+  viewTheComparisonResults: '查看对比结果',
+  addFullTextComment: '添加全文评论',
+  turnOffAutomaticMatching: '关闭自动匹配',
+  exportComparisonReport: '导出对比报告',
+  comparisonDifferenceComment: '对比差异评论',
+  fullTextComments: '全文评论',
+  pleaseEnterfullTextComments: '请输入全文评论',
+  fileDeclaration: '文件说明',
+  FileForDetails: '文件详情',
+  Converting: '转换中',
+  convertNetwork: '转换完成',
+  convertFailed: '转换失败',
+  standardData: '标准数据',
+  Theorganization: '组织机构',
+  Addingfolder: '新增文件夹',
+  Addingsubfolders: '新增子文件夹',
+  Editfolder: '编辑文件夹',
+  Deletefolders: '删除文件夹',
+  Foldername: '文件夹名称',
+  Folderpermissions: '文件夹权限',
+  Folderorder: '文件夹顺序',
+  Downloadprivileges: '下载权限',
+  Openpersonnel: '开放人员',
+  originalText: '原文',
+  translatedText: '译文',
+  Administrativeprivileges: '管理权限',
+  Checkthepermissions: '查看权限',
+  onlyFilesUploaded: '只能上传.docx、.doc文件',
+  uploadedbyyourself: '只能删除自己上传的文件数据',
+  Fileuploaded: '文件上传中，请稍后',
+  English: '英文',
+  requiredParametersEmpty: '必填参数不能为空',
+  theResponsiblePersonAndDeadlineClank: '的责任人、截止时间不能为空',
+  bringInTheProjectInterface: '带入工程接口人',
+  theCurrentListSaved: '当前列表数据已全部提交，无法进行暂存',
+  defaultTemplate: '默认模板',
+  newRequestCommentListTemplate: '新征求意见清单模板',
+  NewReleasedStandardTemplate: '新发布标准模板',
+  pleaseSelectStandard: '请选择标准',
+  theResponsiblePersonEmpty: '的责任人不能为空',
+  theDeadlineEmpty: '的截止时间不能为空',
+  theDeliveryTypeCannotBeEmpty: '的交付物类型不能为空',
+  For: '针对于',
+  markedRejection: '标注的驳回意见',
+  RegulationListConfirmationTask: '清单确认任务',
+  RegulationListConfirmationNotification: '清单确认通知',
+  RegulationTaskConfirmation: '任务确认任务',
+  DesignComplianceTask: '设计符合性任务',
+  PreHomoTask: 'Pre-Homo任务',
+  ValidationTask: '验证符合性任务',
+  DesignComplianceNotification: '设计符合性通知',
+  PreHomoNotification: 'Pre-Homo通知',
+  ValidationComplianceNotification: '验证符合性通知',
+  RegulationTaskConfirmationNotification: '任务确认通知',
+  evaluationMethod: '评估方式',
+  uploadRelevantMaterials: '相关资料上传',
+  RelevantMaterials: '相关资料',
+  processBackground: '流程背景',
+  selectedStandard: '所选标准',
+  standardDecompositionDocument: '带入标准分解单',
+  pleaseSelectStandardFirst: '请先选择标准',
+  evaluatorFeedback: '评估人反馈',
+  nameTechnicalDocument: '技术文件名称',
+  chapter: '章节',
+  problemDescription: '问题说明',
+  filingExternalOpinions: '对外意见归档',
+  initiateProcessForCurrentStandard: '针对当前标准发起流程',
+  engineerFeedbackResults: '工程师反馈结果',
+  fileExport: '文件导出',
+  feedbackTime: '反馈时间',
+  regulatoryTechnologyAssessmentProcess: '法规技术评估流程',
+  feedbackEvaluation: '反馈评估',
+  clauseEvaluation: '条款评估',
+  standardDocuments: '标准文件',
+  pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估人',
+  reviewComments: '审核意见',
+  PleaseCompleteList: '请补全列表中符合性结果',
+  sponsorFeedback: '发起人反馈',
+  processNumber: '流程编号',
+  processName: '流程名称',
+  feedbackResults: '反馈结果',
+  theDoesNotSupportPreview: '当前文件格式不支持预览',
+  releaseSituation: '发布情况',
+  comparisonResults: '对比结果',
+  Published: '已发布',
+  initiateComparison: '发起对比',
+  translationLanguage: '翻译语言',
+  translationResults: '翻译结果',
+  conversionTime: '转换时间',
+  category: '类别',
+  RegulatoryProcessEvaluationResults: '法规流程评估结果',
+  ViewConformanceResults: '查看符合性结果',
+  CommentsCollectionResultsForReference: '意见收集结果',
+  TechnicalEvaluationResultsForReference: '技术评估结果',
+  ComplianceConfirmationRecord: '符合性确认记录',
+  complianceConfirmation: '符合性确认',
+  Deriveconformanceresults: '导出符合性结果',
+  Regulatorycompliancekanban: '法规符合性看板',
+  noComparisonDocumentSelected: '未选择对比文档',
+  RemarkInfo: '备注信息',
+  initiateDocumentComparison: '发起文档对比',
+  comparativeComments: '对比评论',
+  viewTheComparisonResults: '查看对比结果',
+  addFullTextComment: '添加全文评论',
+  turnOffAutomaticMatching: '关闭自动匹配',
+  exportComparisonReport: '导出对比报告',
+  comparisonDifferenceComment: '对比差异评论',
+  fullTextComments: '全文评论',
+  fileDeclaration: '文件说明',
+  FileForDetails: '文件详情',
+  Converting: '转换中',
+  convertNetwork: '转换完成',
+  convertFailed: '转换失败',
+  standardData: '标准数据',
+  Theorganization: '组织机构',
+  Addingfolder: '新增文件夹',
+  Addingsubfolders: '新增子文件夹',
+  Editfolder: '编辑文件夹',
+  Deletefolders: '删除文件夹',
+  Foldername: '文件夹名称',
+  Folderpermissions: '文件夹权限',
+  Folderorder: '文件夹顺序',
+  Downloadprivileges: '下载权限',
+  Openpersonnel: '开放人员',
+  originalText: '原文',
+  translatedText: '译文',
+  Administrativeprivileges: '管理权限',
+  Checkthepermissions: '查看权限',
+  onlyFilesUploaded: '只能上传.docx、.doc文件',
+  uploadedbyyourself: '只能删除自己上传的文件数据',
+  doNotHavePermissionDeleteData: '没有权限删除此数据',
+  onlyCompletedDataCanBeDeleted: '只能删除已完成的数据',
+  Parametercollection: '参数收集',
+  Collectlist: '收集清单',
+  Statisticalmodels: '统计模式',
+  Inthecollection: '收集中',
+  Notatthe: '未开始',
+  Thepercentage: '百分比',
+  problemKnowledgeBase: '知识分享',
+  recentHotSpots: '近期热点',
+  disseminationMaterials: '传播物料',
+  informationSafety: '信息安全',
+  blueBook: '蓝皮书',
+  invoiceCollection: '发票合集',
+  productHighlights: '产品亮点',
+  financialReimbursement: '财务报销',
+  classificationMaintenance: '分类维护',
+  managePublishing: '管理发布',
+  displayPermission: '展示权限',
+  authorizedUser: '权限用户',
+  problemClassification: '问题分类',
+  market: '市场',
+  documentNumber: '文档编号',
+  documentTitle: '文档标题',
+  bringInDocumentInformation: '带入文档信息',
+  addStandardInformation: '添加标准信息',
+  thereWhichCannotDeleted: '该标题下存在子标题无法进行删除',
+  sdt: '工程接口人',
+  dre: '填写人',
+  applicableInstructionsMarketList: '市场清单适用说明',
+  pleaseSelectTheDataCompared: '请选择需要对比的数据',
+  problemLabel: '分类',
+  personCharge: '负责人',
+  addLabel: '新增分类',
+  editLabel: '编辑标签',
+  applicableMarket: '适用市场',
+  templateMaintenance: '模板维护',
+  associatedWebsite: '关联网址',
+  dropDownOptions: '下拉选项',
+  dropDownOptionMaintenance: '下拉选项维护',
+  displayInformation: '展示信息',
+  addComparison: '添加对比',
+  showOrNot: '是否展示',
+  comparisonMarket: '对比市场',
+  share: '分享',
+  simplifiedChinese: '简体中文',
+  uploadOnly: '只能上传',
+  turnOnAutoMatch: '打开自动匹配',
+  Adjustareasofresponsibility: '调整责任领域',
+  regulatoryTechnicalAssessment: '法规技术评估',
+  OpenOne: '公开',
+  Privacy: '私密',
+  punctuationmark: '只能输入除#号外的英文标点符号',
+  created: '创建时间',
+  updated: '更新时间',
+  optionDropDownBox: '下拉选择',
+  attachmentUpload: '附件上传',
+  textInput: '文本输入',
+  Paraname: '参数名称',
+  Parabatch: '参数批次',
+  freeze: '请选择冻结配置',
+  deleteNode: '若有文件信息将同步删除，确认删除该条数据？',
+  HaveReleased: '已发布',
+  forward: '转发',
+  areResponsibilityAreaInformationBatch: '确实是否批量修改责任领域信息',
+  issuedBy: '发布人',
+  pleaseDecompositionStandardOrder: '请导入或带入至少一条分解标准单',
+  currentlyTheFirstOneThatCannotMovedUp: '当前已是第一个无法进行上移',
+  currentlyTheLastOneCannotmovedDown: '当前已是最后一个无法进行下移',
+  weilaiRegulationMonthlyReport: '蔚来法规月报',
+  onlyTheDataWhoseStatusNotInitiatedAcceptedChanged: '只能变更清单确认状态为接受并且任务清单状态为未发起或任务清单状态为接受的数据',
+  thereTitleWhichCannotBeDeleted: '该标题下存在新增内容,不能删除',
+  industryInformationDynamicTemplate: '行业资讯动态模板',
+  relatedFields: '相关领域',
+  relatedFieldsEn: '相关领域(英文)',
+  source: '来源',
+  sourceEn: '来源(英文)',
+  onlyone: '只能输入一个合并分隔符',
+  theInconsistentSameResponsibility: '所选的数据责任领域不一致；请选择相同的责任领域',
+  taskConfirmedPersonnelCannotBeSetBatch: '任务确认状态为待确认时无法批量设置人员',
+  theSelectedDataResponsibilityFieldCannotEmpty: '所选数据责任领域不能为空',
+  theTaskConfirmationStatusCannot: '只能变更清单确认状态为拒绝或接受、及任务确认状态不能为待确认的数据',
+  BatchMaintenanceProgress: '批量维护进度',
+  BatchChangeStatus: '批量修改状态',
+  CollectinguthenticationParameters: '认证参数收集',
+  rejectedBy: '拒绝人',
+  rejectionTime: '拒绝时间',
+  rejectReason: '拒绝原因',
+  collectionLegislativeComments: '法规意见收集',
+  regulatoryAndTechnicalAssessment: '法规技术评估',
+  listConfirmationRejectionReason: '清单确认驳回原因',
+  taskConfirmationRejectionReason: '任务确认驳回原因',
+  reportedDelete: '您将永久删除清单',
+  reportDelete: ',包括清单参数项及导出历史。一旦删除将无法撤销或恢复。',
+  confirmdelete: '请确认要删除的清单标题',
+  Deletetitle: '删除标题',
+  toConfirmed: '来确认',
+  confirmtitle: '标题不正确，请重新输入',
+  batchProcessing: '批量办理',
+  onlyDataTaskConfirmationProcessSelected: '只能选择流程类型为任务确认流程的数据',
+  processNode: '流程节点',
+  personChargeReceivesTheTask: '责任人接收任务',
+  theResponsiblePersonTaskForTheSecondTime: '责任人二次接收任务',
+  processNodesAreInconsistentPleaseSelectConsistentData: '流程节点不一致；请选择一致的数据',
+  exportFileName: '导出文件名称',
+  initiateSupplementaryProcess: '发起补充流程',
+  whetherTheDisassemblySheetIncluded: '是否含有拆解单',
+  inRecentMonths3: '近3个月内',
+  inRecentMonths6: '近6个月内',
+  inRecentYear1: '近1年内',
+  inRecentYear2: '近2年内',
+  inRecentYear3: '近3年内',
+  selectAll: '全选',
+  importLocalDisassemblyOrder: '导入本地拆解单',
+  notExport: '未导出',
+  hasBeenExport: '已导出',
+  firstLevelDirectory: '一级目录',
+  deselectAll: '取消全选',
+  classification: '分类',
+  consistentAssessment: '一致',
+  viewConsistentAssessment: '查看一致项',
+  viewVarianceAssessment: '查看差异项',
+  viewAll: '查看全部',
+  endProcess: '结束流程',
+  thereForTheCurrentlySelectedData: '当前所选数据暂无标准分解单',
+  secondaryDirectory: '二级目录',
+  OnlyPersonsCanBeSelected: '超出最大上限；最多只能选择100个人员',
+  projectVersion: '项目版本',
+  softwareVersion: '认证软件版本',
+  versionStatistics: '版本统计',
+  addSubproject: '添加子项目',
+  Topping: '置顶',
+  cancelTopping: '取消置顶',
+  relatedProjectVersion: '相关项目版本',
+  taskType: '任务类型',
+  taskStatus: '任务状态',
+  taskConfirmationHandling: '任务确认办理',
+  relatedVersion: '相关版本',
+  filledBy: '待分配填写人',
+  parameterToBeInitiated: '参数待发起',
+  listTaskConfirmation: '清单任务确认',
+  completednum: '待填写',
+  filledBynum: '待分配填写人',
+  parameterToBeInitiatednum: '参数待发起',
+  listToConfirm: '待确认',
+  toSubmit: '待提交',
+  toAudit: '待审核',
+  secondaryDirectory: '二级目录',
+  OnlyPersonsCanBeSelected: '超出最大上限；最多只能选择100个人员',
+  projectVersion: '项目版本',
+  softwareVersion: '认证软件版本',
+  versionStatistics: '版本统计',
+  addSubproject: '添加子项目',
+  Topping: '置顶',
+  cancelTopping: '取消置顶',
+  relatedProjectVersion: '相关项目版本',
+  Importfailure: '导入失败',
+  CuiBan: '催办',
+  certificationCategoryNumber: '认证类别编号',
+  historicalrecord: '历史记录',
+  Referenceparametercolumn: '引用参数列',
+  Updateparametercolumn: '更新参数列',
+  columnfirst: '请先引用参数列',
+  columnforced: '确认强制撤回?',
+  brand: '品牌',
+  allsubitemsitem: '该项目下拥有子项目，是否全部删除',
+  contactTheFounder: '联系作者',
+  customize: '列表设置',
+  customColumn: '自定义列',
+  afterdate: '在...日期之后',
+  afterdatein: '在...日期之后（包含）',
+  beforedate: '在...日期之前',
+  beforedatein: '在...日期之前（包含）',
+  inRecentMonthsin6: '近6个月内（已实施）',
+  batchUpdateDeadline: '批量更新截止时间',
+  timeInterval: '时间区间',
+  certificationList: '认证清单',
+  inspectionItems: '检验项目',
+  processReset: '流程重置',
+  configurationItem: '配置项',
+  DeliverablesResult: '交付结果',
+  reportNo: '报告编号',
+  productModel: '产品型号',
+  nameOfManufacturer: '生产企业名称',
+  regulationNo: '法规编号',
+  itemInformation: '条目信息',
+  modifyHistory: '历史记录',
+  returnToStudio: '退回至Studio',
+  Approved: '审批通过',
+  returnedForApproval: '审批退回',
+  changeSetting: '修改配置',
+  referenceDeliverables: '引用交付物',
+  missionAccepted: '任务接受',
+  missionRejection: '任务拒绝',
+  turnToDo: '转办',
+  initiateTask: '发起任务',
+  areYouReturnToStudio: '确认退回至studio吗?',
+  confirmLaunchTask: '确认发起任务?',
+  conditionsNotMet: '不满足条件',
+  onlyProcessStatusReturned: '只能退回流程状态为清单待校核和责任人拒绝的数据',
+  onlyProcessReturned: '只能发起流程状态为清单待校核和责任人拒绝的数据,并且交付物类型、工程接口人、责任人、截止时间不能为空',
+  confirmToAcceptTheTask: '确认接受任务?',
+  confirmRejectTask: '确认拒绝任务?',
+  onlyDataStatusConfirmedSelected: '只能选择流程状态为任务待确认的数据',
+  onlyDataStatusSubmittedCanBeSelected: '只能选择流程状态为结果待提交的数据',
+  operationWithoutPermission: '没有权限操作',
+  data: "的数据",
+  compliancereport: '生成合规报告',
+  todocenter: '待办中心',
+  confirmApproval: '确认通过审查？',
+  confirmReturnForApproval: '确认退回审查？',
+  onlyDataStatusResultReviewedCanBeSelected: '只能选择流程状态为结果待审查的数据',
+  confirmResetProcess: '确认重置流程?',
+  confirmUrging: '确认催办',
+  statusthetasistobeconfirmed: '只有清单待校核状态或任务确认状态为待确认时才可以进行撤回',
+  confirmreturn: '确认退回？',
+  confirmUrging: '确认催办?',
+  confirmWithdrawal: '确认撤回?',
+  onlyListCheckedCanRecalled: '只能撤回流程状态为清单待校核的数据',
+  onlyDataSelected: '只能选择流程状态为任务待确认、结果待提交、审查退回的数据',
+  youCannotStatusListToBeReleasedAndApproved: '不能选择流程状态为清单待发布、审查通过的数据',
+  batchmodify: '是否批量修改',
+  onlyDataListReleasedAndCertificationReturnCanSelected: '只能选择流程状态为清单待发布和认证退回的数据,并且截止时间不能为空',
+  type: '类型',
+  select: '选择',
+  onlyDataWithProcessStatusDeleted: '只能删除流程状态为清单待发布和审查通过的数据',
+  complianceCertificationProgram: '合规认证计划',
+  listPublishing: '清单发布',
+  responsibilityConfirmation: '责任确认',
+  designVerification: '设计核查',
+  getStarted: '摸底开始',
+  certificationStartOne: '认证开始',
+  verificationAndVerification: '验证核查',
+  projectInterfacePersonRegulationEngineerSetting: '工程接口人-法规工程师设置',
+  projectInterfacePersonCertificationEngineerSetting: '工程接口人-认证工程师设置',
+  registrationnumber: '产品登记编号',
+  noticebatch: '《公告》批次',
+  producttrademark: '产品商标',
+  productname: '产品名称',
+  createvehicleandfunctionrecords: '创建车型及功能备案',
+  citeforrecord: '引用备案',
+  datamaintenance: '数据维护',
+  dataimport: '数据导入',
+  maintenance: '维护',
+  recordstatus: '备案状态',
+  filingtime: '备案提交时间',
+  createanupgradeactivityrecord: '创建升级活动备案',
+  endUpgrade: '结束升级',
+  upgraderesult: '升级结果',
+  upgraderegistrationnumber: '升级登记编号',
+  basicinformationofvehicletype: '车型基本信息',
+  onlineupgraderequirements: '在线升级要求',
+  safetymeasure: '安全措施',
+  upgradedonline: '可在线升级的系统名称与参数',
+  beupgradedonline: '可在线升级的驾驶辅助功能名称与参数',
+  recordparameters: '驾驶辅助系统基础备案参数',
+  other: '其他',
+  fillintherecord: '填写记录',
+  specificrequirements: '具体要求',
+  relevantverification: '是否开展相关验证',
+  certifyingmaterials: '证明材料',
+  aspect: '方面',
+  havemeasures: '具备措施',
+  systemclass: '系统类别',
+  whetheritcanbeupgraded: '是否可升级',
+  technicalparameters: '升级可能变更的《公告》技术参数(如有)',
+  architecturetopologydiagram: '系统-电子控制器架构拓扑图(附件需含拓扑图介绍)',
+  controllerparameter: '控制器参数',
+  electronic: '电子控制器名称',
+  electronicController: '电子控制器名称(硬件)',
+  electroniccontrollername: '电子控制器汽车安全完整性等级(ASIL)',
+  electroniccontrollerproductionenterprises: '电子控制器生产企业',
+  electroniccontrollertype: '电子控制器型号',
+  hardwareversioninformation: '硬件版本信息',
+  initialsoftwareversionnumber: '初始软件版本号',
+  inflammatorydata: '初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）',
+  environmentalprotection: '升级是否影响整车安全、节能、环保、防盗等性能',
+  operatingsystemtype: '操作系统类型',
+  operatingsystemmanufacturer: '操作系统生产企业',
+  operatingsystemversion: '操作系统版本号',
+  addcontroller: '添加控制器',
+  addsystem: '添加系统',
+  functionname: '功能名称',
+  configuration: '配置情况',
+  drivingautomationlevel: '驾驶自动化级别',
+  functiondescription: '功能描述',
+  applicationconditions: '适用条件（边界条件）',
+  componentname: '部件名称',
+  fillincontent: '填写内容',
+  upgradepacketprotectionmeasures: '升级包保护措施',
+  controlsystem: '说明电子控制系统的软件升级版本（集）的识别方式及保存方式',
+  Vehicledynamictype: '车辆动力类型',
+  upgradetargetmodel: '升级目标车型',
+  thetargetvehicleofthisupgrade: '本次升级的目标车辆',
+  upgradeimpactassessment: '升级影响评估',
+  upgradehavechanged: '本次升级的系统名称与参数变化',
+  auxiliaryupgradehavechanged: '本次升级的驾驶辅助功能名称与参数变化',
+  usernotification: '用户告知内容及方式',
+  informationaboutotherupgradetasks: '其他升级任务信息',
+  totalquantity: '总数量（辆）',
+  dateofproduction: '生产日期',
+  VINcodelist: 'VIN码清单',
+  VINcodeupload: 'VIN码上传',
+  Tasknode: '任务节点',
+  Taskresponsibilityrecognition: '任务责任确认',
+  uploadattachment: '上传附件',
+  Processhistory: '流程历史',
+  historyData: '1.法规工程师，2.责任人，3.责任人，4.法规工程师',
+  resultofhandling: '处理结果',
+  Listoftreatableregulations: '可处理法规列表',
+  Listofuntractableregulations: '不可处理法规列表',
+  project: '项目',
+  Categoryofdeliverables: "交付物类型",
+  Taskconfirmationresult: '任务确认结果',
+  Compliancetaskhandling: '符合性任务办理',
+  resultofhandling: '处理结果',
+  networksecurityrequirements: '网络安全要求',
+  upgradefunctionrequirements: '升级功能要求',
+  usernotificationrequirement: '用户告知要求',
+  ineffectiveupgrades: '应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级',
+  againstunauthorized: '应保护车辆上的软件版本（集），防止未经授权的修改',
+  communicationinterfacethathasateastusedastandard: '车辆应具备更新软件版本（集）的能力，应通过使用电子通信接口，至少用过标准接口（如OBD端口），以标准化的方式易于读取',
+  softwareupgrade: '应确保车辆在执行软件升级之前满足先决条件',
+  Ensurethatsoftware: '应确保只有当车辆有充足电量完成升级过程时，才能执行软件升级(包括可能恢复到以前版本或使车辆进入安全状态所需的电量)',
+  ifanupgrademayaffectvehiclesafety: '当执行升级可能影响车辆安全时，应在升级执行过程中通过技术手段确保车辆安全',
+  iftheimplementationoftheupgradaffectsdrivingsafety: '若升级的执行影响驾驶安全，至少应满足：\n' +
+    '\n' +
+    '(a)确保升级执行期间无法驾驶车辆；\n' +
+    '\n' +
+    '(b)确保驾驶员不能使用任何可能影响车辆安全或成功执行升级的车辆功能',
+  ensurethatthevehicleisinasafecondition: '若升级失败或中断，车辆能够恢复到以前的可用版本，或确保车辆处于安全状态。',
+  priortotheexecutionoftheupgrade: '在升级执行前，应告知车辆用户升级信息，告知的信息应包括：\n' +
+    '\n' +
+    '(a)升级目的；\n' +
+    '\n' +
+    '(b)车辆功能升级所实施的任何变更；\n' +
+    '\n' +
+    '(c)完成升级执行的预计时间；\n' +
+    '\n' +
+    '(d)升级执行期间可能不可用的任何车辆功能；\n' +
+    '\n' +
+    '(e)可能帮助车辆用户安全执行升级的任何指导信息。',
+  afterperformingtheupgrade: '在执行升级后，车辆应：\n' +
+    '\n' +
+    '(a)告知车辆用户车辆升级的结果(成功或失败)；\n' +
+    '\n' +
+    '(b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。',
+  upgradepacketprotectionmeasuresa: '软件版本（集）识别与存储',
+  otaupgradedsecuritymeasuresforvehicles: '车辆OTA升级安全措施',
+  authenticityandintegrityprotectionmechanism: '真实性、完整性保护机制(可多选)',
+  failsafmechanism: '防失效保护机制(可多选)',
+  vehiclesafetyMeasuresafterUpgradefailure: '升级失败后车辆安全措施(可多选)',
+  informationsecuritymechanism: '信息安全机制(可多选)',
+  dynamicsystem: '动力系统',
+  transmissionsystem: '传动系统',
+  brakingsystem: '制动系统',
+  bodysystem: '车身系统',
+  vehicleenergysystem: '车载能源系统',
+  forwardcollisionwarning: '前向碰撞预警(FCW)',
+  laneDepartureWarning: '车道偏离预警(LDW)',
+  multiareamonitoring: '百区监测(BSD)',
+  residentfatiguebasket: '驻员疲劳篮澳CDFM)',
+  automaticemergencybraking: '自动紧急制动(AEB)',
+  adaptiveCruiseControl: '自适应巡航控制(ACC)',
+  laneKeepingAssist: '车道保持辅助(LKA)',
+  intelligentParkingAssistance: '智能泊车辅助(IPA)',
+  trafficCongestionAssistance: '交通拥堵辅助(TJA)',
+  millimeterwaveradar: '毫米波雷达',
+  ultrasonicradar: '超声波雷达',
+  camera: '摄像头',
+  asternimage: '倒车影像/360（环视）',
+  Monocularbinocularmultiocular: '单目/双目/多目',
+  driverattentionmonitoringsystem: '驾驶员注意力监测系统DMS',
+  positioningandnavigationsystem: '定位及导航系统',
+  vehiclecommunicationsystem: '车载通信系统',
+  driversurveillancecamera: '驾驶员监控摄像头',
+  drivermonitoringinfraredsensor: '驾驶员监控红外传感器',
+  vehiclesatellitepositioningequipment: '车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）',
+  inertialnavigationsystem: '惯性导航系统',
+  wheelspeedmeter: '轮速计',
+  highprecisionmap: '高精度地图',
+  electronicfence: '电子围栏',
+  signalingdevices: '驾驶辅助系统操纵件、指示器及信号装置',
+  driverassistancefunctioncontrols: '驾驶辅助功能操纵件',
+  drivingassistancefunctionindicatorsignaldevice: '驾驶辅助功能指示器/信号装置',
+  steerinwheelreleaseindicatorsignaldevice: '方向盘脱手提示器/信号装置',
+  driverattentionindicatorsignaldevice: '驾驶员注意力提醒指示器/信号装置',
+  automaticDrivingDataRecordingSystem: '自动驾驶数据记录系统(DSSAD)',
+  eventdatarecordingsystem: '事件数据记录系统(EDR)',
+  layoutposition: '布置位置',
+  specificationmodel: '规格型号',
+  productionenterprise: '生产企业',
+  qualitativelydescriberelevantplaces: '定性描述相关场所',
+  systemname: '系统名称',
+  systemspecificationmodel: '系统规格型号',
+  systemproductionenterprise: '系统生产企业',
+  softwareversionnumber: '软件版本号',
+  softwaredevelopmententerprise: '软件开发企业',
+  controlname: '操纵件名称',
+  hardwarespecificationmodel: '硬件规格型号',
+  nameofindicatorsignaldevice: '指示器/信号装置名称',
+  otaupgradefunctionmodule: '车端OTA升级功能模块',
+  upgradePurpose: '升级目的（可多选）',
+  impactassessmentofupgradeactivities: '升级活动的影响评估',
+  correspondingvehicletype: '是否变更对应车型的《公告》技术参数',
+  technicalperformancechanges: '是否涉及产品安全、环保、节能、防盗等技术性能变化',
+  technicalstandardsandsafetytechnicalconditions: '是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等',
+  autoautonomousdrivingfunction: '是否涉及汽车自动驾驶功能相关升级',
+  vehiclepriortothereleaseoftheupgrade: '是否确认升级包与目标车辆配置的兼容性，包括在发布升级之前对目标车辆的最新已知软件和硬件配置进行兼容性评估',
+  conditionsareupgradesperformed: '如何执行升级以及在何种条件下执行升级',
+  upgradefailureorinterruption: '升级失败或中断后，车辆采取的安全机制(可多选)',
+  upgradeactivitiesaffectvehiclesafety: '升级活动是否影响车辆安全',
+  upgradeactivityprovidesuserconfirmationoptions: '升级活动是否提供用户确认选项',
+  upgradepackagetest: '升级包测试(可多选)',
+  reliabilityofonlineupgradeactivities: '是否已验证确认在线升级活动的安全性和可靠性',
+  adjustmentofchangedBulletinparameters: '已变更《公告》参数的对应调整（如有）',
+  preupgrade: '升级前',
+  afterupgrade: '升级后',
+  nameoftheupgradedelectroniccontroller: '升级的电子控制器名称',
+  adaptivehardwareversion: '适配的硬件版本',
+  beforethesoftwareversionupgraded: '软件版本号升级前',
+  afterthesoftwareversionupgraded: '软件版本号升级后',
+  beforetheOSversionupgraded: '操作系统版本号升级前',
+  aftertheoperatingsystemversionupgraded: '操作系统版本号升级后',
+  initialpackageforintegrityinflammatorydata: '初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）',
+  upgradepackageintegrityverificationdata: '升级包完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）',
+  upgradepackagesize: '升级包大小（MB）',
+  differentialupgradeornot: '是否差分升级',
+  upgradedestinationype: '升级目的类型',
+  functionalchangedescription: '功能变更描述',
+  variationofapplicableconditions: '适用条件变更',
+  upgradetheelectroniccontrollerinvolved: '升级涉及的电子控制器',
+  beforetheupgrade: '升级执行前',
+  pgradepurpose: '升级目的',
+  vehiclefunctionalityasaresultofsoftwareupgradeactivities: '由于软件升级活动而导致的车辆功能的任何变化',
+  estimatedupgradeexecutionTime: '升级执行预计时间(分钟)',
+  upgradeexecutionperiodasksifthevehicleisusable: '升级执行期问，车辆是否可用',
+  vehiclefeaturesthatarenotavailableduringupgradeexecution: '升级执行期间不可用的车辆功能',
+  vehicleusersafelyperformtheupgrade: '帮助车辆用户安全执行升级的任何指导信息',
+  aftertheupgrade: '升级执行后',
+  notifiestheuseroftheupgradesuccessorfailure: '告知用户升级成功或失败',
+  informimplementationchanges: '告知实施的变更',
+  allupdatestotheusermanualareinformed: '告知了对用户手册的全部更新内容',
+  usernotificationmode: '告知用户方式(可多选)',
+  userinformstherelevantfile: '用户告知相关文件',
+  taskname: '任务名称',
+  updatereleasetime: '升级发布时间',
+  upgradeplanexpirationtime: '升级计划截止时间',
+  theDataYouSelectedContainsSkip: '您所勾选的数据中包含交付物类型为空的数据；请确认是否跳过',
+  designComplianceProcessFor: '的设计符合性流程',
+  validationComplianceProcessFor: '的验证符合性流程',
+  designComplianceProcess: '设计符合性流程',
+  validationComplianceProcess: '验证符合性流程',
+  thePersonResponsibleForVerifyingEmpty: '验证符合性流程的责任人不能为空',
+  theDeadlineComplianceProcessCannotEmpty: '验证符合性流程的截止时间不能为空',
+  theDeadlineForTheDesignCannotBeEmpty: '设计符合性流程的截止时间不能为空',
+  thePersonResponsibleForDesignCannotBeBlank: '设计符合性流程的责任人不能为空',
+  selectTheVehicleTemplate: '选择车型模板',
+  theNameOfFirm: '企业名称',
+  productClass: '产品类别',
+  communicationTerminal: '通信终端（可多选）',
+  otaUpgradeManagementSystem: '车端OTA升级管理系统',
+  pleaseStateTheDistribution: '请说明管理系统与电子控制器的集成与分布情况',
+  next: '下一步',
+  last: '上一步',
+  recordmaintenance: '备案维护',
+  module: '模块',
+  designComplianceReviewAdmin: '设计符合性审查',
+  missionAccomplished: '任务完成',
+  yesisselected: '如选择“有”，请输入',
+  haveisselected: '如选择“是”，请输入',
+  forwardXquantity: '如前向x数量、后向x数量、后左x数量、后右x数量等',
+  upgraderecordnumber: '升级备案编号',
+  Modelandfunctionrecord: '车型及功能备案《公告》批次',
+  taskTypeMismatch: '任务类型不匹配',
+  taskNodeMismatch: '任务节点不匹配',
+  ifNot: '如无，则填写“无”或“不涉及”',
+  addfunction: '添加功能',
+  controllername: '控制器名称',
+  hardwaremanufacturer: '硬件生产企业',
+  softwareversion: '软件版本',
+  returntofill: '返回填写',
+  onlyDataInTheReminderProcessBanBeProcessed: '只能催办流程中的数据',
+  expeditionProcess: '催办流程',
+  thereAreCurrentlyNoRegulationsToHandle: '当前没有可处理的法规',
+  certificationSubmission: '认证提交',
+  upgradecompletion: '升级完成情况',
+  implementedupgrade: '实施的升级是否和备案一致',
+  numberofvehicles: '完成升级的车辆数',
+  vehicleshavenotcompletedonlineupgrade: '部分车辆未完在线升级的原因',
+  cause: '原因',
+  implementationrecords: '故障处置措施和应急响应实施记录',
+  onlyDataWithListStatusDraftCanBeDeleted: '只能删除清单状态为草稿的数据',
+  implementationDateTwo: '实施日期',
+  reasonForReturn: '退回原因',
+  pleaseFillInTheInformationTaskProcess: '请填写工程接口人和责任人信息后再发起任务流程',
+  complianceReporting: '合规报告',
+  youCanOnlySelectStatusClearSubmit: '只能选择流程状态为清单待提交的数据',
+  note: '注:附件包括测试项目清单、测试报告、测试标准或技术规范',
+  format: '支持doc/docx/pdf格式，大小50M以内',
+  cantTransferToYourself: "不能转办给自己",
+  noteone: '注:支持CSV格式，大小20M以内，数量1-20个',
+  notecsv: '注:支持CSV格式，大小20M以内',
+  theDataYouInitiate: '您所选的数据，均不符合流程发起条件，请重新检查后发起',
+  dataWithProcessReleasedCannotBeReset: '流程状态为清单待发布的数据不能被重置',
+  reasonForReturnOfDesignCompliance: '法规工程师退回原因',
+  notetwo: '\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
+  notethree: '\n提供证明材料\n',
+  verifyComplianceConfirmReturnReason: '验证符合性确认退回原因',
+  theDeliverablesCannotReferencedPleaseReselect: '不能引用本项目的交付物，请重新选择',
+  marketRegulationListMaintenance: '市场法规清单维护',
+  regulatoryListTemplate: '市场法规清单模板',
+  gnxtwh: '功能系统维护',
+  gnxt: '功能系统',
+  dykzq: '对应控制器',
+  releaseRegulatoryList: '法规清单发布',
+  preHomoFlow: 'Pre-Homo流程',
+  verifyConformanceConfirmation: '验证符合性确认',
+  designConformanceVerification: '设计符合性确认',
+  nomorethan: '不能超过10个',
+  uploadedfilelarger: '文件大于',
+  marketCertificationList: '市场认证清单',
+  marketCertificationListDetails: '市场认证清单详情',
+  andTheProcessStatusTheList: '并且流程状态不能为清单待校核的数据',
+  pleasefillintherange: '请填写范围',
+  databasereportingtime: '同步上报库时间',
+  synchronizationtime: '同步时间',
+  listToBeReleased: '清单待发布',
+  listToBeChecked: '任务待发起',
+  taskToBeConfirmed: '任务待确认',
+  resultsToBeSubmitted: '结果待提交',
+  resultsToBeReviewed: '结果待审查',
+  compliance: '符合',
+  nonCompliance: '不符合',
+  toBeTracked: '待追踪',
+  NA: '不涉及',
+  reviewAndPass: '审查通过',
+  reviewAndReturn: '审查退回',
+  electroniccontrollerparameter: '电子控制器参数',
+  marketRegulationListDetails: '市场法规清单详情',
+  marketRegulationList: '市场法规清单',
+  onlyDataWithTheCurrentCanBeManipulated: '仅能操作责任人为当前用户的数据',
+  andTheAndTaskPendingConfirmation: '并且流程状态为结果待提交、审查退回、任务待确认',
+  andProcessStatusIsTaskPendingConfirmation: '并且流程状态为任务待确认',
+  andPendingSubmissionReviewReturned: '并且流程状态为结果待提交、审查退回',
+  deliverablesFor: '的交付结果',
+  dutyPersonRejected: '责任人拒绝',
+  theCurrentlySelectedDataContainsReviewed: '当前选择的数据中包含审查通过的数据，确认退回吗？',
+  reviewTheReasonForReturn: '审查退回原因',
+  reasonForTaskRejection: '任务拒绝原因',
+  reasonForReturningToStudio: '退回至Studio原因',
+  theDeliveryProcessCannotBeEmpty: '设计符合性流程的交付物类型不能为空',
+  theVerificationComplianceProcessCannotBeEmpty: '验证符合性流程的交付物类型不能为空',
+  deadlineForConfirmationDesignComplianceResponsibility: '设计符合性责任确认截止日期',
+  deadlineForVerifyingComplianceResponsibilityConfirmation: '验证符合性责任确认截止日期',
+  batchTaskResponsibilityConfirmation: '批量任务责任确认',
+  batchComplianceConfirmation: '批量符合性确认',
+  onlyDataWithApprovedCanCeSelected: '只能选择流程状态为结果待审查、审查通过的数据',
+  deadlineForResponsibilityConfirmation: '责任确认截止日期',
+  checkRegulatoryCompletedBefore: "检查法规要求在产品设计冻结前的落实，任务交付要求将首先在G1与工程团队完成输入和确认，并于G3前完成符合性确认和审查。",
+  checkVerificationResultsBeforeMP:'检查法规要求在产品量产前的验证结果，任务交付要求将首先在G1与工程团队完成输入和确认，并于MP前完成符合性确认和审查。',
+  modifyOperator:'修改操作人',
+  onlyDesignComplianceConfirmationSelected:'只能选择设计符合性确认流程状态为任务待确认、结果待提交或验证符合性确认流程状态为任务待确认、结果待提交的数据',
+  oneThePersonnelMustBeSelected:'必须选择其中一个人员',
+  pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据',
+  cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人',
+  lidar:'激光雷达',
+  history:'历史',
+  deliveryDate:'交付日期',
+  regulatoryEngineerReturns:'法规工程师退回',
+  designProcessStatus:'设计流程状态',
+  verifyProcessStatus:'验证流程状态',
+  design:'设计',
+  verify:'验证',
+  inventoryVerifyEndTime:'清单校核截止时间',
+  taskConfirmEndTime:'责任确认截止时间',
+  responsiblepersonfordesigncompliance:'设计符合性责任人',
+  responsiblepersonforverifyingcompliance:'验证符合性责任人',
+  verifytheconformancedeliverabletype:'验证符合性交付物类型',
+  designaconformancedeliverabletype:'设计符合性交付物类型',
+  reasonForReturnOfCompliance: '符合性退回原因',
+  supplementarySubmission:'补充提交',
+  confirmSupplementarySubmission:'确认补充提交?',
+  onlyProcessStatusOfApprovedCanBeSelected:'只能选择流程状态为审查通过的数据',
+  andTheOperatorCurrentData:',并且登录人为当前数据的责任人',
+  upgradeInstructions:'升版说明',
+  upgradeOrNot:'是否升版',
+  operationRecords:'操作记录',
+  versionUpdatedRecord:'版本更新记录',
+  regulatoryComplianceManagement:'法规符合性管理',
+  certificationActivityManagement:'认证活动管理',
+  parameterCollectionProgressManagement:'参数收集进度管理',
+  certificationTaskConfirmation:'认证任务确认',
+  selectTime:'选择时间',
+  designCompliance:'设计符合性',
+  verifyCompliance:'验证符合性',
+  stateExport:'状态导出',
+  completeVehicle:'整车',
+  components:'零部件',
+  componentReportNotSubmitted:'部件报告未提交',
+  componentReportSubmitted:'部件报告已提交',
+  componentReportHasBeenStored:'部件报告已入库',
+  parameterCollectionProgress:'参数收集进度',
+  proportion:'占比',
+  projectProgressStatistics:'项目进度统计',
+  GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
+  statisticalNodes:'统计节点',
+  proportionWithInTheAreaOfResponsibility:'责任领域内占比',
+  contentsearch:'内容搜索',
+  masterProject:'主项目',
+  deliveryTime:'交付时间',
+  expectedDeliveryTime:'预计交付时间',
+  changeAuthor:'更改作者',
+  requireddataisnull:'必填数据为空',
+  theProcessThatNeedsToBeReset:'需要重置的流程',
+  toResubmit:'重新提交',
+  selectDesignConformanceAsConformance:'请选择设计符合性确认流程状态为符合或验证符合性确认流程状态为符合的数据',
+  submissionProcess:'提交流程',
+  localapproval1:'地方批准1',
+  localapproval2:'地方批准2',
+  averageapprovalperiod:'平均审批周期',
+  day:'天',
+  passreturntime:'通过/退回时间',
+  approvalcycle:'审批周期(天)',
+  transittime:'通过时间',
+  returntime:'退回时间',
+  operationguide:'项目模块操作指南',
+  copyLink:'复制链接',
+  successfulReplication:'复制成功',
+  pleaseEnterUserAccountSearchFor:'请输入用户账号搜索',
+  exportOption:'导出选项',
+  includeTitle:'包含标题',
+  Notitleincluded:'不包含标题',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index afc0eb21d..24fdc6166 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -8,7 +8,7 @@
         :allowClear="isSingleChoice ? true : false"
         :label-in-value="isSingleChoice ? false:true"
         :value="selectValue"
-        :placeholder="$t('PleaseSelect')+query.db_field_txt"
+        :placeholder="$t('pleaseEnterUserAccountSearchFor')"
         style="width: 100%"
         :disabled="disabled"
         :default-active-first-option="false"
@@ -165,7 +165,7 @@
       getUserAndDepart(value, callback) {
         let query = {
           current: 1,
-          pageSize: 10,
+          pageSize: 20,
           username: '*' + value + '*'
         }
         getAction('/sys/user/page', query).then((res) => {
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index af43a52be..9b0e2148b 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -230,7 +230,12 @@
           //   this.queryParam['WarnTimeText'] = '2'
           // }
           let startTime = moment(new Date()).format('YYYY-MM-DD')
-          let endTime = this.getNowdate()
+          let endTime = ''
+          if (!this.queryParam['WarnTimeText']){
+            endTime = '2099-01-01'
+          }else{
+            endTime = this.getNowdate()
+          }
           if(this.queryParam['WarnTimeText'] == '5'){
             this.queryParam['WarnTime'] = [endTime, startTime]
           }else{
@@ -245,7 +250,7 @@
         if (this.isDefault) {
           let startTime = moment(new Date()).format('YYYY-MM-DD')
           // this.queryParam['WarnTimeText'] = '2'
-          let endTime = this.getNowdate()
+          let endTime = '2099-01-01'
           this.queryParam['WarnTime'] = [startTime, endTime]
           this.queryParam = { ...this.queryParam }
         }
@@ -295,6 +300,9 @@
         }else if (this.queryParam['WarnTimeText'] == '5') {
           monthData = 7
           yearData = -1
+        }else if (this.queryParam['WarnTimeText'] == '6') {
+          monthData = 37
+          yearData = 3
         }
         if(this.queryParam['WarnTimeText'] == '5'){
           var time = new Date();
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index d18952460..e67f9aea2 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -31,13 +31,30 @@
     <!--        <a-icon type="question-circle-o"></a-icon>-->
     <!--      </a>-->
     <!--    </span>-->
-    <div class="action" @click="Jumpflybook">
-      <span class="header-notice">
-         <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">
-          <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
-           </a-tooltip>
+    <!--    <div class="action" @click="Jumpflybook">-->
+    <!--      <span  class="header-notice">-->
+    <!--         <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">-->
+    <!--          <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>-->
+    <!--           </a-tooltip>-->
+    <!--      </span>-->
+    <!--    </div>-->
+    <a-dropdown>
+      <span class="action action-full ant-dropdown-link user-dropdown-menu">
+<!--        <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
+        <!--                <span v-if="isDesktop()">welcome,{{ userInfo().username }}</span>-->
+        <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
       </span>
-    </div>
+      <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
+        <a-menu-item key="5" @click="Jumpflybook">
+          <!--          <a-icon type="logout"/>-->
+          <span>{{$t('userManual')}}</span>
+        </a-menu-item>
+        <a-menu-item key="6" @click="Jumpoperationguide">
+          <!--          <a-icon type="logout"/>-->
+          <span>{{$t('operationguide')}}</span>
+        </a-menu-item>
+      </a-menu>
+    </a-dropdown>
     <header-notice class="action"/>
     <div class="action">
       <span v-show="localeval=='zh-cn'">
@@ -113,283 +130,281 @@
 </template>
 
 <script>
-  import HeaderNotice from './HeaderNotice'
-  import UserPassword from './UserPassword'
-  import SettingDrawer from '@/components/setting/SettingDrawer'
-  import DepartSelect from './DepartSelect'
-  import { mapActions, mapGetters, mapState } from 'vuex'
-  import { mixinDevice } from '@/utils/mixin.js'
-  import { getFileAccessHttpUrl, getAction } from '@/api/manage'
-  import Vue from 'vue'
-  import { UI_CACHE_DB_DICT_DATA, ACCESS_TOKEN } from '@/store/mutation-types'
-  import moment from 'moment'
-  import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
-  import enUS from 'ant-design-vue/es/locale/en_US'
-  import 'moment/locale/zh-cn'
-  import { generateIndexRouter } from '@/utils/util'
-  import store from '../../store'
-  import router, { resetRouter } from '../../router'
+import HeaderNotice from './HeaderNotice'
+import UserPassword from './UserPassword'
+import SettingDrawer from '@/components/setting/SettingDrawer'
+import DepartSelect from './DepartSelect'
+import { mapActions, mapGetters, mapState } from 'vuex'
+import { mixinDevice } from '@/utils/mixin.js'
+import { getFileAccessHttpUrl, getAction } from '@/api/manage'
+import Vue from 'vue'
+import { UI_CACHE_DB_DICT_DATA, ACCESS_TOKEN } from '@/store/mutation-types'
+import moment from 'moment'
+import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
+import enUS from 'ant-design-vue/es/locale/en_US'
+import 'moment/locale/zh-cn'
+import { generateIndexRouter } from '@/utils/util'
+import store from '../../store'
+import router, { resetRouter } from '../../router'
 
-  moment.locale('zh-cn')
-  const EN = 'en-us'
-  const ZH = 'zh-cn'
+moment.locale('zh-cn')
+const EN = 'en-us'
+const ZH = 'zh-cn'
 
-  export default {
-    name: 'UserMenu',
-    mixins: [mixinDevice],
-    data() {
-      return {
-        // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
-        searchMenuOptions: [],
-        searchMenuComp: 'span',
-        searchMenuVisible: false,
-        isLoading: false,
-        locale: zhCN,
-        localeval: 'zh-cn'
-        // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
-      }
-    },
-    components: {
-      HeaderNotice,
-      UserPassword,
-      DepartSelect,
-      SettingDrawer
-    },
-    props: {
-      theme: {
-        type: String,
-        required: false,
-        default: 'dark'
-      }
-    },
-    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-    created() {
-      let lists = []
-      this.searchMenus(lists, this.permissionMenuList)
-      this.searchMenuOptions = [...lists]
-    },
-    mounted() {
-      //如果是单点登录模式
-      if (process.env.VUE_APP_SSO == 'true') {
-        let depart = this.userInfo().orgCode
-        if (!depart) {
-          this.updateCurrentDepart()
-        }
-      }
-      this.localeval = localStorage.getItem('language')
-      if (this.localeval == 'zh-cn') {
-        this.$i18n.locale = ZH
-        this.locale = zhCN
-        moment.locale('zh-cn')
-      } else if (this.localeval == 'en-us') {
-        this.locale = enUS
-        moment.locale('en-us')
-        this.$i18n.locale = EN
-      }
-    },
-    computed: {
-      ...mapState({
-        // 后台菜单
-        permissionMenuList: state => state.user.permissionList
-
-      })
-    },
-    /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-    watch: {
-      // update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
-      device: {
-        immediate: true,
-        handler() {
-          this.searchMenuVisible = false
-          this.searchMenuComp = this.isMobile() ? 'a-modal' : 'span'
-        }
-      }
-      // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
-    },
-    methods: {
-      /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      showClick() {
-        this.searchMenuVisible = true
-      },
-      hiddenClick() {
-        this.shows = false
-      },
-      Jumpflybook() {
-        window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank')
-      },
-      /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      ...mapActions(['Logout']),
-      ...mapGetters(['username', 'avatar', 'userInfo']),
-      getAvatar() {
-        return getFileAccessHttpUrl(this.avatar())
-      },
-      handleLogout() {
-        const that = this
-
-        this.$confirm({
-          title: '提示',
-          content: '真的要注销登录吗 ?',
-          onOk() {
-            return that.Logout({}).then(() => {
-              // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              //  TODO  在部署线上时注掉以下代码
-              that.$router.push({ path: '/user/login' })
-              //  TODO  在部署线上时解开以下代码
-              // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
-              // encodeURIComponent(window.loginUrl) + '&response_type=code' //线上
-
-              localStorage.removeItem('language')
-              // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              //window.location.reload()
-            }).catch(err => {
-              that.$message.error({
-                title: '错误',
-                description: err.message
-              })
-            })
-          },
-          onCancel() {
-          }
-        })
-      },
-      updatePassword() {
-        let username = this.userInfo().username
-        this.$refs.userPassword.show(username)
-      },
-      updateCurrentDepart() {
-        this.$refs.departSelect.show()
-      },
-      systemSetting() {
-        this.$refs.settingDrawer.showDrawer()
-      },
-      /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      searchMenus(arr, menus) {
-        for (let i of menus) {
-          if (!i.hidden && 'layouts/RouteView' !== i.component) {
-            arr.push(i)
-          }
-          if (i.children && i.children.length > 0) {
-            this.searchMenus(arr, i.children)
-          }
-        }
-      },
-      filterOption(input, option) {
-        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      },
-      // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
-      searchMethods(value) {
-        let route = this.searchMenuOptions.filter(item => item.id === value)[0]
-        if (route.meta.internalOrExternal === true || route.component.includes('layouts/IframePageView')) {
-          window.open(route.meta.url, '_blank')
-        } else {
-          this.$router.push({ path: route.path })
-        }
-        this.searchMenuVisible = false
-      },
-      // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
-      /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
-      clearCache() {
-        getAction('sys/dict/refleshCache').then((res) => {
-          if (res.success) {
-            //重新加载缓存
-            getAction('sys/dict/queryAllDictItems').then((res) => {
-              if (res.success) {
-                Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
-                Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
-              }
-            })
-            this.$message.success('刷新缓存完成！')
-          }
-        }).catch(e => {
-          this.$message.warn('刷新缓存失败！')
-          console.log('刷新失败', e)
-        })
-      },
-      /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
-      moment,
-      changeLocale(localeval) {
-        this.isLoading = true
-        switch (localeval) {
-          case 'zh-cn':
-            localStorage.setItem('language', 'zh-cn')
-            break
-          case 'en-us':
-            localStorage.setItem('language', 'en-us')
-            break
-        }
-        getAction('/sys/dict/queryAllDictItemsByCut', {}).then((res) => {
-          if (res.success) {
-            Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
-            Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
-            store.dispatch('GetPermissionList').then(res => {
-              const menuData = res.result.menu
-              resetRouter()
-              let constRoutes = []
-              constRoutes = generateIndexRouter(menuData)
-
-              let isPhone = localStorage.getItem('isPhone')
-              if (isPhone == 'yes') {
-                router.addRoutes([{
-                  'path': '*', 'redirect': '/404', 'hidden': true
-                }])
-              } else {
-                router.addRoutes(constRoutes)
-              }
-              this.$root.Bus.$emit('switchLanguage', localeval)
-              this.isLoading = false
-              this.localeval = localeval
-              if (localeval === EN) {
-                moment.locale(EN)
-                this.$i18n.locale = EN
-                this.locale = enUS
-              } else {
-                moment.locale(ZH)
-                this.$i18n.locale = ZH
-                this.locale = zhCN
-              }
-            })
-          }
-        })
+export default {
+  name: 'UserMenu',
+  mixins: [mixinDevice],
+  data() {
+    return {
+      // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+      searchMenuOptions: [],
+      searchMenuComp: 'span',
+      searchMenuVisible: false,
+      isLoading: false,
+      locale: zhCN,
+      localeval: 'zh-cn'
+      // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+    }
+  },
+  components: {
+    HeaderNotice,
+    UserPassword,
+    DepartSelect,
+    SettingDrawer
+  },
+  props: {
+    theme: {
+      type: String,
+      required: false,
+      default: 'dark'
+    }
+  },
+  /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+  created() {
+    let lists = []
+    this.searchMenus(lists, this.permissionMenuList)
+    this.searchMenuOptions = [...lists]
+  },
+  mounted() {
+    //如果是单点登录模式
+    if (process.env.VUE_APP_SSO == 'true') {
+      let depart = this.userInfo().orgCode
+      if (!depart) {
+        this.updateCurrentDepart()
       }
     }
+    this.localeval = localStorage.getItem('language')
+    if (this.localeval == 'zh-cn') {
+      this.$i18n.locale = ZH
+      this.locale = zhCN
+      moment.locale('zh-cn')
+    } else if (this.localeval == 'en-us') {
+      this.locale = enUS
+      moment.locale('en-us')
+      this.$i18n.locale = EN
+    }
+  },
+  computed: {
+    ...mapState({
+      // 后台菜单
+      permissionMenuList: state => state.user.permissionList
+
+    })
+  },
+  /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+  watch: {
+    // update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+    device: {
+      immediate: true,
+      handler() {
+        this.searchMenuVisible = false
+        this.searchMenuComp = this.isMobile() ? 'a-modal' : 'span'
+      }
+    }
+    // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+  },
+  methods: {
+    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    showClick() {
+      this.searchMenuVisible = true
+    },
+    hiddenClick() {
+      this.shows = false
+    },
+    Jumpflybook(){
+      window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank');
+    },
+    Jumpoperationguide(){
+      window.open('https://eicgyqr5mc.feishu.cn/docx/ZyhWdIz7EoMZ68xhI2bckcWWnMg', '_blank');
+    },
+    /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    ...mapActions(['Logout']),
+    ...mapGetters(['username', 'avatar', 'userInfo']),
+    getAvatar() {
+      return getFileAccessHttpUrl(this.avatar())
+    },
+    handleLogout() {
+      const that = this
+
+      this.$confirm({
+        title: '提示',
+        content: '真的要注销登录吗 ?',
+        onOk() {
+          return that.Logout({}).then(() => {
+            // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
+            //  TODO  在部署线上时注掉以下代码
+            that.$router.push({ path: '/user/login' })
+
+            // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' +
+            // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地
+            //  TODO  在部署线上时解开以下代码
+            // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
+            // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上
+
+            localStorage.removeItem('language')
+            // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
+            //window.location.reload()
+          }).catch(err => {
+            that.$message.error({
+              title: '错误',
+              description: err.message
+            })
+          })
+        },
+        onCancel() {
+        }
+      })
+    },
+    updatePassword() {
+      let username = this.userInfo().username
+      this.$refs.userPassword.show(username)
+    },
+    updateCurrentDepart() {
+      this.$refs.departSelect.show()
+    },
+    systemSetting() {
+      this.$refs.settingDrawer.showDrawer()
+    },
+    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    searchMenus(arr, menus) {
+      for (let i of menus) {
+        if (!i.hidden && 'layouts/RouteView' !== i.component) {
+          arr.push(i)
+        }
+        if (i.children && i.children.length > 0) {
+          this.searchMenus(arr, i.children)
+        }
+      }
+    },
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
+    // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
+    searchMethods(value) {
+      let route = this.searchMenuOptions.filter(item => item.id === value)[0]
+      if (route.meta.internalOrExternal === true || route.component.includes('layouts/IframePageView')) {
+        window.open(route.meta.url, '_blank')
+      } else {
+        this.$router.push({ path: route.path })
+      }
+      this.searchMenuVisible = false
+    },
+    // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
+    /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
+    clearCache() {
+      getAction('sys/dict/refleshCache').then((res) => {
+        if (res.success) {
+          //重新加载缓存
+          getAction('sys/dict/queryAllDictItems').then((res) => {
+            if (res.success) {
+              Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+              Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
+            }
+          })
+          this.$message.success('刷新缓存完成！')
+        }
+      }).catch(e => {
+        this.$message.warn('刷新缓存失败！')
+        console.log('刷新失败', e)
+      })
+    },
+    /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
+    moment,
+    changeLocale(localeval) {
+      this.isLoading = true
+      switch (localeval) {
+        case 'zh-cn':
+          localStorage.setItem('language', 'zh-cn')
+          break
+        case 'en-us':
+          localStorage.setItem('language', 'en-us')
+          break
+      }
+      getAction('/sys/dict/queryAllDictItemsByCut', {}).then((res) => {
+        if (res.success) {
+          Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+          Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
+          store.dispatch('GetPermissionList').then(res => {
+            const menuData = res.result.menu
+            resetRouter()
+            let constRoutes = []
+            constRoutes = generateIndexRouter(menuData)
+            router.addRoutes(constRoutes)
+            this.$root.Bus.$emit('switchLanguage', localeval)
+            this.isLoading = false
+            this.localeval = localeval
+            if (localeval === EN) {
+              moment.locale(EN)
+              this.$i18n.locale = EN
+              this.locale = enUS
+            } else {
+              moment.locale(ZH)
+              this.$i18n.locale = ZH
+              this.locale = zhCN
+            }
+          })
+        }
+      })
+    }
   }
+}
 </script>
 
 <style lang="less" scoped>
-  /* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
-  /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  .user-wrapper .search-input {
-    width: 180px;
-    color: inherit;
+/* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+.user-wrapper .search-input {
+  width: 180px;
+  color: inherit;
 
-    /deep/ .ant-select-selection {
-      background-color: inherit;
-      border: 0;
-      border-bottom: 1px solid white;
+  /deep/ .ant-select-selection {
+    background-color: inherit;
+    border: 0;
+    border-bottom: 1px solid white;
 
-      &__placeholder, &__field__placeholder {
-        color: inherit;
-      }
+    &__placeholder, &__field__placeholder {
+      color: inherit;
     }
   }
+}
 
-  /* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+/* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
 </style>
 
 <style scoped>
-  .logout_title {
-    color: inherit;
-    text-decoration: none;
-  }
+.logout_title {
+  color: inherit;
+  text-decoration: none;
+}
 
-  .action {
-    color: rgba(0, 0, 0, 0.65) !important;
-    font-size: 14px;
-  }
+.action {
+  color: rgba(0, 0, 0, 0.65) !important;
+  font-size: 14px;
+}
 
-  .action .avatar {
-    background: #ccc !important;
-  }
+.action .avatar {
+  background: #ccc !important;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index 4486e7def..e8198ea15 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -30,7 +30,7 @@
             <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
           </a>
       </span>
-      </div>
+        </div>
       </div>
       <div class="box-content-content">
         <div class="box-content-content-index"
@@ -127,6 +127,10 @@
               </div>
             </div>
             <div class="content-box-button-right">
+              <div class="content-box-button-text" @click="copyLinkClick(item)">
+                <img src="~/@assets/feishu.png" alt="" class="jumpicon">
+                {{$t('copyLink')}}
+              </div>
               <div class="content-box-button-text" @click="pushJump(item)">
                 <img src="~/@assets/feishu.png" alt="" class="jumpicon">
                 {{$t('contactTheFounder')}}
@@ -424,9 +428,9 @@
         this.queryForm = row
         this.$refs.SelectedByRef.getPush()
       },
-      pushJump(row){
+      pushJump(row) {
         let query = {
-          userName: row.createBy,
+          userName: row.createBy
         }
         postAction('/lark/getLarkApplinkByUserName', query).then((res) => {
           if (res.code === 200) {
@@ -465,6 +469,12 @@
       },
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      copyLinkClick(item) {
+        let text = window.location.host + this.$route.path + '?id=' + item.id
+        navigator.clipboard.writeText(text).then((res) => {
+          this.$message.success(this.$t('successfulReplication'))
+        })
       }
     }
   }
@@ -476,10 +486,12 @@
     overflow: hidden;
     /*margin: 0 auto;*/
   }
-  .jumpicon{
+
+  .jumpicon {
     height: 13.72px;
     width: 15.44px;
   }
+
   .box-title-text {
     line-height: 1.4;
     width: 360px;
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
index bd7912d77..5c8071ca9 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
@@ -53,6 +53,10 @@
           </div>
         </div>
         <div class="content-box-button-right">
+          <div class="content-box-button-text" @click="copyLinkClick(queryForm)">
+            <img src="~/@assets/feishu.png" alt="" class="jumpicon">
+            {{$t('copyLink')}}
+          </div>
           <div class="content-box-button-text" @click="pushJump(queryForm)">
             <img src="~/@assets/feishu.png" alt="" class="jumpicon">
             {{$t('contactTheFounder')}}
@@ -493,6 +497,12 @@
             this.$refs.SelectedByRef.submitLoading = false
           }
         })
+      },
+      copyLinkClick(item) {
+        let text = window.location.host + this.$route.path + '?id=' + item.id
+        navigator.clipboard.writeText(text).then((res) => {
+          this.$message.success(this.$t('successfulReplication'))
+        })
       }
     }
   }
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
index c7c034892..09031d2a8 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
@@ -241,10 +241,10 @@ export default {
       })
     },
     addClick(index){
-      if(this.formInline.dataList.length + 1 > 10){
-        this.$message.warning(this.$t('nomorethan'))
-        return
-      }
+      // if(this.formInline.dataList.length + 1 > 10){
+      //   this.$message.warning(this.$t('nomorethan'))
+      //   return
+      // }
       this.formInline.dataList.splice(index + 1, 0, {})
       this.formInline = { ...this.formInline }
     },
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
index d02319143..c3f94629e 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
@@ -30,11 +30,11 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-                            <span class="Required">*</span>
+                            <span v-if='!propflag' class="Required">*</span>
               <span class="title-text-text" :title="$t('filingtime')">
                 {{$t('filingtime')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="batjsj">
+            <a-form-model-item class="itemModel" :prop="!propflag?'batjsj':''" :key="propflag">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('filingtime')"
                              @change="dateChange({db_field_name:'batjsj'})"
@@ -46,6 +46,44 @@
             </a-form-model-item>
           </div>
         </a-col>
+        <a-col :span="24" v-if='transittime'>
+          <div class="box-title-text">
+            <div class="title-text">
+              <span v-if='!propflag' class="Required">*</span>
+              <span class="title-text-text" :title="$t('transittime')">
+                {{$t('transittime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="tgthsj">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('transittime')"
+                             @change="dateChange({db_field_name:'tgthsj'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.tgthsj"
+                             :disabled="false"
+                             style="width: 90%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24" v-if='returntime'>
+          <div class="box-title-text">
+            <div class="title-text">
+              <span v-if='!propflag' class="Required">*</span>
+              <span class="title-text-text" :title="$t('returntime')">
+                {{$t('returntime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="tgthsj">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('returntime')"
+                             @change="dateChange({db_field_name:'tgthsj'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.tgthsj"
+                             :disabled="false"
+                             style="width: 90%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
@@ -77,9 +115,13 @@ export default {
     return {
       visible: false,
       confirmLoading: false,
+      transittime:false,
+      returntime:false,
+      propflag: false,
       formInline: {
         bazt:undefined,
         batjsj:'',
+        tgthsj:'',
         bz:'',
       },
       rules: {
@@ -99,7 +141,14 @@ export default {
         ],
         bz: [
           { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
-        ]
+        ],
+        tgthsj: [
+          {
+            required: true,
+            message: this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // listConfirmation: [
         //   {
         //     required: true,
@@ -161,16 +210,43 @@ export default {
         this.ids = row.join(',')
         this.formInline = {
           bazt:undefined,
+          tgthsj:'',
           batjsj:'',
           bz:'',
         }
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
       }else{
         this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
+        this.formInline.tgthsj = row.tgthsj
         this.formInline.bz = row.bz
         this.ids = row.id
+        if (this.formInline.bazt == 1) {
+          this.propflag = true
+          this.transittime = false
+          this.returntime = false
+        } else if (this.formInline.bazt == 2) {
+          this.propflag = true
+          this.transittime = false
+          this.returntime = false
+        } else if(this.formInline.bazt == 4){
+          this.propflag = false
+          this.transittime = true
+          this.returntime = false
+        } else if(this.formInline.bazt == 5){
+          this.propflag = false
+          this.returntime = true
+          this.transittime = false
+        }else{
+          this.propflag = false
+          this.transittime = false
+          this.returntime = false
+        }
       }
       this.visible = true
+
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate()
       })
@@ -197,7 +273,29 @@ export default {
         }
       })
     },
-    selectchange(value){
+    selectchange(value) {
+      console.log(value)
+      if (value == 1) {
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
+      } else if (value == 2) {
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
+      } else if(value == 4){
+        this.propflag = false
+        this.transittime = true
+        this.returntime = false
+      } else if(value == 5){
+        this.propflag = false
+        this.returntime = true
+        this.transittime = false
+      }else{
+        this.propflag = false
+        this.transittime = false
+        this.returntime = false
+      }
       this.$nextTick(() => {
         this.formInline = { ...this.formInline }
         this.$refs.ruleForm.validateField('bazt')
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index 48692641d..b0737e69a 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -91,36 +91,36 @@
     </div>
     <div class="table-operator">
       <div @click="createvehicleandfunctionrecords"
-           v-has="'regulatoryAndTechnicalAssessment:initiationProcess'"
+           v-has="'otasj:cjcxjgnba'"
            class="operator-text">
         <a-icon type="plus"/>
         {{$t('createanupgradeactivityrecord')}}
       </div>
       <div @click="citeforrecord"
-           v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
+           v-has="'otasj:yyba'"
            class="operator-text">
         <a-icon type="solution"/>
         {{$t('citeforrecord')}}
       </div>
       <div @click="maintenanceallClick()"
-           v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
+           v-has="'otasj:sjwh'"
            class="operator-text">
         <a-icon type="setting"/>
         {{$t('datamaintenance')}}
       </div>
-      <div v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
+      <div v-has="'otasj:sjdr'"
            class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true"
                     :accept="'.zip'" @getList="getList"/>
       </div>
       <div @click="handleModule"
-           v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
+           v-has="'otasj:mbxz'"
            class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
       <div @click="gnxtwhClick"
-           v-has="'regulatoryAndTechnicalAssessment:batchDelete'"
+           v-has="'otasj:onxtwh'"
            class="operator-text">
         <a-icon type="solution"/>
         {{$t('gnxtwh')}}
@@ -159,6 +159,9 @@
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
       </a-table>
+      <div>
+        {{$t('averageapprovalperiod')}} : {{number}}{{$t('day')}}
+      </div>
       <div class="page" v-if="dataSource && dataSource.length > 0">
         <a-pagination
           :show-total="total => $t('total')+` ${total} `+$t('strip')"
@@ -205,6 +208,7 @@ export default {
         importZipUrl: '/ota/otaBaSjList/importData',//导入
 
       },
+      number:'',
       visible: false,
       loading: false,
       toggleSearchStatus: false,
@@ -301,9 +305,23 @@ export default {
           title: this.$t('filingtime'),
           align: 'left',
           ellipsis: true,
-          width: 140,
+          width: 170,
           dataIndex: 'batjsj'
         },
+        {
+          title: this.$t('passreturntime'),
+          align: 'left',
+          ellipsis: true,
+          width: 170,
+          dataIndex: 'tgthsj'
+        },
+        {
+          title: this.$t('approvalcycle'),
+          align: 'left',
+          ellipsis: true,
+          width: 140,
+          dataIndex: 'spzq'
+        },
         {
           title: this.$t('createTime'),
           align: 'left',
@@ -374,13 +392,14 @@ export default {
       this.loading = true
       getAction('/ota/otaBaSjList/page', query).then((res) => {
         if (res.success) {
-          if (res.result.current > 1 && res.result.records.length == 0) {
+          if (res.result.list.current > 1 && res.result.list.records.length == 0) {
             this.pageNo = 1
             this.getList()
             return
           }
-          this.dataSource = res.result.records || []
-          this.total = res.result.total
+          this.dataSource = res.result.list.records || []
+          this.number = res.result.pjspzq
+          this.total = res.result.list.total
           this.loading = false
         } else {
           this.loading = false
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index 09c93952f..e76dd38c4 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -2,10 +2,10 @@
   <!-- 第五页 -->
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otasjxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otasjxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
index 4ed59496c..1a5f21f17 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -2,10 +2,10 @@
   <!-- 第二页 -->
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otasjxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otasjxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 8583fb4b0..a8f3d442e 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -2,10 +2,10 @@
   <!-- 第四页 -->
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otasjxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otasjxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
@@ -60,8 +60,8 @@
         <span slot="differentialupgradeornot" slot-scope="text,record" :max-length="50">
 <!--        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>-->
           <a-radio-group v-model="record.sfcfsj">
-            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            <a-radio :value="'1'"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="'2'"> {{ $t('not') }} </a-radio>
           </a-radio-group>
       </span>
       <!--      操作列-->
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index 1bd0f1aab..330db7124 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -2,10 +2,10 @@
   <!-- 第三页 -->
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otasjxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otasjxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
@@ -136,11 +136,35 @@
       </tr>
       <tr>
         <td colspan="2" align="left" height="50px">{{$t('upgradeactivityprovidesuserconfirmationoptions')}}</td>
-        <td height="50px">
-          <a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
-            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-            <a-radio :value="2"> {{ $t('not') }} </a-radio>
-          </a-radio-group>
+        <td :height="qrheight" style='position: relative'>
+          <div>
+            <a-radio-group class='box-input-qr' @change='qrchange' v-model="form.yhqr">
+              <a-radio :value="'1'"> {{ $t('yes') }} </a-radio>
+              <a-radio :value="'2'"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </div>
+          <div v-if='flagqr'>
+            <j-dict-select-tag class="box-input2"
+                                v-model="form.flagqr"
+                                :disabled="disable"
+                                dictCode="O_T_A_-_sheng1_ji2_ying3_xiang3_ping2_gu1_-_sheng1_ji2_que4_ren4"
+                                :placeholder="$t('PleaseSelect')"
+                                :type="'select'"
+                                @input="handleInput(form.flagqr)"
+                                :triggerChange="false"/>
+          </div>
+          <div v-if='flagqrqt'>
+            <a-input class="box-input-qr2"
+                     v-model="form.qttext"
+                     :title="form.qttext ? form.qttext : $t('PleaseEnter')"
+                     :placeholder="$t('PleaseEnter')"></a-input>
+          </div>
+          <div v-if='flagly'>
+            <a-input class="box-input2"
+                     v-model="form.ly"
+                     :title="form.ly ? form.ly : $t('PleaseEnter')+ $t('reason')"
+                     :placeholder="$t('PleaseEnter')+ $t('reason')"></a-input>
+          </div>
         </td>
       </tr>
       <tr>
@@ -200,6 +224,9 @@ export default {
         importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
       flag:false,
+      flagqr:false,
+      flagqrqt:false,
+      flagly:false,
       loading: false,
       disable:false,
       columns: [
@@ -329,6 +356,7 @@ export default {
           scopedSlots: { customRender: 'operation' }
         }
       ],
+      qrheight:'50px',
       form:{
         sjmd:'',
       }
@@ -397,6 +425,30 @@ this.$forceUpdate()
           }else{
             this.flag = false
           }
+          if(this.form.yhqr == '1'){
+            this.flagqr = true
+            this.flagly = false
+            this.qrheight = '100px'
+          }else{
+            this.flagqr = false
+            this.flagly = true
+            this.qrheight = '100px'
+          }
+          if(this.form.yhqr == '1' && this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){
+            this.qrheight = '150px'
+            this.flagqrqt = true
+            this.flagly = false
+          }else if(this.form.yhqr == '1' && this.form.flagqr != '344a3320beba45afb3718c59b7a7144a'){
+            this.flagqr = true
+            this.flagqrqt = false
+            this.flagly = false
+            this.qrheight = '100px'
+          }else {
+            this.flagqrqt = false
+            this.flagqr = false
+            this.flagly = true
+            this.qrheight = '100px'
+          }
         })
     },
     save(){
@@ -426,19 +478,39 @@ this.$forceUpdate()
     changeQuery(val) {
       if(val.indexOf('将车辆置于安全状态') != -1 || val.indexOf('Put the vehicle in a safe position') != -1){
         this.flag = true
-        // let long = localStorage.getItem('language')
-        // let cut = ''
-        // if (long && long == 'zh-cn') {
           this.form.aqjzWbk = '车辆保持在功能受限制状态，此状态下车辆无法行驶，保证其处于安全状态'
-        // } else if (long && long == 'en-us') {
-        //   this.form.aqjzWbk = 'The vehicle remains in a functionally restricted state, in which the vehicle cannot be driven to ensure that it is in a safe state'
-        // }
-        // this.getData()
       }else{
         this.flag = false
         this.form.aqjzWbk = ''
       }
     },
+    qrchange(val){
+      if(val.target.value == '1'){
+        this.qrheight = '100px'
+        this.flagqr = true
+        this.flagly = false
+        if(this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){
+          this.qrheight = '150px'
+          this.flagqrqt = true
+        }
+      }else{
+        this.qrheight = '100px'
+        this.flagly = true
+        this.flagqr = false
+        this.flagqrqt = false
+      }
+    },
+    handleInput(val){
+      if(val == '344a3320beba45afb3718c59b7a7144a'){
+        this.qrheight = '150px'
+        this.flagqrqt = true
+        this.flagly = false
+      }else {
+        this.qrheight = '100px'
+        this.flagqrqt = false
+        this.flagly = false
+      }
+    },
   }
 }
 </script>
@@ -475,6 +547,15 @@ this.$forceUpdate()
   margin-left: 40px;
   top: 4px;
 }
+.box-input-qr {
+  //display: inline-block;
+  width: calc(100% - 80px);
+  position: absolute;
+  top: 16px;
+  height: 38px;
+  margin-left: 40px;
+  //top: 4px;
+}
 .box-input2 {
   //display: inline-block;
   width: calc(100% - 80px);
@@ -483,6 +564,14 @@ this.$forceUpdate()
   margin-left: 40px;
   top: 50px;
 }
+.box-input-qr2 {
+  //display: inline-block;
+  width: calc(100% - 80px);
+  position: absolute;
+  height: 38px;
+  margin-left: 40px;
+  top: 95px;
+}
 ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
   white-space: pre-wrap!important;
 }
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index c2a5a9896..b9f9b4c49 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -2,11 +2,11 @@
   <!-- 第一页 -->
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otasjxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"
           @getList="getData" />
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otasjxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download" />
         {{ $t('templateDownload') }}
       </div>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index 6bbe680d2..93a6ea5bd 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -2,10 +2,10 @@
   <!-- 第六页 -->
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otasjxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otasjxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index 905b33b69..4fcb6718c 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otacxxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otacxxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index c167eeeb1..47ead5737 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otacxxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otacxxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
index 56603daa1..0a0649e4b 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otacxxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otacxxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index 329fb4e9b..c5dc06cc5 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otacxxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otacxxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
index 433756917..88e4eaccf 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otacxxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otacxxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index 45fb79701..37debd62d 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="box">
     <div class="table-operator">
-      <div class="operator-text">
+      <div v-has="'otacxxx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
       </div>
-      <div @click='handleModule' class="operator-text">
+      <div v-has="'otacxxx:mbxz'" @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
index ddba93e87..4ce4dab89 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
@@ -30,17 +30,56 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-                            <span class="Required">*</span>
+              <span v-if='!propflag' class="Required">*</span>
               <span class="title-text-text" :title="$t('filingtime')">
                 {{$t('filingtime')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="batjsj">
+            <a-form-model-item class="itemModel" :prop="!propflag?'batjsj':''" :key="propflag">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('filingtime')"
                              @change="dateChange({db_field_name:'batjsj'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
                              v-model="formInline.batjsj"
+                             :disabled="false"
+                             style="width: 90%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24" v-if='transittime'>
+          <div class="box-title-text">
+            <div class="title-text">
+              <span v-if='!propflag' class="Required">*</span>
+              <span class="title-text-text" :title="$t('transittime')">
+                {{$t('transittime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="tgthsj">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('transittime')"
+                             @change="dateChange({db_field_name:'tgthsj'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.tgthsj"
+                             :disabled="false"
+                             style="width: 90%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24" v-if='returntime'>
+          <div class="box-title-text">
+            <div class="title-text">
+              <span v-if='!propflag' class="Required">*</span>
+              <span class="title-text-text" :title="$t('returntime')">
+                {{$t('returntime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="tgthsj">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('returntime')"
+                             @change="dateChange({db_field_name:'tgthsj'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.tgthsj"
+                             :disabled="false"
                              style="width: 90%"/>
             </a-form-model-item>
           </div>
@@ -79,8 +118,12 @@ export default {
       formInline: {
         bazt:undefined,
         batjsj:'',
+        tgthsj:'',
         bz:'',
       },
+      transittime:false,
+      returntime:false,
+      propflag: false,
       rules: {
         bazt: [
           {
@@ -98,7 +141,14 @@ export default {
         ],
         bz: [
           { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
-        ]
+        ],
+        tgthsj: [
+          {
+            required: true,
+            message: this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // designDeadline: [
         //   {
         //     required: true,
@@ -147,13 +197,39 @@ export default {
         this.formInline = {
             bazt:undefined,
             batjsj:'',
+            tgthsj:'',
             bz:'',
         }
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
       }else{
         this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
+        this.formInline.tgthsj = row.tgthsj
         this.formInline.bz = row.bz
         this.ids = row.id
+        if (this.formInline.bazt == 1) {
+          this.propflag = true
+          this.transittime = false
+          this.returntime = false
+        } else if (this.formInline.bazt == 2) {
+          this.propflag = true
+          this.transittime = false
+          this.returntime = false
+        } else if(this.formInline.bazt == 4){
+          this.propflag = false
+          this.transittime = true
+          this.returntime = false
+        } else if(this.formInline.bazt == 5){
+          this.propflag = false
+          this.returntime = true
+          this.transittime = false
+        }else{
+          this.propflag = false
+          this.transittime = false
+          this.returntime = false
+        }
       }
       this.visible = true
       this.$nextTick(() => {
@@ -183,6 +259,27 @@ export default {
       })
     },
     selectchange(value){
+      if (value == 1) {
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
+      } else if (value == 2) {
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
+      } else if(value == 4){
+        this.propflag = false
+        this.transittime = true
+        this.returntime = false
+      } else if(value == 5){
+        this.propflag = false
+        this.returntime = true
+        this.transittime = false
+      }else{
+        this.propflag = false
+        this.transittime = false
+        this.returntime = false
+      }
       this.$nextTick(() => {
         this.formInline = { ...this.formInline }
         this.$refs.ruleForm.validateField('bazt')
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
index f3278c7d0..527118776 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
@@ -90,23 +90,23 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="createvehicleandfunctionrecords" v-has="'regulatoryAndTechnicalAssessment:initiationProcess'"
+      <div @click="createvehicleandfunctionrecords" v-has="'otacx:cjcxjgnba'"
         class="operator-text">
         <a-icon type="plus" />
         {{ $t('createvehicleandfunctionrecords') }}
       </div>
-      <div @click="citeforrecord" v-has="'regulatoryAndTechnicalAssessment:batchDelete'" class="operator-text">
+      <div @click="citeforrecord" v-has="'otacx:yyba'" class="operator-text">
         <a-icon type="solution" />
         {{ $t('citeforrecord') }}
       </div>
-      <div @click="maintenanceallClick()" v-has="'regulatoryAndTechnicalAssessment:batchDelete'" class="operator-text">
+      <div @click="maintenanceallClick()" v-has="'otacx:sjwh'" class="operator-text">
         <a-icon type="setting" />
         {{ $t('datamaintenance') }}
       </div>
-      <div v-has="'regulatoryAndTechnicalAssessment:batchDelete'" class="operator-text">
+      <div v-has="'otacx:sjdr'" class="operator-text">
         <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getList"/>
       </div>
-      <div @click="handleModule" v-has="'regulatoryAndTechnicalAssessment:batchDelete'" class="operator-text">
+      <div @click="handleModule" v-has="'otacx:mbxz'" class="operator-text">
         <a-icon type="download" />
         {{ $t('templateDownload') }}
       </div>
@@ -126,6 +126,9 @@
             @click="deleteData(record)">{{ $t('delete') }}</a>
         </span>
       </a-table>
+      <div>
+        {{$t('averageapprovalperiod')}} : {{number}}{{$t('day')}}
+      </div>
       <div class="page" v-if="dataSource && dataSource.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="pageOnChange"
@@ -159,6 +162,7 @@ export default {
         exportData: '/ota/otaBaCxList/exportData',
         importZipUrl: '/ota/otaBaCxList/importData',//导入
       },
+      number:'',
       visible: false,
       loading: false,
       toggleSearchStatus: false,
@@ -251,6 +255,20 @@ export default {
           width: 140,
           dataIndex: 'batjsj'
         },
+        {
+          title: this.$t('passreturntime'),
+          align: 'left',
+          ellipsis: true,
+          width: 170,
+          dataIndex: 'tgthsj'
+        },
+        {
+          title: this.$t('approvalcycle'),
+          align: 'left',
+          ellipsis: true,
+          width: 140,
+          dataIndex: 'spzq'
+        },
         {
           title: this.$t('createTime'),
           align: 'left',
@@ -321,13 +339,14 @@ export default {
       this.loading = true
       getAction('/ota/otaBaCxList/page', query).then((res) => {
         if (res.success) {
-          if (res.result.current > 1 && res.result.records.length == 0) {
+          if (res.result.list.current > 1 && res.result.list.records.length == 0) {
             this.pageNo = 1
             this.getList()
             return
           }
-          this.dataSource = res.result.records || []
-          this.total = res.result.total
+          this.dataSource = res.result.list.records || []
+          this.number = res.result.pjspzq
+          this.total = res.result.list.total
           this.loading = false
         } else {
           this.loading = false
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index 5983c3f11..436fd4bee 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -152,7 +152,7 @@ export default {
           { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' },
           { min:1, max: 1, message: this.$t('onlyone'), trigger: 'blur' },
           {
-            pattern: /^[\`\~\!\@\$\%\^\&\*\(\)\_\+\-\= \[\]\{\}\\\|\;\'\'\:\"\"\\.\/\<\>\?]+$/,
+            pattern: /^[\`\~\!\@\$\%\^\&\*\(\)\_\+\-\= \[\]\{\}\\\|\;\'\'\:\"\"\\.\/\<\>\?\,]+$/,
             message: this.$t('punctuationmark'),
             trigger: 'blur'
           }
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 2b7829bc7..42a3f30a8 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -71,6 +71,38 @@
                   v-model="formInline.sdtName"/>
               </div>
             </a-col>
+              <a-col :md="6" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('NareaOfResponsibility')">
+                    <span>{{$t('NareaOfResponsibility')}}</span>
+                  </div>
+                  <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                      :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
+                                      :type="'select'"
+                                      :triggerChange="false" :dictCode="'duty_territory'"/>
+                </div>
+              </a-col>
+              <a-col :md="6" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('Required')">
+                    <span>{{$t('Required')}}</span>
+                  </div>
+<!--                  <j-multi-select-tag class="box-input" v-model="formInline.isMust"-->
+<!--                                      :placeholder="$t('PleaseSelect')+$t('Required')"-->
+<!--                                      :type="'select'"-->
+<!--                                      :triggerChange="false" :dictCode="'duty_territory'"/>-->
+<!--                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Required')"-->
+<!--                           v-model="formInline.isMust"></a-input>-->
+                  <a-select class="box-input" v-model="formInline.isMust" :placeholder="$t('PleaseSelect')+$t('Required')">
+                    <a-select-option :value="'1'">
+                      {{$t('yes')}}
+                    </a-select-option>
+                    <a-select-option :value="'0'">
+                      {{$t('notOnlyRz')}}
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </a-col>
             </template>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -92,6 +124,11 @@
         <a-icon type="check-circle"/>
         {{$t('preservation')}}
       </div>
+      <!--      导出-->
+      <div @click="handleExport" class="operator-text" v-has="'report:detail:export:general'">
+        <a-icon type="export"/>
+        {{$t('dataExport')}}
+      </div>
       <div @click="ConventionalExport" class="operator-text" v-has="'report:detail:export:normal'">
         <a-icon type="export" :rotate="-90"/>
         {{$t('ConventionalExport')}}
@@ -182,7 +219,7 @@
 </template>
 
 <script>
-  import { getAction, postAction } from '../../../api/manage'
+import { downloadFile, getAction, postAction } from '../../../api/manage'
   import axios from 'axios'
   import TableCollection from '@/components/tableCollection/index1'
   import conventionalModel from './commponts/conventionalmodle'
@@ -668,6 +705,28 @@
       listReset() {
         this.formInline = {}
       },
+      //导出
+      handleExport() {
+        this.$message.success(this.$t('Intheexport'))
+        let long = localStorage.getItem('language')
+        this.cut = ''
+        if (long && long === 'zh-cn') {
+          this.cut = 'cn'
+        } else if (long && long === 'en-us') {
+          this.cut = 'en'
+        }
+        console.log(this.selectedRowKeys)
+        let query = {
+          paramsManifestId: this.$route.query.id,
+          cut: this.cut,
+          // userTypes: this.currentPersonRole,
+          ids:this.selectedRowKeys.join(','),
+          ...this.formInline,
+          exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        }
+        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+        downloadFile('/report/detail/exportGeneral', name, query, this.selectClear)
+      },
       ConventionalExport() {
         this.$refs.conventionalModel.addModel()
       },
diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue
index a21923ced..e8fd14881 100644
--- a/jero-web/src/views/phoneView/toDoCenter.vue
+++ b/jero-web/src/views/phoneView/toDoCenter.vue
@@ -458,8 +458,9 @@
       },
       toDoCenterClick(row, isTrue) {
         let query = {}
-        if (!this.form.flowType) {
-          this.form.flowType = []
+        let flowType = ''
+        if (this.form.flowType && this.form.flowType instanceof Array){
+          flowType = this.form.flowType.join(',')
         }
         row.taskId = row.taskId + ''
         if (row.taskId.length > 30) {
@@ -488,7 +489,7 @@
             activeTab: this.activeTab,
             checked: this.form.checked,
             selectModel: this.form.selectModel,
-            searchFlowType: this.form.flowType.join(',')
+            searchFlowType: flowType
           }
           this.$router.push({
             path: '/phoneProcessManagement',
@@ -512,7 +513,7 @@
             goRouter: '/phoneToDoCenter',
             searchValue: this.phoneQueryValue,
             activeTab: this.activeTab,
-            searchFlowType: this.form.flowType.join(','),
+            searchFlowType: flowType,
             checked: this.form.checked,
             selectModel: this.form.selectModel
           }
@@ -534,7 +535,7 @@
                 goRouter: '/phoneToDoCenter',
                 searchValue: this.phoneQueryValue,
                 activeTab: this.activeTab,
-                searchFlowType: this.form.flowType.join(','),
+                searchFlowType: flowType,
                 checked: this.form.checked,
                 selectModel: this.form.selectModel
               }
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 1d03677eb..7438dfd48 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -67,25 +67,25 @@
                   <!--                  </a-col>-->
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
-                      <div class="title-text" :title="$t('certificationCategory')">
-                        <span>{{$t('certificationCategory')}}</span>
+                      <div class="title-text" :title="$t('NareaOfResponsibility')">
+                        <span>{{$t('NareaOfResponsibility')}}</span>
                       </div>
-                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                         :type="'select'"
-                                         :triggerChange="false" :dictCode="'cert_category'"/>
+                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
+                                          :type="'select'"
+                                          :triggerChange="false" :dictCode="'duty_territory'"/>
                     </div>
                   </a-col>
                   <template v-if="toggleSearchStatus">
                     <a-col :md="6" :sm="8">
                       <div class="box-title-text">
-                        <div class="title-text" :title="$t('NareaOfResponsibility')">
-                          <span>{{$t('NareaOfResponsibility')}}</span>
+                        <div class="title-text" :title="$t('certificationCategory')">
+                          <span>{{$t('certificationCategory')}}</span>
                         </div>
-                        <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                            :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
-                                            :type="'select'"
-                                            :triggerChange="false" :dictCode="'duty_territory'"/>
+                        <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
+                                           :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                           :type="'select'"
+                                           :triggerChange="false" :dictCode="'cert_category'"/>
                       </div>
                     </a-col>
                     <a-col :md="6" :sm="8">
@@ -247,7 +247,7 @@
               {{$t('Assignedby')}}
             </div>
             <!--      导出-->
-            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt"'>
+            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
               <a-icon type="export"/>
               {{$t('dataExport')}}
             </div>
@@ -583,6 +583,46 @@
         </div>
       </div>
     </a-modal>
+    <!--    数据导出弹框-->
+    <a-modal
+      :title="$t('dataExport')"
+      :width="500"
+      :visible="dataExportFailed"
+      :maskClosable="false"
+      @ok="handleExportSubmit"
+      @cancel="handleCancel"
+    >
+      <a-form-model
+        class='formAdd'
+        ref='dataExportruleForm'
+        :model='dataExportformInline'
+        :rules='dataExportrules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text" >
+              <div class="title-text" :title="$t('exportOption')" style='margin-top: -17px;'>
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('exportOption')">
+                {{$t('exportOption')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="exportOption">
+                <a-select class="box-input" allowClear v-model="dataExportformInline.exportOption" :placeholder="$t('PleaseSelect')+$t('exportOption')">
+                  <a-select-option :value="'1'">
+                    {{$t('includeTitle')}}
+                  </a-select-option>
+                  <a-select-option :value="'0'">
+                    {{$t('Notitleincluded')}}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
     <batchUpdateDeadline ref="batchUpdateDeadlineRef" @batchUpdateDeadlineForm="batchUpdateDeadlineForm"/>
 
@@ -877,6 +917,7 @@
         selectedRowKeys: [],
         textLoading: false,
         formInline: {},
+        dataExportformInline: {},
         queryParamQuery: {},
         url: {
           tableHeader: 'params/collectManifest/getHeader',
@@ -919,6 +960,7 @@
         areaVisiblereferenceparameter: false, // 引用参数弹框
         areaVisibsynchronous: false, // 同步上报库弹框
         visibleoperationFailed: false, // 数据失败的弹框
+        dataExportFailed: false, // 数据失败的弹框
         currentPersonRole: '', // 当前人角色
         jurisdiction: '',
         wrapperCol: {
@@ -930,6 +972,11 @@
           sm: { span: 7 }
         },
         rules: {},
+        dataExportrules: {
+          exportOption:[
+            { required: true, message: this.$t('PleaseSelect')+this.$t('exportOption'), trigger: 'change' }
+          ]
+        },
         FreezeList: [], // 冻结字段
         roleSwitchingList: [],
         JTextLoading: false,
@@ -1329,24 +1376,56 @@
       },
       //导出
       handleExport() {
-        this.$message.success(this.$t('Intheexport'))
-        let long = localStorage.getItem('language')
-        this.cut = ''
-        if (long && long === 'zh-cn') {
-          this.cut = 'cn'
-        } else if (long && long === 'en-us') {
-          this.cut = 'en'
-        }
-        let query = {
-          paramsManifestId: this.paramsManifest.id,
-          paramsTemplateId: this.$route.query.paramsTemplateId,
-          paramsTemplatePublishVersion: 1,
-          cut: this.cut,
-          userTypes: this.currentPersonRole,
-          exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
-        }
-        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
-        downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+        this.dataExportFailed = true
+        // this.$message.success(this.$t('Intheexport'))
+        // let long = localStorage.getItem('language')
+        // this.cut = ''
+        // if (long && long === 'zh-cn') {
+        //   this.cut = 'cn'
+        // } else if (long && long === 'en-us') {
+        //   this.cut = 'en'
+        // }
+        // let query = {
+        //   paramsManifestId: this.paramsManifest.id,
+        //   paramsTemplateId: this.$route.query.paramsTemplateId,
+        //   paramsTemplatePublishVersion: 1,
+        //   cut: this.cut,
+        //   userTypes: this.currentPersonRole,
+        //   exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        // }
+        // let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+        // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+      },
+      // 导出确定
+      handleExportSubmit(){
+        this.$refs.dataExportruleForm.validate(valid => {
+          if(valid){
+            this.$message.success(this.$t('Intheexport'))
+            let long = localStorage.getItem('language')
+            this.cut = ''
+            if (long && long === 'zh-cn') {
+              this.cut = 'cn'
+            } else if (long && long === 'en-us') {
+              this.cut = 'en'
+            }
+            let query = {
+              paramsManifestId: this.paramsManifest.id,
+              paramsTemplateId: this.$route.query.paramsTemplateId,
+              exportOption:this.dataExportformInline.exportOption,
+              paramsTemplatePublishVersion: 1,
+              cut: this.cut,
+              userTypes: this.currentPersonRole,
+              exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
+            }
+            let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+            downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+          }
+        })
+      },
+      handleCancel() {
+        this.dataExportformInline = {}
+        this.$refs.dataExportruleForm.clearValidate()
+        this.dataExportFailed = false
       },
       //填写人导出
       handleExportDre() {
@@ -2631,7 +2710,11 @@
     height: 42px;
     line-height: 36px;
   }
-
+  .itemModel {
+    width: 100%;
+    display: inline-block;
+    margin-top: 2px;
+  }
   .box-input .ant-select-selection {
     height: 38px !important;
   }
diff --git a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue
index 1179cf11d..01505e1bf 100644
--- a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue
+++ b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue
@@ -144,8 +144,8 @@
           ],
           detectionReportLocation:[
             {
-              max: 100,
-              message: this.$t('testReportLocation') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              max: 500,
+              message: this.$t('testReportLocation') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 713cccc45..e144def4d 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -30,6 +30,7 @@
               </div>
               <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
                         class="box-input"
+                        mode="multiple"
                         allowClear
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         v-model="queryParam.flowStatus">
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 08feba3fc..d90b4bf48 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -53,6 +53,7 @@
                           allowClear
                           show-search
                           style="width: calc(100% - 80px);"
+                          mode="multiple"
                           optionFilterProp="label"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           v-model="queryParam[selectModel]">
@@ -2802,6 +2803,7 @@
               if (this.updateFlowStatusList && this.updateFlowStatusList.length > 0) {
                 this.updateFlowStatusBatch()
               }
+              this.completeTaskList = []
               for (let i = 0; i < this.startProcessList.length; i++) {
                 if (this.startProcessList[i].type == 2) {
                   this.startProcessList[i].dataList.designDutyDueDate = this.formInline.designDutyDueDate
@@ -2829,6 +2831,7 @@
             Promise.all(this.completeTaskList).then((res) => {
               if (this.requestsNum == res.length) {
                 this.visible = false
+                this.formInline = {}
                 this.selectedRowKeys = []
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.confirmLoading = false
diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue
index 8ed464184..fbb5776ab 100644
--- a/jero-web/src/views/projectManagement/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/components/settingList.vue
@@ -10,282 +10,355 @@
     style="height: 100%;overflow: auto;padding-bottom: 53px;">
     <a-spin :spinning="confirmLoading">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" title="G0">
+                  G0</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="zero">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'G0'"
+                                 @change="dateChange({db_field_name:'zero'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.zero"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" title="G1">
+                  G1</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="one">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'G1'"
+                                 @change="dateChange({db_field_name:'one'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.one"
+                                 :disabled="false"
+                                 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="title-text-text" title="G2">
+                  G2</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="two">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'G2'"
+                                 @change="dateChange({db_field_name:'two'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.two"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" title="G3">
+                  G3</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="three">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'G3'"
+                                 @change="dateChange({db_field_name:'three'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.three"
+                                 :disabled="false"
+                                 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="title-text-text" title="G4">
+                  G4</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="four">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'G4'"
+                                 @change="dateChange({db_field_name:'four'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.four"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" title="G5">
+                  G5</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="five">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'G5'"
+                                 @change="dateChange({db_field_name:'five'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.five"
+                                 :disabled="false"
+                                 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="title-text-text" title="G6">
+                  G6</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="six">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'G6'"
+                                 @change="dateChange({db_field_name:'six'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.six"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" title="MP">
+                  MP</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="mp">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'MP'"
+                                 @change="dateChange({db_field_name:'mp'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.mp"
+                                 :disabled="false"
+                                 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="title-text-text" title="G7">
+                  G7</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="seven">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'G7'"
+                                 @change="dateChange({db_field_name:'seven'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.seven"
+                                 :disabled="false"
+                                 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('listPublishing')">
+                  {{$t('listPublishing')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="listConfirmation">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('listPublishing')+$t('time')"
+                                 @change="dateChange({db_field_name:'listConfirmation'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.listConfirmation"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </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('responsibilityConfirmation')">
+                  {{$t('responsibilityConfirmation')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="legalTaskConfirmation">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('responsibilityConfirmation')+$t('time')"
+                                 @change="dateChange({db_field_name:'legalTaskConfirmation'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.legalTaskConfirmation"
+                                 :disabled="false"
+                                 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('designVerification')">
+                  {{$t('designVerification')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="designDeadline">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('designVerification')+$t('time')"
+                                 @change="dateChange({db_field_name:'designDeadline'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.designDeadline"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </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('getStarted')">
+                  {{$t('getStarted')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="prehomoDeadline">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('getStarted')+$t('time')"
+                                 @change="dateChange({db_field_name:'prehomoDeadline'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.prehomoDeadline"
+                                 :disabled="false"
+                                 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('certificationStartOne')">
+                  {{$t('certificationStartOne')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="attestationStartTime">
+                  <a-date-picker class="box-input"
+                                 :disabledDate='this.disabledRegistrationStartDate'
+                                 :placeholder="$t('PleaseSelect')+$t('certificationStartOne')+$t('time')"
+                                 @change="dateChange({db_field_name:'attestationStartTime'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.attestationStartTime"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </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('certificationSubmission')">
+                  {{$t('certificationSubmission')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="certificationSubmission">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('certificationSubmission')+$t('time')"
+                                 @change="dateChange({db_field_name:'certificationSubmission'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.certificationSubmission"
+                                 :disabled="false"
+                                 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('certificationEnd')">
+                  {{$t('certificationEnd')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="attestationEndTime">
+                  <a-date-picker class="box-input"
+                                 :disabledDate='this.disabledRegistrationEndDate'
+                                 :placeholder="$t('PleaseSelect')+$t('certificationEnd')+$t('time')"
+                                 @change="dateChange({db_field_name:'attestationEndTime'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.attestationEndTime"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </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('verificationAndVerification')">
+                  {{$t('verificationAndVerification')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="verifyDeadline">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('verificationAndVerification')+$t('time')"
+                                 @change="dateChange({db_field_name:'verifyDeadline'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.verifyDeadline"
+                                 :disabled="false"
+                                 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="title-text-text" title="G0">
-                G0</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="zero">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G0'"
-                               @change="dateChange({db_field_name:'zero'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.zero"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G1">
-                G1</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="one">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G1'"
-                               @change="dateChange({db_field_name:'one'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.one"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G2">
-                G2</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="two">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G2'"
-                               @change="dateChange({db_field_name:'two'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.two"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G3">
-                G3</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="three">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G3'"
-                               @change="dateChange({db_field_name:'three'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.three"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G4">
-                G4</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="four">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G4'"
-                               @change="dateChange({db_field_name:'four'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.four"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G5">
-                G5</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="five">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G5'"
-                               @change="dateChange({db_field_name:'five'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.five"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G6">
-                G6</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="six">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G6'"
-                               @change="dateChange({db_field_name:'six'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.six"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" title="G7">
-                G7</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="seven">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+'G7'"
-                               @change="dateChange({db_field_name:'seven'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.seven"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </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('listPublishing')">
-                {{$t('listPublishing')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="listConfirmation">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('listPublishing')+$t('time')"
-                               @change="dateChange({db_field_name:'listConfirmation'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.listConfirmation"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </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('responsibilityConfirmation')">
-                {{$t('responsibilityConfirmation')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="legalTaskConfirmation">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('responsibilityConfirmation')+$t('time')"
-                               @change="dateChange({db_field_name:'legalTaskConfirmation'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.legalTaskConfirmation"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </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('designVerification')">
-                {{$t('designVerification')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="designDeadline">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('designVerification')+$t('time')"
-                               @change="dateChange({db_field_name:'designDeadline'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.designDeadline"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </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('getStarted')">
-                {{$t('getStarted')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoDeadline">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('getStarted')+$t('time')"
-                               @change="dateChange({db_field_name:'prehomoDeadline'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.prehomoDeadline"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </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('certificationStartOne')">
-                {{$t('certificationStartOne')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="attestationStartTime">
-                <a-date-picker class="box-input"
-                               :disabledDate='this.disabledRegistrationStartDate'
-                               :placeholder="$t('PleaseSelect')+$t('certificationStartOne')+$t('time')"
-                               @change="dateChange({db_field_name:'attestationStartTime'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.attestationStartTime"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </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('certificationSubmission')">
-                {{$t('certificationSubmission')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="certificationSubmission">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('certificationSubmission')+$t('time')"
-                               @change="dateChange({db_field_name:'certificationSubmission'})"
-                               format="YYYY-MM-DD"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.certificationSubmission"
-                               :disabled="false"
-                               style="width: 100%"/>
-              </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('certificationEnd')">
-                {{$t('certificationEnd')}}</span>
+                <span class="title-text-text" :title="$t('localapproval1')">
+                  {{$t('localapproval1')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="attestationEndTime">
                 <a-date-picker class="box-input"
-                               :disabledDate='this.disabledRegistrationEndDate'
-                               :placeholder="$t('PleaseSelect')+$t('certificationEnd')+$t('time')"
-                               @change="dateChange({db_field_name:'attestationEndTime'})"
+                               :placeholder="$t('PleaseSelect')+$t('localapproval1')+$t('time')"
+                               @change="dateChange({db_field_name:'localapproval1'})"
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.attestationEndTime"
+                               v-model="formInline.localapproval1"
                                :disabled="false"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -295,16 +368,16 @@
             <div class="box-title-text">
               <div class="title-text">
                 <!--              <span class="Required">*</span>-->
-                <span class="title-text-text" :title="$t('verificationAndVerification')">
-                {{$t('verificationAndVerification')}}</span>
+                <span class="title-text-text" :title="$t('localapproval2')">
+                  {{$t('localapproval2')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="verifyDeadline">
                 <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('verificationAndVerification')+$t('time')"
-                               @change="dateChange({db_field_name:'verifyDeadline'})"
+                               :placeholder="$t('PleaseSelect')+$t('localapproval2')+$t('time')"
+                               @change="dateChange({db_field_name:'localapproval2'})"
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.verifyDeadline"
+                               v-model="formInline.localapproval2"
                                :disabled="false"
                                style="width: 100%"/>
               </a-form-model-item>
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
index 378ffb118..728eacdb6 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
@@ -165,6 +165,7 @@
         this.title = val.name
         this.projectQuery = val
         this.getEchart()
+        console.log(this.projectQuery.name)
         if (this.projectQuery.name == this.$t('certificationSubmission') || this.projectQuery.name == this.$t('certificationEnd')) {
           this.$nextTick(() => {
             this.num = '0'
diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue
index e1d2d7b2b..2f5a04935 100644
--- a/jero-web/src/views/regulatoryEarlyWarning/index.vue
+++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue
@@ -5,19 +5,19 @@
               :searchQueryList="searchQueryList"
               :flag="'1'"
               :isDefault="true"
-              :url="url"/>
+              :url="url" />
     </div>
     <div class="table-operator">
       <div @click="handleCompare" v-has="'regulatoryEarlyWarning:push'"
            class="operator-text">
-        <a-icon type="share-alt"/>
-        {{$t('share')}}
+        <a-icon type="share-alt" />
+        {{ $t('share') }}
       </div>
       <div @click="handleExport"
            v-has="'regulatoryEarlyWarning:export'"
            class="operator-text">
-        <a-icon type="export" :rotate="-90"/>
-        {{$t('export')}}
+        <a-icon type="export" :rotate="-90" />
+        {{ $t('export') }}
       </div>
     </div>
     <div>
@@ -40,39 +40,39 @@
         :columns="columns"
       >
         <span slot="serial_number" slot-scope="text,result">
-            <a @click="standClick(result)" :title="text">{{text}}</a>
+            <a @click="standClick(result)" :title="text">{{ text }}</a>
         </span>
         <span slot="vehicleInProductionDate" slot-scope="text,result" :title="text">
               <span v-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'yellow'">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'red'">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else>
-                   {{text}}
+                   {{ text }}
                </span>
         </span>
         <span slot="ImplementationDate" slot-scope="text,result" :title="text">
               <span v-if="result.new_colour == 'yellow'" style="color: #fdd835">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else-if="result.new_colour == 'red'" style="color: red">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else>
-                   {{text}}
+                   {{ text }}
                </span>
         </span>
         <span slot="vehicleInProductionDate" slot-scope="text,result" :title="text">
               <span v-if="result.implement_colour == 'yellow'" style="color: #fdd835">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else-if="result.implement_colour == 'red'" style="color: red">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else>
-                   {{text}}
+                   {{ text }}
                </span>
         </span>
       </a-table>
@@ -98,247 +98,292 @@
 </template>
 
 <script>
-  import search from '@/components/search/index'
-  import libraryPush from '@/components/libraryPush/index'
-  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
-  import moment from 'moment'
-  import eventBUs from '../../common/event'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import search from '@/components/search/index'
+import libraryPush from '@/components/libraryPush/index'
+import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+import moment from 'moment'
+import eventBUs from '../../common/event'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
-  export default {
-    name: 'index',
-    components: {
-      search,
-      libraryPush
-    },
-    mixins: [ResizeColumnProvide,ResizeHeader],
-    data() {
-      return {
-        //url传参严格按照当前命名
-        url: {
-          seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
-          list: '/LawsWarn/queryPageInfo',
-          exportData: 'LawsWarn/exportExcel',
-          pullMessage: '/LawsWarn/warnPullMessage'
+export default {
+  name: 'index',
+  components: {
+    search,
+    libraryPush
+  },
+  mixins: [ResizeColumnProvide, ResizeHeader],
+  data() {
+    return {
+      //url传参严格按照当前命名
+      url: {
+        seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
+        list: '/LawsWarn/queryPageInfo',
+        exportData: 'LawsWarn/exportExcel',
+        pullMessage: '/LawsWarn/warnPullMessage'
+      },
+      activeTab: this.$t('ImplementationDate'),
+      loading: false,
+      dataSource: [],
+      selectedRowKeys: [],
+      total: 0,
+      pageSize: 10,
+      pageNo: 1,
+      searchParmes: {},
+      searchQueryList: [
+        {
+          field_show_type: 12,
+          db_field_txt: this.$t('warningTime'),
+          db_field_name: 'WarnTimeText',
+          option: [
+            {
+              value: '1',
+              name: this.$t('inRecentMonths3')
+            },
+            {
+              value: '2',
+              name: this.$t('inRecentMonths6')
+            },
+            {
+              value: '5',
+              name: this.$t('inRecentMonthsin6')
+            },
+            {
+              value: '3',
+              name: this.$t('inRecentYear1')
+            },
+            {
+              value: '4',
+              name: this.$t('inRecentYear2')
+            },
+            {
+              value: '6',
+              name: this.$t('inRecentYear3')
+            }
+          ]
+        }
+      ],
+
+      columnsAll: [
+        {
+          title: this.$t('standard'),
+          align: 'left',
+          dataIndex: 'serial_number',
+          ellipsis: true,
+          width: 170,
+          scopedSlots: { customRender: 'serial_number' }
         },
-        activeTab: this.$t('ImplementationDate'),
-        loading: false,
-        dataSource: [],
-        selectedRowKeys: [],
-        total: 0,
-        pageSize: 10,
-        pageNo: 1,
-        searchParmes: {},
-        searchQueryList: [
-          {
-            field_show_type: 12,
-            db_field_txt: this.$t('warningTime'),
-            db_field_name: 'WarnTimeText',
-            option: [
-              {
-                value: '1',
-                name:this.$t('inRecentMonths3')
-              },
-              {
-                value: '2',
-                name: this.$t('inRecentMonths6')
-              },
-              {
-                value: '5',
-                name: this.$t('inRecentMonthsin6')
-              },
-              {
-                value: '3',
-                name: this.$t('inRecentYear1')
-              },
-              {
-                value: '4',
-                name: this.$t('inRecentYear2')
-              },
-
-            ]
-          }
-        ],
-
-        columnsAll: [
-          {
-            title: this.$t('standard'),
-            align: 'left',
-            dataIndex: 'serial_number',
-            ellipsis: true,
-            width: 170,
-            scopedSlots: { customRender: 'serial_number' }
-          },
-          {
-            title: this.$t('title'),
-            align: 'left',
-            dataIndex: 'title',
-            ellipsis: true,
-            width: 170,
-            scopedSlots: { customRender: 'serial_number' }
-          },
-          {
-            title: this.$t('status'),
-            align: 'left',
-            width: 140,
-            ellipsis: true,
-            dataIndex: 'state'
-          },
-          {
-            title: this.$t('zoneOfApplication'),
-            align: 'left',
-            width: 170,
-            ellipsis: true,
-            dataIndex: 'region'
-          },
-          {
-            title: this.$t('technicalField'),
-            align: 'left',
-            ellipsis: true,
-            width: 170,
-            dataIndex: 'technology_territory'
-          },
-          {
-            title: this.$t('vehicleInProductionDate'),
-            align: 'left',
-            ellipsis: true,
-            width: 190,
-            dataIndex: 'implement_time',
-            scopedSlots: { customRender: 'vehicleInProductionDate' }
-          },
-          {
-            title: this.$t('ImplementationDate'),
-            align: 'left',
-            ellipsis: true,
-            width: 190,
-            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
-            scopedSlots: { customRender: 'ImplementationDate' }
-          }
-        ]
-      }
-    },
-    computed: {
-      columns() {
-        let columnsAll = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.activeTab == this.$t('ImplementationDate')) {
-          for (let i = 0; i < columnsAll.length; i++) {
-            if (columnsAll[i].dataIndex == 'implement_time') {
-              columnsAll.splice(i, 1)
-              i--
-            }
-          }
-        } else if (this.activeTab == this.$t('vehicleInProductionDate')) {
-          for (let i = 0; i < columnsAll.length; i++) {
-            if (columnsAll[i].dataIndex == 'xin1_che1_xing2_shi2_shi1_ri4_qi1') {
-              columnsAll.splice(i, 1)
-              i--
-            }
+        {
+          title: this.$t('title'),
+          align: 'left',
+          dataIndex: 'title',
+          ellipsis: true,
+          width: 170,
+          scopedSlots: { customRender: 'serial_number' }
+        },
+        {
+          title: this.$t('status'),
+          align: 'left',
+          width: 140,
+          ellipsis: true,
+          dataIndex: 'state'
+        },
+        {
+          title: this.$t('zoneOfApplication'),
+          align: 'left',
+          width: 170,
+          ellipsis: true,
+          dataIndex: 'region'
+        },
+        {
+          title: this.$t('technicalField'),
+          align: 'left',
+          ellipsis: true,
+          width: 170,
+          dataIndex: 'technology_territory'
+        },
+        {
+          title: this.$t('vehicleInProductionDate'),
+          align: 'left',
+          ellipsis: true,
+          width: 190,
+          dataIndex: 'implement_time',
+          scopedSlots: { customRender: 'vehicleInProductionDate' }
+        },
+        {
+          title: this.$t('ImplementationDate'),
+          align: 'left',
+          ellipsis: true,
+          width: 190,
+          dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
+          scopedSlots: { customRender: 'ImplementationDate' }
+        }
+      ]
+    }
+  },
+  computed: {
+    columns() {
+      let columnsAll = JSON.parse(JSON.stringify(this.columnsAll))
+      if (this.activeTab == this.$t('ImplementationDate')) {
+        for (let i = 0; i < columnsAll.length; i++) {
+          if (columnsAll[i].dataIndex == 'implement_time') {
+            columnsAll.splice(i, 1)
+            i--
           }
         }
-        return columnsAll
-      }
-    },
-    mounted() {
-      // this.getList()
-      eventBUs.$on('searchQuery', search => {
-        Object.keys(search).forEach(res => {
-          if (search[res] instanceof Array) {
-            search[res] = search[res].join(',')
+      } else if (this.activeTab == this.$t('vehicleInProductionDate')) {
+        for (let i = 0; i < columnsAll.length; i++) {
+          if (columnsAll[i].dataIndex == 'xin1_che1_xing2_shi2_shi1_ri4_qi1') {
+            columnsAll.splice(i, 1)
+            i--
           }
-        })
-        this.pageNo = 1
-        this.searchParmes = search
-        this.getList()
+        }
+      }
+      return columnsAll
+    }
+  },
+  mounted() {
+    // this.getList()
+    eventBUs.$on('searchQuery', search => {
+      Object.keys(search).forEach(res => {
+        if (search[res] instanceof Array) {
+          search[res] = search[res].join(',')
+        }
       })
-    },
-    beforeDestroy() {
-      eventBUs.$off('searchQuery')
-    },
-    methods: {
-      standClick(val){
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: val.id
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      callback(tab) {
-        this.selectedRowKeys = []
-        this.activeTab = tab
-        this.getList()
-      },
-      onSelectChange(value) {
-        this.selectedRowKeys = value
-      },
-      handleCompare() {
-        if (this.selectedRowKeys.length > 0) {
-          this.$nextTick(() => {
-            let flag = ''
-            if (this.activeTab == this.$t('ImplementationDate')) {
-              flag = 1
-            } else {
-              flag = 2
-            }
-            this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys)), flag)
-          })
-        } else {
-          this.$message.warning(this.$t('selectLeastOne'))
+      this.pageNo = 1
+      this.searchParmes = search
+      this.getList()
+    })
+  },
+  beforeDestroy() {
+    eventBUs.$off('searchQuery')
+  },
+  methods: {
+    standClick(val) {
+      let newUrl = this.$router.resolve({
+        path: '/docManage/library/detail',
+        query: {
+          id: val.id
         }
-      },
-      handleExport() {
-        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          let text = ''
-          let flag
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    callback(tab) {
+      this.selectedRowKeys = []
+      this.activeTab = tab
+      this.getList()
+    },
+    onSelectChange(value) {
+      this.selectedRowKeys = value
+    },
+    handleCompare() {
+      if (this.selectedRowKeys.length > 0) {
+        this.$nextTick(() => {
+          let flag = ''
           if (this.activeTab == this.$t('ImplementationDate')) {
-            flag = 0
-            text = this.$t('ImplementationDate')
-          } else {
-            text = this.$t('vehicleInProductionDate')
             flag = 1
+          } else {
+            flag = 2
           }
-          let query = {
-            id: selectedRowKeys.join(','),
-            ...this.searchParmes,
-            flag: flag
-          }
-          downloadFile(this.url.exportData, text + '.xls', query, this.Deselect)
+          this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys)), flag)
+        })
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+    handleExport() {
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let text = ''
+        let flag
+        if (this.activeTab == this.$t('ImplementationDate')) {
+          flag = 0
+          text = this.$t('ImplementationDate')
         } else {
-          this.$message.warning(this.$t('selectLeastOne'))
+          text = this.$t('vehicleInProductionDate')
+          flag = 1
         }
-      },
-      Deselect() {
-        this.selectedRowKeys = []
-      },
-      clearSelected() {
-        if (!this.searchParmes['WarnTimeText']) {
-          this.searchParmes['WarnTimeText'] = '2'
+        let query = {
+          id: selectedRowKeys.join(','),
+          ...this.searchParmes,
+          flag: flag
         }
-        let startTime = moment(new Date()).format('YYYY-MM-DD')
-        let endTime = this.getNowdate()
-        this.searchParmes['WarnTime'] = [startTime, endTime]
-        this.searchParmes = { ...this.searchParmes }
-        this.pageNo = 1
-        this.getList()
-      },
-      getNowdate() {
-        let monthData
-        let yearData
-        if (this.searchParmes['WarnTimeText'] == '1') {
-          monthData = 4
-          yearData = 1
-        } else if (this.searchParmes['WarnTimeText'] == '2') {
-          monthData = 7
-          yearData = 1
-        } else if (this.searchParmes['WarnTimeText'] == '3') {
-          monthData = 13
-          yearData = 1
-        } else if (this.searchParmes['WarnTimeText'] == '4') {
-          monthData = 25
-          yearData = 2
+        downloadFile(this.url.exportData, text + '.xls', query, this.Deselect)
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+    Deselect() {
+      this.selectedRowKeys = []
+    },
+    clearSelected() {
+      let endTime = ''
+      if (!this.searchParmes['WarnTimeText']) {
+        endTime = '2099-01-01'
+      } else {
+        endTime = this.getNowdate()
+      }
+      let startTime = moment(new Date()).format('YYYY-MM-DD')
+      this.searchParmes['WarnTime'] = [startTime, endTime]
+      this.searchParmes = { ...this.searchParmes }
+      this.pageNo = 1
+      this.getList()
+    },
+    getNowdate() {
+      let monthData
+      let yearData
+      if (this.searchParmes['WarnTimeText'] == '1') {
+        monthData = 4
+        yearData = 1
+      } else if (this.searchParmes['WarnTimeText'] == '2') {
+        monthData = 7
+        yearData = 1
+      } else if (this.searchParmes['WarnTimeText'] == '3') {
+        monthData = 13
+        yearData = 1
+      } else if (this.searchParmes['WarnTimeText'] == '4') {
+        monthData = 25
+        yearData = 2
+      } else if (this.searchParmes['WarnTimeText'] == '5') {
+        monthData = 7
+        yearData = -1
+      } else if (this.searchParmes['WarnTimeText'] == '6') {
+        monthData = 37
+        yearData = 3
+      }
+      if (this.searchParmes['WarnTimeText'] == '5') {
+        var time = new Date()
+        time.setTime(time.getTime())
+        var s2 = time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate()
+        var monthNum = 6 //要减的月数(6)自己定义
+        var dateArr = s2.split('-') //s2当前时间
+        var year = dateArr[0] //获取当前日期的年份
+        var month = dateArr[1] //获取当前日期的月份
+        var day = dateArr[2] //获取当前日期的日
+        var days = new Date(year, month, 0)
+        days = days.getDate() //获取当前日期中月的天数
+        var year2
+        if (month < 6) {
+          year2 = year - 1
+        } else {
+          year2 = year
         }
+        var month2 = parseInt(month) - monthNum
+        if (month2 <= 0) {
+          year2 = parseInt(year2) - parseInt(month2 / 12 == 0 ? 1 : parseInt(month2) / 12)
+          month2 = 12 - (Math.abs(month2) % 12)
+        }
+        var day2 = day
+        var days2 = new Date(year2, month2, 0)
+        days2 = days2.getDate()
+        if (day2 > days2) {
+          day2 = days2
+        }
+        if (month2 < 10) {
+          month2 = '0' + month2
+        }
+        var t2 = year2 + '-' + month2 + '-' + day2
+        return t2
+      } else {
         var date_now = new Date()//获取当前时间
         var year = date_now.getFullYear()//获取当前时间的年份
         var month = date_now.getMonth()//获取当前时间的月份
@@ -362,64 +407,67 @@
         }
         var time = year2 + '-' + month2 + '-' + day2
         return time
-      },
-      pageOnChange(page) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
-      },
-      getList() {
-        let flag
-        if (this.activeTab == this.$t('ImplementationDate')) {
-          flag = 0
-        } else {
-          flag = 1
-        }
-        let params = {
-          ...this.searchParmes,
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          flag: flag
-        }
-        this.loading = true
-        postAction(this.url.list, params).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result.records
-            this.total = res.result.total
-            this.loading = false
-          } else {
-            this.loading = false
-          }
-        }).finally(() => {
-          this.loading = false
-        })
       }
+
+    },
+
+    pageOnChange(page) {
+      this.pageNo = page
+      this.getList()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.getList()
+    },
+    getList() {
+      let flag
+      if (this.activeTab == this.$t('ImplementationDate')) {
+        flag = 0
+      } else {
+        flag = 1
+      }
+      let params = {
+        ...this.searchParmes,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        flag: flag
+      }
+      this.loading = true
+      postAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      }).finally(() => {
+        this.loading = false
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="less">
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
 
-  ::v-deep .ant-table-row:first-child {
-    background: #fff !important;
-    opacity: 0.9;
-  }
+::v-deep .ant-table-row:first-child {
+  background: #fff !important;
+  opacity: 0.9;
+}
 
-  ::v-deep .ant-table-body {
-    background: transparent !important;
-  }
+::v-deep .ant-table-body {
+  background: transparent !important;
+}
 
-  /deep/ .ant-table-placeholder{
-    margin-top: 8px !important;
-  }
+/deep/ .ant-table-placeholder {
+  margin-top: 8px !important;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index c06a8c737..2a58e6510 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -22,6 +22,7 @@
           </span>
           <div class="process-content-right">
             <div class="process-content-right-top" :title="item.name">{{item.name}}</div>
+            <div class="process-content-right-top-user" :title="item.userName">{{item.userName}}</div>
           </div>
         </div>
       </div>
@@ -303,6 +304,23 @@
                   })
                 }
               }
+              this.regulatoryCertificationTaskPlanList.forEach(val => {
+                if (val.name == this.$t('initiatingProcess')) {
+                  val.userName = this.$t('regulatoryEngineer')
+                } else if (val.name == this.$t('Taskresponsibilityrecognition')) {
+                  val.userName = this.$t('personLiable')
+                } else if (val.name == this.$t('designComplianceReview')) {
+                  val.userName = this.$t('personLiable')
+                } else if (val.name == this.$t('verificationComplianceReview')) {
+                  val.userName = this.$t('personLiable')
+                } else if (val.name == this.$t('designComplianceReviewAdmin')) {
+                  val.userName = this.$t('Sponsor')
+                } else if (val.name == this.$t('verificationComplianceExamine')) {
+                  val.userName = this.$t('Sponsor')
+                } else {
+                  val.userName = ''
+                }
+              })
               this.regulatoryCertificationTaskPlanList = [...this.regulatoryCertificationTaskPlanList]
             }
             this.loading = false
@@ -403,6 +421,18 @@
           white-space: nowrap;
           overflow: hidden;
         }
+        .process-content-right-top-user{
+          //background: #E6FAFA;
+          //padding: 5px;
+          color: #9c9fac;
+          font-size: 12px;
+          font-weight: lighter;
+          margin-top: 5px;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+        }
+
       }
     }
 
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 9a3b17b27..fb4af65a0 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -49,12 +49,19 @@
               <a-radio value="Transfer" v-if="query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'zrrqr'">
                 {{$t('turnToDo')}}
               </a-radio>
-              <a-button type="primary" v-if="isPersonnel" @click="PersonnelSelectionClick">
-                {{this.$t('PersonnelSelection')}}
-              </a-button>
-              <span>
-                {{this.formInline.dezrrSubmitUserName}}
-              </span>
+<!--              <a-button type="primary" v-if="isPersonnel" @click="PersonnelSelectionClick">-->
+<!--                {{this.$t('PersonnelSelection')}}-->
+<!--              </a-button>-->
+<!--              <span>-->
+<!--                {{this.formInline.dezrrSubmitUserName}}-->
+<!--              </span>-->
+              <a-form-model-item class="itemModel-per">
+                <PersonnelSelection v-if="isPersonnel" :query="{db_field_name:this.query.TaskKey == 'zrrtjjfw'?'dezrrSubmitUserId':'secondChargePersonUserId',db_field_txt:$t('personnel')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.dezrrSubmitUserName"/>
+              </a-form-model-item>
             </a-radio-group>
           </a-form-model-item>
         </a-col>
@@ -125,6 +132,7 @@
 
 <script>
   import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
   import uploadFile from '@/components/uploadFile/file'
   import SelectedBy from '@/components/SelectedBy/index'
   import moment from 'moment'
@@ -133,6 +141,7 @@
     name: 'reviewedByThePersonInCharge',
     components: {
       uploadFile,
+      PersonnelSelection,
       SelectedBy
     },
     props: ['queryBy', 'queryPersonInCharge', 'query'],
@@ -210,6 +219,10 @@
       }
     },
     methods: {
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
       getData(data) {
         this.formInline.disposeResult = data.operatorResult
         this.formInline.approvalOpinion = data.approvalOpinion
@@ -397,4 +410,10 @@
     border: 1px #00B3BE solid;
     color: #00B3BE;
   }
+  .itemModel-per{
+    width: calc(50% - 130px) !important;
+    display: inline-block !important;
+    margin-top: -6px !important;
+    height: 40px !important;
+  }
 </style>
\ No newline at end of file