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

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

@@ -866,3 +866,41 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('7', NULL, NULL, NULL, NULL, NULL, '马来西亚', 'Malaysia', NULL, '/jero-boot/nationalFlag/Malaysia.png');
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('8', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '海湾地区.jpg');
 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('9', NULL, NULL, NULL, NULL, NULL, '阿联酋', 'UAE', NULL, '/jero-boot/nationalFlag/UAE.png');
+
+
+-- 展示区域 英文修改 2022-08-11
+UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Relevant Information' WHERE `id` = '1492408622838222850';
+UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'General Information' WHERE `id` = '1499657602378825729';
+UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Document Files' WHERE `id` = '1499658880093847553';
+
+-- 数据字典 英文修改 2022-08-11
+-- 同步情况 sync_state
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'No' WHERE `id` = '1507311752583352322';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Yes' WHERE `id` = '1507311835571851265';
+-- 转换结果 result_content
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'In progress' WHERE `id` = '1496785163561398273';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Success' WHERE `id` = '1496785251536924674';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Fail' WHERE `id` = '1496785330251427841';
+-- 机构类型 org_category
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Depart' WHERE `id` = '1174511244036587521';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Company' WHERE `id` = '1174511197735665665';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Position' WHERE `id` = '1174509082208395266';
+
+-- 表字段 英文修改 2022-08-11
+-- OCR识别转换记录表
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Result' WHERE `id` = '6b29f1c0e03533bb380c5ead03195785';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Time' WHERE `id` = '85894f5ad04de66ccf45ebd96c97b534';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Text Status' WHERE `id` = '0240325189062ca96d262e44ccb5811b';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'File Name' WHERE `id` = 'a049f9915ab5f6be06d4b56f609b75ca';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sync State' WHERE `id` = 'e560314880e6097deb64594262e09dab';
+-- 文档拆分表
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Split Time' WHERE `id` = '29c73fd0b2eeacb9870ab32f2f82eb3d';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Text Status' WHERE `id` = '804ff1fcbca3f47bdc9009b34069a9c5';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'File Name' WHERE `id` = 'c975087db4023e6e4a5b3732f0835e2e';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Split Result' WHERE `id` = 'e071def461ccb368dd9ae0ad4f982bc7';
+-- 文档拆分条款信息表
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Info Type' WHERE `id` = '09fa6530229280174071eae0514e0f63';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item No.' WHERE `id` = '0a455895498552bc709dff250b3364b1';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Name' WHERE `id` = '9e91b704de198ccf2f5fb7297e675404';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Content' WHERE `id` = '120a92b6d595c2fd68d2b90278357ce4';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Technical Field' WHERE `id` = 'ccf68e6578a0a446a6ac34018f0a477d';

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java

@@ -146,7 +146,7 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
                     if (cut.equals(CutEnum.CN.getValue())) {
                         throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！");
                     } else {
-                        throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！");
+                        throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!");
                     }
                 }
             }
@@ -265,7 +265,7 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
                 if (cut.equals(CutEnum.CN.getValue())) {
                     throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！");
                 } else {
-                    throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！");
+                    throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!");
                 }
             }
         }
@@ -357,7 +357,7 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
                 if (cut.equals(CutEnum.CN.getValue())) {
                     throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！");
                 } else {
-                    throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！");
+                    throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!");
                 }
             }
         }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java

