diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 0db7ddb5f..c51c09d04 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/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'; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index a14d95991..6c249ec1e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/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 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 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 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!"); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 00968a75d..443b87522 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/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> queryTreeList() { + public Result> queryTreeList(@RequestParam(name = "cut", required = false) String cut) { Result> result = new Result<>(); try { // 从内存中读取 @@ -108,7 +108,7 @@ public class SysDepartController { // if (CollectionUtils.isEmpty(list)) { // list = sysDepartService.queryTreeList(); // } - List list = sysDepartService.queryTreeList(); + List 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> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) { + public Result> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord, + @RequestParam(name = "myDeptSearch", required = false) String myDeptSearch, + @RequestParam(name = "cut", required = false) String cut) { Result> result = new Result>(); //部门查询，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 treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds); + List treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds,cut); if (treeList == null || treeList.size() == 0) { result.setSuccess(false); result.setMessage("未查询匹配数据！"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 25213835a..9d8a7a787 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/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> result = new Result<>(); //获取当前组织下数据 - List departTreeModelList = sysDepartService.queryTreeListByDepartId(departId); + List departTreeModelList = sysDepartService.queryTreeListByDepartId(departId, sysPushVO.getCut()); if (StringUtils.isNotEmpty(departId)) { List departIds = new ArrayList<>(); departIds.add(departId); @@ -1537,7 +1538,7 @@ public class SysUserController { @AutoLog(value = "文档库推送部门和人员的模糊搜索") @ApiOperation(value="文档库推送部门和人员的模糊搜索", notes="文档库推送部门和人员的模糊搜索") @GetMapping(value = "/getUserAndDepart") - public List getUserAndDepart(String name){ + public List getUserAndDepart(String name, String cut){ if("%".equals(name)){ name = "/%"; } @@ -1546,7 +1547,11 @@ public class SysUserController { List sysUserList = sysUserService.list(lambdaQueryWrapper); LambdaQueryWrapper 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 sysDepartList = sysDepartService.list(wrapper); List 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); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java index 667744bd1..4893c132c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java +++ b/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{ * 查询所有部门信息,并分节点进行显示 * @return */ - List queryTreeList(); + List queryTreeList(String cut); - List queryTreeListByDepartId(String departId); + List queryTreeListByDepartId(String departId, String cut); /** * 查询所有部门DepartId信息,并分节点进行显示 @@ -62,7 +62,7 @@ public interface ISysDepartService extends IService{ * @param keyWord * @return */ - List searhBy(String keyWord,String myDeptSearch,String departIds); + List searhBy(String keyWord,String myDeptSearch,String departIds,String cut); /** * 根据部门id删除并删除其可能存在的子级部门 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index b3a914e79..02027b250 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/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 listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts, null); return listResult; } @@ -79,20 +80,20 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeList() { + public List queryTreeList(String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.last("order by depart_order is null, depart_order asc"); List list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 - List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, cut); return listResult; } // @Cacheable(value = CacheConstant.SYS_DEPARTS_CACHE) @Override - public List queryTreeListByDepartId(String departId) { + public List queryTreeListByDepartId(String departId, String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); if (StringUtils.isBlank(departId)) { query.isNull(SysDepart::getParentId); @@ -108,7 +109,7 @@ public class SysDepartServiceImpl extends ServiceImpl */ @Override - public List searhBy(String keyWord,String myDeptSearch,String departIds) { + public List searhBy(String keyWord,String myDeptSearch,String departIds,String cut) { LambdaQueryWrapper query = new LambdaQueryWrapper(); List newList = new ArrayList<>(); //myDeptSearch不为空时为我的部门搜索，只搜索所负责部门 @@ -317,7 +318,12 @@ public class SysDepartServiceImpl extends ServiceImpl departList = this.list(query); @@ -325,7 +331,7 @@ public class SysDepartServiceImpl extends ServiceImpl list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 - List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); + List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list, null); List treelist =new ArrayList<>(); if(StringUtils.isNotBlank(keyWord)){ this.getTreeByKeyWord(keyWord,listResult,treelist); @@ -519,7 +525,7 @@ public class SysDepartServiceImpl extends ServiceImpl sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult); + List sysDepartTreeModels = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listResult, null); realResult.addAll(sysDepartTreeModels); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java index ce47aa0ab..18be6e865 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java +++ b/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 wrapTreeDataToTreeList(List recordList) { + public static List wrapTreeDataToTreeList(List recordList, String cut) { // 在该方法每请求一次,都要对全局list集合进行一次清理 //idList.clear(); List idList = new ArrayList(); @@ -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 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()); } + } 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 3288a7854..bef304927 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 @@ -4575,7 +4575,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 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(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoStatus_dicText"))); - dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyStatus_dicText"))); + dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designFlowTaskStatus_dicText"))); + dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoFlowTaskStatus_dicText"))); + dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyFlowTaskStatus_dicText"))); rowIndex ++; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index be5acd7fe..64e066ab9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/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.net.InetAddress; -import java.nio.charset.StandardCharsets; +import java.io.IOException; +import java.io.InputStream; 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++); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 01d833f72..91e4e0dfd 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/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', } \ 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 e5c4705a5..89ac86b7b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1359,4 +1359,6 @@ module.exports = { forward:'转发', issuedBy:'发布人', pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', + currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', + currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', } \ No newline at end of file diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index 21d8893ef..43ea9932a 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/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 } } diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 90a5dda09..5d0ad277d 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/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; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index c2042a3c1..929c4f38c 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/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, '“') diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 173a0f4e2..0a13a4202 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/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 diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 04c9f615a..587a41d0c 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/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 }, { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index 55010c29d..3a8d0b8d0 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/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) => { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 45bb0b312..583c1df2a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/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) { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index 6d6ceec7a..9b09465bb 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/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)) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index c47a86d66..c2c5935ac 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/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 diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 637435a0d..2ee3cfc6c 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/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 diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue index 00e59eb5d..f25f17751 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue +++ b/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; } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 971c3c12e..dfe2eeb53 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -30,7 +30,7 @@
-
+
{{this.resultData.serialNumberLeft}}  {{this.resultData.fileNameLeft}}
@@ -56,14 +56,15 @@
- + {{this.resultData.serialNumberRight}}  {{this.resultData.fileNameRight}} - - - - + + + +
{{$t('standard')}}
- +
@@ -29,8 +29,8 @@
{{$t('title')}}
- +
@@ -67,7 +67,7 @@ />
- + {{$t('selectedStandard')}} {{$t('standard')}}
- +
@@ -93,8 +93,8 @@
{{$t('title')}}
- + @@ -131,7 +131,7 @@ />
- + {{$t('selectedStandard')}} @@ -191,7 +191,7 @@ :title="$t('Foldername')">{{$t('Foldername')}}
- + @@ -240,7 +240,7 @@ :title="$t('Folderorder')">{{$t('Folderorder')}} - diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index caef7a4ed..ef8d4b8d1 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/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"/> - +
@@ -87,7 +87,7 @@
- +
@@ -113,6 +113,48 @@
+ + + +
+
+ {{$t('relevantSections')}} +
+
+ {{item.relatedSection}} +
+
+ + +
+
+ {{$t('problemDescription')}} +
+
+ {{item.issueOrSuggest}} +
+
+ + + + +
+
+ {{$t('enclosure')}} +
+
+ + {{$t('viewFile')}} + + + -- + +
+
+ +
@@ -395,4 +437,10 @@ margin-left: 8px; cursor: pointer; } + + .title-text-right-text { + overflow: visible; + white-space: normal; + word-break: break-all; + } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index ac1f757f6..243e26780 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/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 diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 604e429ce..d00ec8a03 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/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 diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index 8e318e4f8..e6f9393d3 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -50,8 +50,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess'), - 6:this.$t('regulatoryTechnologyAssessmentProcess') + 5: this.$t('collectionOfRegulatoryOpinionsProcess'), + 6: this.$t('regulatoryTechnologyAssessmentProcess') }, columns: [ { @@ -92,13 +92,10 @@ }, { title: this.$t('createTime'), - dataIndex: 'createTime', + dataIndex: 'creatTime', align: 'center', width: 180, - ellipsis: true, - customRender: function(t, r, index) { - return moment(t).format('YYYY-MM-DD HH:mm:ss') - } + ellipsis: true }, { 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', diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index a19b42892..27e096bb4 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/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 == '认证工程师退回' || diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 7b980f74e..97dcd2cda 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/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 { diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 56b430397..608c4c436 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/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() diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 27c048950..3165a3bfd 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -72,22 +72,29 @@
+ {{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }} + + {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + + + + {{$t('ViewConformanceResults')}} @@ -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 = {