@@ -100,7 +100,7 @@ public class SysDepartController {
 	@ApiOperation(value = "部门管理-查询树状结构")
 	@RequiresPermissions("sys:depart:list")
 	@RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
-	public Result<List<SysDepartTreeModel>> queryTreeList() {
+	public Result<List<SysDepartTreeModel>> queryTreeList(@RequestParam(name = "cut", required = false) String cut) {
 		Result<List<SysDepartTreeModel>> result = new Result<>();
 		try {
 			// 从内存中读取
@@ -108,7 +108,7 @@ public class SysDepartController {
 //			if (CollectionUtils.isEmpty(list)) {
 //				list = sysDepartService.queryTreeList();
 //			}
-			List<SysDepartTreeModel> list = sysDepartService.queryTreeList();
+			List<SysDepartTreeModel> list = sysDepartService.queryTreeList(cut);
 			result.setResult(list);
 			result.setSuccess(true);
 		} catch (Exception e) {
@@ -272,7 +272,9 @@ public class SysDepartController {
 	 */
 	@RequiresPermissions("sys:depart:list")
 	@RequestMapping(value = "/searchBy", method = RequestMethod.GET)
-	public Result<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) {
+	public Result<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,
+													 @RequestParam(name = "myDeptSearch", required = false) String myDeptSearch,
+													 @RequestParam(name = "cut", required = false) String cut) {
 		Result<List<SysDepartTreeModel>> result = new Result<List<SysDepartTreeModel>>();
 		//部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据
 		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -280,7 +282,7 @@ public class SysDepartController {
 		if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){
 			departIds = user.getDepartIds();
 		}
-		List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds);
+		List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds,cut);
 		if (treeList == null || treeList.size() == 0) {
 			result.setSuccess(false);
 			result.setMessage("未查询匹配数据！");

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -14,6 +14,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.PermissionData;
 import com.jero.common.constant.CommonConstant;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.util.JwtUtil;
@@ -1486,7 +1487,7 @@ public class SysUserController {
         Result<List<SysDepartUserTreeModel>> result = new Result<>();
 
         //获取当前组织下数据
-        List<SysDepartTreeModel> departTreeModelList = sysDepartService.queryTreeListByDepartId(departId);
+        List<SysDepartTreeModel> departTreeModelList = sysDepartService.queryTreeListByDepartId(departId, sysPushVO.getCut());
         if (StringUtils.isNotEmpty(departId)) {
             List<String> departIds = new ArrayList<>();
             departIds.add(departId);
@@ -1537,7 +1538,7 @@ public class SysUserController {
     @AutoLog(value = "文档库推送部门和人员的模糊搜索")
     @ApiOperation(value="文档库推送部门和人员的模糊搜索", notes="文档库推送部门和人员的模糊搜索")
     @GetMapping(value = "/getUserAndDepart")
-    public List<SysUserDepartVO> getUserAndDepart(String name){
+    public List<SysUserDepartVO> getUserAndDepart(String name, String cut){
         if("%".equals(name)){
             name = "/%";
         }
@@ -1546,7 +1547,11 @@ public class SysUserController {
         List<SysUser> sysUserList = sysUserService.list(lambdaQueryWrapper);
 
         LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(SysDepart::getDepartName,name);
+        if (CutEnum.EN.getValue().equals(cut)) {
+            wrapper.like(SysDepart::getDepartNameEn, name);
+        } else {
+            wrapper.like(SysDepart::getDepartName, name);
+        }
         List<SysDepart> sysDepartList = sysDepartService.list(wrapper);
 
         List<SysUserDepartVO> list = new LinkedList<>();
@@ -1554,7 +1559,11 @@ public class SysUserController {
             for (SysDepart sysDepart : sysDepartList) {
                 SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
                 sysUserDepartVO.setKey(sysDepart.getId());
-                sysUserDepartVO.setTitle(sysDepart.getDepartName());
+                if (CutEnum.EN.getValue().equals(cut)) {
+                    sysUserDepartVO.setTitle(sysDepart.getDepartNameEn());
+                } else {
+                    sysUserDepartVO.setTitle(sysDepart.getDepartName());
+                }
                 sysUserDepartVO.setFlag(UserOrDepartEnum.USER.getValue());
                 list.add(sysUserDepartVO);
             }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java

@@ -27,9 +27,9 @@ public interface ISysDepartService extends IService<SysDepart>{
      * 查询所有部门信息,并分节点进行显示
      * @return
      */
-    List<SysDepartTreeModel> queryTreeList();
+    List<SysDepartTreeModel> queryTreeList(String cut);
 
-    List<SysDepartTreeModel> queryTreeListByDepartId(String departId);
+    List<SysDepartTreeModel> queryTreeListByDepartId(String departId, String cut);
 
     /**
      * 查询所有部门DepartId信息,并分节点进行显示
@@ -62,7 +62,7 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @param keyWord
      * @return
      */
-    List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds);
+    List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds,String cut);
 
     /**
      * 根据部门id删除并删除其可能存在的子级部门

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.FillRuleConstant;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.SysDepartTreeModel;
 import com.jero.common.util.FillRuleUtil;
 import com.jero.common.util.YouBianCodeUtil;
@@ -70,7 +71,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			}
 		}
 		// 调用wrapTreeDataToTreeList方法生成树状数据
-		List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts);
+		List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts, null);
 		return listResult;
 	}
 
@@ -79,20 +80,20 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 	 */
 	@Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE)
 	@Override
-	public List<SysDepartTreeModel> queryTreeList() {
+	public List<SysDepartTreeModel> queryTreeList(String cut) {
 		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
 		query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
 		query.last("order by depart_order is null, depart_order asc");
 		List<SysDepart> list = this.list(query);
 		// 调用wrapTreeDataToTreeList方法生成树状数据
-		List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list);
+		List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, cut);
 		return listResult;
 	}
 
 
 //	@Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE)
 	@Override
-	public List<SysDepartTreeModel> queryTreeListByDepartId(String departId) {
+	public List<SysDepartTreeModel> queryTreeListByDepartId(String departId, String cut) {
 		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
 		if (StringUtils.isBlank(departId)) {
 			query.isNull(SysDepart::getParentId);
@@ -108,7 +109,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			SysDepart depart = list.get(i);
 			SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
 			// 将sysDepart转换为sysDepartTreeModel
-			convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+			convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, cut);
 			listResult.add(sysDepartTreeModel);
 		}
 		return listResult;
@@ -301,7 +302,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 	 * </p>
 	 */
 	@Override
-	public List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds) {
+	public List<SysDepartTreeModel> searhBy(String keyWord,String myDeptSearch,String departIds,String cut) {
 		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
 		List<SysDepartTreeModel> newList = new ArrayList<>();
 		//myDeptSearch不为空时为我的部门搜索，只搜索所负责部门
@@ -317,7 +318,12 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			}
 			query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
 		}
-		query.like(SysDepart::getDepartName, keyWord);
+
+		if (CutEnum.EN.getValue().equals(cut)) {
+			query.like(SysDepart::getDepartNameEn, keyWord);
+		} else {
+			query.like(SysDepart::getDepartName, keyWord);
+		}
 		//update-begin--Author:huangzhilin  Date:20140417 for：[bugfree号]组织机构搜索回显优化--------------------
 		SysDepartTreeModel model = new SysDepartTreeModel();
 		List<SysDepart> departList = this.list(query);
@@ -325,7 +331,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			for(SysDepart depart : departList) {
 				SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
 				// 将sysDepart转换为sysDepartTreeModel
-				convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+				convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, cut);
 				model = sysDepartTreeModel;
 				model.setChildren(null);
 	    //update-end--Author:huangzhilin  Date:20140417 for：[bugfree号]组织机构搜索功回显优化----------------------
@@ -473,7 +479,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         query.orderByAsc(SysDepart::getDepartOrder);
         List<SysDepart> list = this.list(query);
         // 调用wrapTreeDataToTreeList方法生成树状数据
-        List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list);
+        List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, null);
         List<SysDepartTreeModel> treelist =new ArrayList<>();
         if(StringUtils.isNotBlank(keyWord)){
             this.getTreeByKeyWord(keyWord,listResult,treelist);
@@ -519,7 +525,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		}
 		Collections.reverse(list);
 		// 调用wrapTreeDataToTreeList方法生成树状数据
-		return FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list);
+		return FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, null);
 	}
 
 	/**
@@ -547,7 +553,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 				SysDepart sysDepartTemp = this.getById(id);
 				listResult.add(sysDepartTemp);
 			 });
-			 List<SysDepartTreeModel> sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult);
+			 List<SysDepartTreeModel> sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult, null);
 			 realResult.addAll(sysDepartTreeModels);
 		 }
 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java

@@ -1,12 +1,10 @@
 package com.jero.modules.system.util;
 
-import com.jero.common.constant.CommonConstant;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.SysDepartTreeModel;
-import com.jero.common.util.RedisUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.model.DepartIdModel;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +30,7 @@ public class FindsDepartsChildrenUtil {
      * queryTreeList的子方法 ====1=====
      * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合
      */
-    public static List<SysDepartTreeModel> wrapTreeDataToTreeList(List<SysDepart> recordList) {
+    public static List<SysDepartTreeModel> wrapTreeDataToTreeList(List<SysDepart> recordList, String cut) {
         // 在该方法每请求一次,都要对全局list集合进行一次清理
         //idList.clear();
     	List<DepartIdModel> idList = new ArrayList<DepartIdModel>();
@@ -41,7 +39,7 @@ public class FindsDepartsChildrenUtil {
             SysDepart depart = recordList.get(i);
             SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
             // 将sysDepart转换为sysDepartTreeModel
-            convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+            convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, cut);
             records.add(sysDepartTreeModel);
         }
         List<SysDepartTreeModel> tree = findChildren(records, idList);
@@ -63,7 +61,7 @@ public class FindsDepartsChildrenUtil {
             SysDepart depart = recordList.get(i);
             SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel();
             // 将sysDepart转换为sysDepartTreeModel
-            convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel);
+            convertSysDepartToSysDepartTreeModel(depart, sysDepartTreeModel, null);
             records.add(sysDepartTreeModel);
         }
         findChildren(records, idList);
@@ -144,10 +142,14 @@ public class FindsDepartsChildrenUtil {
      * @param sysDepartTreeModel 转换的结果对象
      * @return
      */
-    public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel){
+    public static void convertSysDepartToSysDepartTreeModel(SysDepart sysDepart, SysDepartTreeModel sysDepartTreeModel, String cut){
         sysDepartTreeModel.setKey( sysDepart.getId());
         sysDepartTreeModel.setValue( sysDepart.getId());
-        sysDepartTreeModel.setTitle(sysDepart.getDepartName());
+        if (CutEnum.EN.getValue().equals(cut)) { // 部门名称中英文处理
+            sysDepartTreeModel.setTitle(sysDepart.getDepartNameEn());
+        } else {
+            sysDepartTreeModel.setTitle(sysDepart.getDepartName());
+        }
         sysDepartTreeModel.setId(sysDepart.getId());
         sysDepartTreeModel.setParentId(sysDepart.getParentId());
         sysDepartTreeModel.setDepartName(sysDepart.getDepartName());
@@ -169,4 +171,5 @@ public class FindsDepartsChildrenUtil {
         sysDepartTreeModel.setUpdateBy(sysDepart.getUpdateBy());
         sysDepartTreeModel.setUpdateTime(sysDepart.getUpdateTime());
     }
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -4575,7 +4575,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             } else {
                 //编号
                 map1.put("db_field_name", "serial_number");//字段
-                map1.put("db_field_txt", "Serial number");//字段中文名
+                map1.put("db_field_txt", "Number");//字段中文名
                 list.add(map1);
                 //标题
                 map2.put("db_field_name", "title_en");//字段
@@ -4583,15 +4583,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 list.add(map2);
                 //状态
                 map3.put("db_field_name", "state");//字段
-                map3.put("db_field_txt", "State");//字段中文名
+                map3.put("db_field_txt", "Status");//字段中文名
                 list.add(map3);
                 //文件名称
                 map4.put("db_field_name", "file_name");//字段
-                map4.put("db_field_txt", "File name");//字段中文名
+                map4.put("db_field_txt", "File Name");//字段中文名
                 list.add(map4);
                 //文件信息
                 map5.put("db_field_name", "text_info");//字段
-                map5.put("db_field_txt", "Text info");//字段中文名
+                map5.put("db_field_txt", "Text Info");//字段中文名
                 list.add(map5);
             }
         } else if ("condition".equals(flag)) {
@@ -4611,7 +4611,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             } else {
                 //编号
                 map1.put("db_field_name", "serial_number");//字段
-                map1.put("db_field_txt", "Serial number");//字段中文名
+                map1.put("db_field_txt", "Number");//字段中文名
                 map1.put("dict_field", "");//数据字典
                 map1.put("field_show_type", "1");
                 list.add(map1);
@@ -4662,7 +4662,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             } else {
                 //编号
                 map1.put("db_field_name", "serial_number");//字段
-                map1.put("db_field_txt", "Serial number");//字段中文名
+                map1.put("db_field_txt", "Number");//字段中文名
                 list.add(map1);
                 //标题
                 map2.put("db_field_name", "title_en");//字段
@@ -4670,11 +4670,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 list.add(map2);
                 //文件名称
                 map3.put("db_field_name", "file_name");//字段
-                map3.put("db_field_txt", "File name");//字段中文名
+                map3.put("db_field_txt", "File Name");//字段中文名
                 list.add(map3);
                 //文件信息
                 map4.put("db_field_name", "text_info");//字段
-                map4.put("db_field_txt", "Text info");//字段中文名
+                map4.put("db_field_txt", "Text Info");//字段中文名
                 list.add(map4);
             }
         } else if ("condition".equals(flag)) {
@@ -4694,13 +4694,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             } else {
                 //编号
                 map1.put("db_field_name", "serial_number");//字段
-                map1.put("db_field_txt", "serial number");//字段中文名
+                map1.put("db_field_txt", "Number");//字段中文名
                 map1.put("dict_field", "");//数据字典
                 map1.put("field_show_type", "1");
                 list.add(map1);
                 //标题
                 map2.put("db_field_name", "title");//字段
-                map2.put("db_field_txt", "title");//字段中文名
+                map2.put("db_field_txt", "Title");//字段中文名
                 map2.put("dict_field", "");//数据字典
                 map2.put("field_show_type", "1");
                 list.add(map2);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java

@@ -214,7 +214,11 @@ public class OcrRecordEOServiceImpl extends ServiceImpl<OcrRecordEOMapper, OcrRe
 			if (CutEnum.CN.getValue().equals(cut)) {
 				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
 			} else {
-				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
+				if("stand_name_en".equals(onlCgformField.getDbFieldName())) { // 英文标题字段特殊处理
+					map.put("db_field_txt", "English Title");
+				} else {
+					map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
+				}
 			}
 			if("文本状态".equals(onlCgformField.getDbFieldTxt())){
 				// 查询文档库所有文件类型的字段名称

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml

@@ -37,10 +37,13 @@
             pni.project_name as "projectName",
             pyni.year_name as "yearName",
             pti.design_status as "designStatus",
+            pti.design_flow_task_status as "designFlowTaskStatus",
             pti.design_p_id as "designPId",
             pti.prehomo_status as "prehomoStatus",
+            pti.prehomo_flow_task_status as "prehomoFlowTaskStatus",
             pti.prehomo_p_id as "prehomoPId",
             pti.verify_status as "verifyStatus",
+            pti.verify_flow_task_status as "verifyFlowTaskStatus",
             pti.verify_p_id as "verifyPId",
             pli.duty_territory as "dutyTerritory"
         FROM

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java

@@ -15,6 +15,7 @@ import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
 import com.jero.modules.project.enums.DesignComplianceStatusEnum;
+import com.jero.modules.project.enums.ReviewResultEnum;
 import com.jero.modules.project.mapper.LawsComplianceBoardMapper;
 import com.jero.modules.project.service.ILawsComplianceBoardService;
 import com.jero.modules.system.entity.SysCategory;
@@ -172,6 +173,20 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
                     String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("verifyStatus").toString(), cut);
                     complianceResult.put("verifyStatus_dicText",textByValue);
                 }
+
+                if (complianceResult.get("designFlowTaskStatus") != null) {
+                    String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("designFlowTaskStatus").toString(), cut);
+                    complianceResult.put("designFlowTaskStatus_dicText",textByValue);
+                }
+                if (complianceResult.get("prehomoFlowTaskStatus") != null && complianceResult.get("prehomoFlowTaskStatus") != "") {
+                    String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("prehomoFlowTaskStatus").toString(), cut);
+                    complianceResult.put("prehomoFlowTaskStatus_dicText",textByValue);
+                }
+                if (complianceResult.get("verifyFlowTaskStatus") != null) {
+                    String textByValue = ReviewResultEnum.getTextByValue(complianceResult.get("verifyFlowTaskStatus").toString(), cut);
+                    complianceResult.put("verifyFlowTaskStatus_dicText",textByValue);
+                }
+
                 if (complianceResult.get("dutyTerritory") != null) {
                     String dutyTerritory_dicText = "";
                     if (CutEnum.EN.getValue().equals(cut)) {
@@ -297,9 +312,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
                                 dataRow.createCell(4).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("dutyTerritory_dicText")));
                                 String projectName = checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("projectName")) + "-" + checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("yearName"));
                                 dataRow.createCell(5).setCellValue(projectName);
-                                dataRow.createCell(6).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("designStatus_dicText")));
+                                dataRow.createCell(6).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("designFlowTaskStatus_dicText")));
-                                dataRow.createCell(7).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("prehomoStatus_dicText")));
+                                dataRow.createCell(7).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("prehomoFlowTaskStatus_dicText")));
-                                dataRow.createCell(8).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("verifyStatus_dicText")));
+                                dataRow.createCell(8).setCellValue(checkValueIsNotNull(byStandIdcomplianceResultList.get(i).get("verifyFlowTaskStatus_dicText")));
                                 if(byStandIdComlianceResultSize > 1 && i != (byStandIdComlianceResultSize - 1)){
                                     rowIndex ++;
                                 }
@@ -389,9 +404,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
                         Row dataRow = sheet.createRow(rowIndex);
                         dataRow.createCell(0).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("dutyTerritory_dicText")));
                         dataRow.createCell(1).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("projectName")));
-                        dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designStatus_dicText")));
+                        dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designFlowTaskStatus_dicText")));
-                        dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoStatus_dicText")));
+                        dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoFlowTaskStatus_dicText")));
-                        dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyStatus_dicText")));
+                        dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyFlowTaskStatus_dicText")));
                         rowIndex ++;
                     }
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java

@@ -16,10 +16,8 @@ import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
 import com.jero.modules.split.util.FileSplitUtils;
 import com.jero.modules.split.util.ReadWordTable;
-import com.qcloud.cos.utils.IOUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.pdfbox.cos.COSBase;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.shiro.SecurityUtils;
 import org.apache.xmlbeans.XmlCursor;
@@ -36,11 +34,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import sun.misc.BASE64Encoder;
 
-import java.io.*;
+import java.io.IOException;
-import java.net.InetAddress;
+import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -411,9 +407,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -627,9 +623,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -809,9 +805,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -998,9 +994,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -1185,9 +1181,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -1362,9 +1358,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);
@@ -1546,9 +1542,9 @@ public class FileSpiltService {
 
         String generalCatalogueId = UUIDUtils.randomUUID20();
         SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
-//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
+//        SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"General Catalogue","",sarFileSplitInfoEO.getId(),treeListDisplay++,"");
         documentTreeEO.setId(generalCatalogueId);
-        documentTreeEO.setName("General catalogue");
+        documentTreeEO.setName("General Catalogue");
         documentTreeEO.setInfoId(sarFileSplitInfoEO.getId());
         documentTreeEO.setDisplaySeq(1L);
         documentTreeEO.setDisplaySeq(treeListDisplay++);

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

@@ -610,7 +610,7 @@ module.exports = {
   deliverableTemplate: 'Deliverable Template',
   entryName: 'Project Name',
   targetMarket: 'Target Market',
-  projectStatus: 'Development',
+  projectStatus: 'Project Status',
   StudioEngineer: 'R&H Studio',
   CertificationTime: 'Certification Time',
   NTplatform: 'NT Platform',
@@ -1257,4 +1257,6 @@ module.exports = {
   forward:'Forward',
   issuedBy:'Issued by',
   pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order',
+  currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up',
+  currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down',
 }

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

@@ -1359,4 +1359,6 @@ module.exports = {
   forward:'转发',
   issuedBy:'发布人',
   pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单',
+  currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移',
+  currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移',
 }

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

@@ -124,7 +124,7 @@
               } else {
                 eventBUs.$emit('searchReset')
               }
-              this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`)
+              this.$message.success(this.$t('OperationSuccessful'))
             }
             this.spinning = false
           } else {
@@ -187,7 +187,7 @@
             }
             this.spinning = false
           } else {
-            this.$message.error(`文件导入失败: ${info.file.msg} `)
+            this.$message.error(this.$t('operationFailed'))
             this.spinning = false
           }
         }

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

@@ -712,4 +712,7 @@
   /deep/ .ant-calendar-picker{
     display: block;
   }
+  ::v-deep .ant-modal-body{
+    overflow-y: visible!important;
+  }
 </style>

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue

@@ -361,6 +361,8 @@
         })
       },
       completeTask(value, taskId, isTrue) {
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        value.operatorTime = handlingTime
         Object.keys(value).forEach(res => {
           if (value[res] && value[res] instanceof String) {
             value[res] = value[res].replace(/\"/g, '“')

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -255,6 +255,7 @@
           pageNo: this.pageNo,
           pageSize: this.pageSize,
           serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
+          gatherResult: this.$route.query.gatherResult ? this.$route.query.gatherResult : '',
           ...queryParam
         }
         this.loading = true

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue

@@ -109,12 +109,14 @@
             title: this.$t('chapterContents'),
             align: 'center',
             dataIndex: 'memoriesChapterName',
+            ellipsis: true,
             width: 170
           },
           {
             title: this.$t('chineseTitle'),
             align: 'center',
             dataIndex: 'titleCn',
+            ellipsis: true,
             width: 170
           },
           {

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -163,7 +163,11 @@
             this.sortList.push(this.dataSource[index - 1])
           }
         }
-        this.move()
+        if (this.sortList.length > 1) {
+          this.move()
+        } else {
+          this.$message.warning(this.$t('currentlyTheFirstOneThatCannotMovedUp'))
+        }
       },
       moveDownClick(row, index) {
         this.sortList = []
@@ -180,7 +184,11 @@
             this.sortList.push(this.dataSource[index + 1])
           }
         }
-        this.move()
+        if (this.sortList.length > 1) {
+          this.move()
+        } else {
+          this.$message.warning(this.$t('currentlyTheLastOneCannotmovedDown'))
+        }
       },
       move() {
         postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => {

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -256,6 +256,7 @@
         },
         searchParmes: {},
         selectedRowKeysRecord: [],
+        standardList: [],
         whetherDisplay: false,
         columns: [
           {
@@ -434,15 +435,21 @@
       },
       standardDecompositionDocumentClick() {
         if (this.standardDecomposition && this.standardDecomposition.length > 0) {
-          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])))
+          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])), this.standardList)
         } else {
           this.$message.warning(this.$t('pleaseSelectStandardFirst'))
         }
       },
       standardDecompositionSheetForm(value) {
+        this.standardList = JSON.parse(JSON.stringify(value))
         this.$refs.TermInformationRef.getData(JSON.parse(JSON.stringify(value)))
       },
       TermInformationRefForm(value) {
+        if (value && value.itemId) {
+          this.standardList = this.standardList.filter(res => {
+            return value.itemId != res.id
+          })
+        }
         this.$refs.standardDecompositionSheetRef.getRowList(JSON.parse(JSON.stringify(value)))
       },
       clickButtonToUpload(item) {

jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue

@@ -150,7 +150,8 @@
         fieldList: [],
         queryConditionVOList: [],
         info_id: '',
-        selectedRowKeysData: []
+        selectedRowKeysData: [],
+        standardList: ''
       }
     },
     methods: {
@@ -160,7 +161,16 @@
       standardDocumentsChange(value) {
         this.replacePage()
       },
-      getData(row) {
+      getData(row, standardList) {
+        this.selectedRowKeys = []
+        this.selectedRowKeysData = []
+        this.standardList = JSON.parse(JSON.stringify(standardList))
+        if (this.standardList && this.standardList.length > 0) {
+          this.standardList.forEach(val => {
+            this.selectedRowKeys.push(JSON.stringify(val))
+          })
+          this.selectedRowKeysData = this.standardList
+        }
         this.total = 0
         this.dataList = []
         this.standData = row
@@ -169,6 +179,7 @@
         this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
         this.visible = true
         if (this.queryParam.info_id) {
+          this.pageNo = 1
           this.replacePage()
         }
       },
@@ -232,15 +243,17 @@
       },
       handleSubmit() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$emit('standardDecompositionSheetForm', this.selectedRowKeysData)
+          this.$emit('standardDecompositionSheetForm', JSON.parse(JSON.stringify(this.selectedRowKeysData)))
           this.visible = false
         } else {
           this.$message.warning(this.$t('PleaseSelectData'))
         }
       },
       onSelectChange(value, record) {
+        console.log(value)
         this.selectedRowKeysData = []
         this.selectedRowKeys = value
+        console.log(this.selectedRowKeys)
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.selectedRowKeys.forEach(res => {
             this.selectedRowKeysData.push(JSON.parse(res))

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -324,6 +324,7 @@
           pageNo: this.pageNo,
           pageSize: this.pageSize,
           serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
+          flowStatus: this.$route.query.flowStatus ? this.$route.query.flowStatus : '',
           ...queryParam
         }
         this.loading = true

jero-web/src/views/dashboard/components/myList.vue

@@ -88,6 +88,7 @@
       prcClick(row) {
         // let index = row.taskIds.lastIndexOf(',')
         // row.taskIds = row.taskIds.slice(0, index)
+        row.router = this.$route.path
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
@@ -100,7 +101,7 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
-        }else if (row.prcType == '6') {
+        } else if (row.prcType == '6') {
           let newUrl = this.$router.resolve({
             path: '/evaluationProcess',
             query: row

jero-web/src/views/documentTools/documentComparison/components/commentList.vue

@@ -122,6 +122,11 @@
               required: true,
               message: this.$t('publishComment') + this.$t('cannotEmpty'),
               trigger: 'blur'
+            },
+            {
+              max: 500,
+              message: this.$t('publishComment') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
             }
           ],
           replyContent: [
@@ -129,6 +134,11 @@
               required: true,
               message: this.$t('replyToComments') + this.$t('cannotEmpty'),
               trigger: 'blur'
+            },
+            {
+              max: 500,
+              message: this.$t('replyToComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
             }
           ]
         }
@@ -286,6 +296,7 @@
     display: inline-block;
     margin-top: 22px;
     margin-left: 40px;
+    word-break: break-word;
   }
 
   .title-text {
@@ -385,10 +396,18 @@
   }
 
   .button-text {
-    width: 73px;
+    width: 88px;
     overflow: hidden;
     padding: 0 8px;
-    box-sizing: border-box;
+    float: right;
+  }
+
+  ::v-deep .button-text span {
+    width: 64px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-top: 4px;
   }
 </style>
 <style>

jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue

@@ -28,10 +28,12 @@
                         style="margin-left: 20px;float: left"></a-checkbox>
             <div class="detail-content-header-content">
               <div class="detail-content-header-content-left"
+                   :title="resultData.serialNumberLeft + resultData.fileNameLeft"
                    :class="{'detail-content-header-content-left-active':isDisplay}">
                 {{$t('selectedStandard')}}：{{resultData.serialNumberLeft}} {{resultData.fileNameLeft}}
               </div>
               <div class="detail-content-header-content-content"
+                   :title="resultData.serialNumberRight + resultData.fileNameRight"
                    :class="{'detail-content-header-content-left-active':isDisplay}">
                 {{$t('selectedStandard')}}：{{resultData.serialNumberRight}} {{resultData.fileNameRight}}
               </div>
@@ -63,11 +65,14 @@
                     <div class="detail-content-left-button" v-html="item.itemsTextRight"></div>
                   </div>
                   <div class="detail-content-bottom">
-                    <div class="detail-content-bottom-left" :title="$t('comparisonDifferenceComment')">
+                    <div class="detail-content-bottom-left"
+                         :class="{'detail-content-bottom-left-text':language == 'en-us' ? true:false}"
+                         :title="$t('comparisonDifferenceComment')">
                       <a-icon type="message"/>
                       {{$t('comparisonDifferenceComment')}}:
                     </div>
-                    <div class="detail-content-bottom-right">
+                    <div class="detail-content-bottom-right"
+                         :class="{'detail-content-bottom-right-text':language == 'en-us' ? true:false}">
                       {{item.comment}}
                     </div>
                   </div>
@@ -87,8 +92,8 @@
             <div class="detail-content-content-text">
               <div class="detail-content-content-text-left"
                    :class="{'detail-content-content-text-dis':isDisplay}">
-                <div class="detail-content-content-text-left-text">
+                <div class="detail-content-content-text-left-text" :title="resultData.comments">
-                  {{$t('fullTextComments')}}: {{resultData.comments}}
+                  <span>{{$t('fullTextComments')}}:</span> {{resultData.comments}}
                 </div>
               </div>
               <div class="detail-content-content-text-right" v-if="!isDisplay">
@@ -170,6 +175,7 @@
         isDisplay: false,
         fullCheckbox: false,
         resultData: {},
+        language: '',
         url: {
           exportData: '/compare/sarFileCompareItemComment/exportResXls'
         }
@@ -181,6 +187,7 @@
       } else {
         this.isDisplay = true
       }
+      this.language = localStorage.getItem('language') || ''
       this.getData()
     },
     methods: {
@@ -307,8 +314,8 @@
           this.rulesText = {
             comment: [
               {
-                max: 300,
+                max: 500,
-                message: this.$t('fullTextComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+                message: this.$t('fullTextComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
                 trigger: 'blur'
               }
             ]
@@ -326,8 +333,8 @@
           this.rulesText = {
             comment: [
               {
-                max: 300,
+                max: 500,
-                message: this.$t('comparativeComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+                message: this.$t('comparativeComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
                 trigger: 'blur'
               }
             ]
@@ -388,7 +395,7 @@
       }
 
       .doc-detail-right {
-        width: 300px;
+        width: 800px;
         line-height: 68px;
         /*display: flex;*/
         text-align: right;
@@ -572,6 +579,7 @@
     font-size: 14px;
     font-weight: 400;
     color: #040B29;
+    word-break: break-word;
   }
 
   .detail-content-content-text-left-text {
@@ -586,8 +594,7 @@
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 3;
     /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
+    word-break: break-word;
-    word-break: break-all
   }
 
   .box-title-text-Remarks {
@@ -618,4 +625,12 @@
   .detail-content-header-content-left-active {
     width: 50% !important;
   }
+
+  .detail-content-bottom-left-text {
+    width: 256px;
+  }
+
+  .detail-content-bottom-right-text {
+    width: calc(50% - 256px);
+  }
 </style>

jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue

@@ -30,7 +30,7 @@
         <div class="detail-content" style="padding-bottom: 20px">
           <div style="width: 100%;height: auto;overflow: hidden">
             <div class="detail-content-left">
-              <div class="detail-content-left-header">
+              <div class="detail-content-left-header" :title="resultData.serialNumberLeft + resultData.fileNameLeft">
                 {{this.resultData.serialNumberLeft}}&nbsp;
                 {{this.resultData.fileNameLeft}}
               </div>
@@ -56,14 +56,15 @@
             </div>
             <div class="detail-content-right">
               <div class="detail-content-left-header">
-                <span class="detail-content-left-header-text">
+                <span class="detail-content-left-header-text"
+                      :title="resultData.serialNumberRight + resultData.fileNameRight">
                    {{this.resultData.serialNumberRight}}&nbsp;
                    {{this.resultData.fileNameRight}}
                 </span>
-                <span class="detail-content-left-header-text-right">
+                <!--                <span class="detail-content-left-header-text-right">-->
-<!--                    <span style="color: #9B9DA9">相似度:</span>-->
+                <!--                    <span style="color: #9B9DA9">相似度:</span>-->
-                  <!--                    <span style="color: #E83030">98%</span>-->
+                <!--                    <span style="color: #E83030">98%</span>-->
-                 </span>
+                <!--                 </span>-->
               </div>
               <div class="detail-content-content-left">
                 <a-tree
@@ -154,8 +155,8 @@
         rules: {
           comment: [
             {
-              max: 300,
+              max: 500,
-              message: this.$t('comparativeComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              message: this.$t('comparativeComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
               trigger: 'blur'
             }
           ]
@@ -163,8 +164,8 @@
         rulesText: {
           comment: [
             {
-              max: 300,
+              max: 500,
-              message: this.$t('fullTextComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              message: this.$t('fullTextComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
               trigger: 'blur'
             }
           ]
@@ -578,7 +579,7 @@
   }
 
   .detail-content-left-header-text {
-    width: calc(100% - 200px);
+    width: 100%;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;

jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue

@@ -20,8 +20,8 @@
                       <div class="title-text" :title="$t('standard')">
                         <span>{{$t('standard')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                               v-model="queryParamLeft.serialNumber"></j-input>
+                               v-model="queryParamLeft.serialNumber"></a-input>
                     </div>
                   </a-col>
                   <a-col :md="8" :sm="8">
@@ -29,8 +29,8 @@
                       <div class="title-text" :title="$t('title')">
                         <span>{{$t('title')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                               v-model="queryParamLeft.title"></j-input>
+                               v-model="queryParamLeft.title"></a-input>
                     </div>
                   </a-col>
                   <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
@@ -67,7 +67,7 @@
                 />
               </div>
               <div class="box-button-standard">
-                <span class="box-button-standard-left">
+                <span class="box-button-standard-left" :title="$t('selectedStandard')">
                      {{$t('selectedStandard')}}
                 </span>
                 <span class="box-button-standard-right"
@@ -84,8 +84,8 @@
                       <div class="title-text" :title="$t('standard')">
                         <span>{{$t('standard')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                               v-model="queryParamRight.serialNumber"></j-input>
+                               v-model="queryParamRight.serialNumber"></a-input>
                     </div>
                   </a-col>
                   <a-col :md="8" :sm="8">
@@ -93,8 +93,8 @@
                       <div class="title-text" :title="$t('title')">
                         <span>{{$t('title')}}</span>
                       </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                               v-model="queryParamRight.title"></j-input>
+                               v-model="queryParamRight.title"></a-input>
                     </div>
                   </a-col>
                   <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
@@ -131,7 +131,7 @@
                 />
               </div>
               <div class="box-button-standard">
-                <span class="box-button-standard-left">
+                <span class="box-button-standard-left" :title="$t('selectedStandard')">
                      {{$t('selectedStandard')}}
                 </span>
                 <span class="box-button-standard-right"
@@ -348,6 +348,7 @@
         let query = {
           pageNo: this.pageNoLeft,
           pageSize: this.pageSizeLeft,
+          fileId:'1',
           ...queryParam
         }
         this.loadingLeft = true
@@ -371,6 +372,7 @@
         let query = {
           pageNo: this.pageNoRight,
           pageSize: this.pageSizeRight,
+          fileId:'1',
           ...queryParam
         }
         this.loadingRight = true
@@ -514,6 +516,8 @@
   .box-button-standard-left {
     width: 111px;
     height: 46px;
+    padding: 0 6px;
+    box-sizing: border-box;
     display: inline-block;
     border: 1px solid #CED0D8;
     border-right: none;

jero-web/src/views/documentTools/documentComparison/index.vue

@@ -57,7 +57,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:'calc(100vh - 280px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -213,7 +213,7 @@
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 260,
+            width: 310,
             scopedSlots: { customRender: 'operation' }
           }
         ]
@@ -354,10 +354,13 @@
         window.open(newUrl.href, '_blank')
       },
       initiatingProcessClick() {
-        let newUrl = this.$router.resolve({
+        this.$router.push({
-          path: '/initiateDocumentComparison'
+          path:'/initiateDocumentComparison'
         })
-        window.open(newUrl.href, '_blank')
+        // let newUrl = this.$router.resolve({
+        //   path: '/initiateDocumentComparison'
+        // })
+        // window.open(newUrl.href, '_blank')
       },
       deleteData(val) {
         let _this = this

jero-web/src/views/externalReports/index.vue

@@ -42,10 +42,10 @@
                     </span>
                     <template #overlay v-if='manager'>
                       <a-menu  @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
-                        <a-menu-item key="1" @click="orgAdd" v-has="'externalReports:folder'">{{$t('Addingfolder')}}</a-menu-item>
+                        <a-menu-item key="1" @click="orgAdd" >{{$t('Addingfolder')}}</a-menu-item>
-                        <a-menu-item key="4" @click="orgAdds" v-has="'externalReports:folder'" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
+                        <a-menu-item key="4" @click="orgAdds"  v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
-                        <a-menu-item key="2" @click="orgEdit" v-has="'externalReports:folder'">{{$t('Editfolder')}}</a-menu-item>
+                        <a-menu-item key="2" @click="orgEdit" >{{$t('Editfolder')}}</a-menu-item>
-                        <a-menu-item key="3" @click="orgDelete" v-has="'externalReports:folder'">{{$t('Deletefolders')}}</a-menu-item>
+                        <a-menu-item key="3" @click="orgDelete" >{{$t('Deletefolders')}}</a-menu-item>
 
                       </a-menu>
                     </template>
@@ -191,7 +191,7 @@
                               :title="$t('Foldername')">{{$t('Foldername')}}</span>
                       </div>
                       <a-form-model-item prop="folderName" style='width: 72%'>
-                        <a-input v-model="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" />
+                        <a-input v-model.trim="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" />
                       </a-form-model-item>
                     </div>
                   </a-col>
@@ -240,7 +240,7 @@
                                 :title="$t('Folderorder')">{{$t('Folderorder')}}</span>
                         </div>
                         <a-form-model-item class="itemModel"  prop="orderId">
-                          <a-input-number v-model="form.orderId" :min="1" :max="9999" class="box-input add-input"
+                          <a-input-number v-model.trim="form.orderId" :min="1" :max="9999" class="box-input add-input"
                                           :placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber"
                                           :parser="limitNumber" />
                           <!--                <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->

jero-web/src/views/processCenter/components/evaluatorFeedback.vue

@@ -43,7 +43,7 @@
                     v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
                     type="minus-circle"/>
           </div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" v-if="!disabled">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -87,7 +87,7 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
+          <a-row :gutter="24" v-if="!disabled">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -113,6 +113,48 @@
               </div>
             </a-col>
           </a-row>
+
+          <a-row :gutter="24" v-if="disabled">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
+                </div>
+                <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.relatedSection">
+                  {{item.relatedSection}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
+                </div>
+                <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.issueOrSuggest">
+                  {{item.issueOrSuggest}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="disabled">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <div class="title-text-right">
+                  <span style="color: #21c9cc;cursor: pointer"
+                        v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
+                     {{$t('viewFile')}}
+                  </span>
+                  <span v-else>
+                     --
+                  </span>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
         </div>
         <div class="box-text" style="margin-top: 10px" v-if="disabled">
           <div class="header-text">
@@ -395,4 +437,10 @@
     margin-left: 8px;
     cursor: pointer;
   }
+
+  .title-text-right-text {
+    overflow: visible;
+    white-space: normal;
+    word-break: break-all;
+  }
 </style>

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -308,6 +308,8 @@
       },
       completeTask() {
         let value = JSON.parse(JSON.stringify(this.queryProject))
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        value.operatorTime = handlingTime
         Object.keys(value).forEach(res => {
           if (value[res] && value[res] instanceof String) {
             value[res] = value[res].replace(/\"/g, '“')
@@ -325,7 +327,7 @@
             this.$message.success(this.$t('OperationSuccessful'))
             this.loading = false
             this.$router.push({
-              path: '/technologyAssessment'
+              path: this.$route.query.router
             })
           } else {
             this.loading = false

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -89,7 +89,7 @@
           {
             title: this.$t('taskDescription'),
             value: 'taskExplain',
-            type:4,
+            type: 4
           }
           // {
           //   title: this.$t('remarks'),
@@ -121,7 +121,8 @@
       lawsOpinionAssessmentResult() {
         getAction(this.url.list, {
           lawsOpinionGatherId: this.queryProject.id,
-          actiProcInstId: this.$route.query.prcId
+          actiProcInstId: this.$route.query.prcId,
+          createBy: this.userInfo().username
         }).then((res) => {
           if (res.success) {
             this.feedbackDataList = res.result || []
@@ -191,7 +192,7 @@
             this.$message.success(this.$t('OperationSuccessful'))
             this.loading = false
             this.$router.push({
-              path: '/collectionOfRegulatoryOpinions'
+              path: this.$route.query.router
             })
           } else {
             this.loading = false

jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue

@@ -50,8 +50,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          5: this.$t('collectionOfRegulatoryOpinionsProcess'),
-          6:this.$t('regulatoryTechnologyAssessmentProcess')
+          6: this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {
@@ -92,13 +92,10 @@
           },
           {
             title: this.$t('createTime'),
-            dataIndex: 'createTime',
+            dataIndex: 'creatTime',
             align: 'center',
             width: 180,
-            ellipsis: true,
+            ellipsis: true
-            customRender: function(t, r, index) {
-              return moment(t).format('YYYY-MM-DD HH:mm:ss')
-            }
           },
           {
             title: this.$t('cutoffTime'),
@@ -157,6 +154,7 @@
       dealWith(row) {
         // let index = row.taskIds.lastIndexOf(',')
         // row.taskIds = row.taskIds.slice(0, index)
+        row.router = this.$route.path
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',

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

@@ -675,7 +675,9 @@
           this.handlePreservation()
         }
       }, 10000)
-      this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
+      // this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
+      this.paramsManifest = this.$route.query
+      // document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
       document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
     },
     methods: {
@@ -1287,7 +1289,7 @@
       handlePreservation(num) {
         let _this = this
         let postDate = []
-        let data = JSON.parse(JSON.stringify(this.dataSource))
+        let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
         let selectedRowKeysValue = []
         data.forEach(res => {
           if (res.state == 'Wait Fill' || res.state == '待填写' || res.state == '认证工程师退回' ||

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

@@ -252,12 +252,11 @@
         // 先调取接口判断是否有配置信息
         getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => {
           if (res.result) {
-            localStorage.setItem('paramsManifest', JSON.stringify(item))
+            // localStorage.setItem('paramsManifest', JSON.stringify(item))
             let newUrl = _this.$router.resolve({
               path: '/ParameterItemCollection',
               query:  item
                 // projectName:this.$route.query.projectName
-
             })
             window.open(newUrl.href, '_blank')
           } else {

jero-web/src/views/regulationsKanban/components/addModel.vue

@@ -211,7 +211,8 @@ export default {
       this.$router.push({
         path: '/collectionOfRegulatoryOpinions',
         query:{
-          serialNumber:this.item.serialNumber
+          serialNumber:this.item.serialNumber,
+          gatherResult:'Completed'
         }
       })
     },
@@ -228,7 +229,8 @@ export default {
       this.$router.push({
         path: '/technologyAssessment',
         query:{
-          serialNumber:this.item.serialNumber
+          serialNumber:this.item.serialNumber,
+          flowStatus:'Completed'
         }
       })
     },
@@ -257,7 +259,7 @@ export default {
         id:this.paramsManifestId,
         ...this.formData
       }
-      downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.$t('complianceResults')+'.xls', query, this.Deselect)
+      downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber  +'.xls', query, this.Deselect)
     },
     searchQuery() {
       this.loadData()

jero-web/src/views/regulationsKanban/index.vue

@@ -72,22 +72,29 @@
       </div>
     </div>
     <div>
+<!--      calc(100vh - 130px)-->
       <a-table
-        ref="table"
+        class="table"
-        size="middle"
-        :loading="loading"
-        :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
-        :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 155px)'}"
+        :data-source="dataSource"
+        :loading="loading"
         :columns="columns"
+        @change="tableOnChange"
       >
         <span slot="technicalField" slot-scope="text,record" :title="text">
           <a @click="entryNameClick(record)">
             {{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }}
           </a>
         </span>
+        <span slot="standard" slot-scope="text,record" :title="text">
+            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+        </span>
+<!--        <span slot="serialNumber" slot-scope="text,record" :title="text">-->
+<!--            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}-->
+<!--        </span>-->
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="handlecody(record)">{{$t('ViewConformanceResults')}}</a>
         </span>
@@ -161,13 +168,15 @@ export default {
           title: this.$t('standard'),
           align: 'center',
           dataIndex: 'serialNumber',
-          width: 180
+          width: 180,
+          scopedSlots: { customRender: 'standard' }
         },
         {
           title: this.$t('title'),
           align: 'center',
           dataIndex: 'title',
-          width: 180
+          width: 180,
+          scopedSlots: { customRender: 'standard' }
         },
         {
           title: this.$t('status'),
@@ -256,7 +265,11 @@ export default {
       this.toggleSearchStatus = !this.toggleSearchStatus
     },
     onSelectChange(value) {
+      this.selectedRowKeys = value
       this.selectedRowKeysArray = this.selectedRowKeys.join(',')
+      console.log(this.selectedRowKeysArray)
+    },
+    tableOnChange(val) {
     },
     deriveconformanceresults(){
       let query = {