diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index ccac487e7..6e71e6449 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1114,4 +1114,48 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co -- 上报库 添加项目目标市场 2022-09-19 ALTER TABLE `laws_weilai`.`params_report` - ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`; \ No newline at end of file + ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`; + +-- 参数项清单 修改字段长度 2022-09-23 +ALTER TABLE `laws_weilai`.`params_info` + MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'nio编号' AFTER `sys_org_code`, + MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`; + +ALTER TABLE `laws_weilai`.`params_info_publish` + MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'nio编号' AFTER `sys_org_code`, + MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`; + +ALTER TABLE `laws_weilai`.`cert_category_params_info` + MODIFY COLUMN `params_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号' AFTER `sys_org_code`, + MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`; + MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'nio编号' AFTER `description`; + +ALTER TABLE `laws_weilai`.`cert_category_params_info_publish` + MODIFY COLUMN `params_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号' AFTER `sys_org_code`, + MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`, + MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'nio编号' AFTER `description`; + +ALTER TABLE `laws_weilai`.`params_collect_manifest` + MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO编号' AFTER `sys_org_code`, + MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`; + +ALTER TABLE `laws_weilai`.`params_collect_manifest_history` + MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO编号' AFTER `sys_org_code`, + MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`; + +ALTER TABLE `laws_weilai`.`params_report_detail` + MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO编号' AFTER `sys_org_code`, + MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`; + +ALTER TABLE `laws_weilai`.`report_cert_category_params_info` + MODIFY COLUMN `params_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号' AFTER `sys_org_code`, + MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`, + MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO编号' AFTER `description`; + +-- 虚拟清单表修改备注字段长度由300改为1000 2022-09-23 未同步生产环境 +ALTER TABLE `laws_weilai`.`dummy_inventory_info` +MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `duty_territory`; + +-- 法规清单表修改备注字段长度由300改为1000 2022-09-23 未同步生产环境 +ALTER TABLE `laws_weilai`.`project_laws_inventory` +MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `engineering_interface_person`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index e88b4368f..bac503454 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -1225,7 +1225,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // nio编号 String nioNumber = dto.getNioNumber(); - resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO Number", IsMustEnum.YES.getValue(),"15", false, cut); + resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO Number", IsMustEnum.YES.getValue(),"20", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(dto.getNioNumber())) { @@ -1268,7 +1268,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 24 ? 24 : columNos; Map rowList = new LinkedHashMap<>(); for (int j = 0; j < columNos; j++) { Cell cell = row.getCell(j); @@ -1275,12 +1277,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 300){ + if(remark.length() > 1000){ String message = ""; if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "备注不能超过300个字符, "; + message = errorMsg + "备注不能超过1000个字符, "; }else{ - message = errorMsg + " Note The value cannot exceed 300 characters, "; + message = errorMsg + " Note The value cannot exceed 1000 characters, "; } msgList.add(message); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 58d92b7c3..798986f11 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -5199,12 +5199,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ + if(remark.length() > 1000){ String message = ""; if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ - message = errorMsg + "备注不能超过300个字符, "; + message = errorMsg + "备注不能超过1000个字符, "; }else{ - message = errorMsg + " Note The value cannot exceed 300 characters, "; + message = errorMsg + " Note The value cannot exceed 1000 characters, "; } msgList.add(message); } @@ -5517,12 +5517,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ + if(remark.length() > 1000){ String message = ""; if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ - message = errorMsg + "备注不能超过300个字符, "; + message = errorMsg + "备注不能超过1000个字符, "; }else{ - message = errorMsg + " Note The value cannot exceed 300 characters, "; + message = errorMsg + " Note The value cannot exceed 1000 characters, "; } msgList.add(message); } @@ -5824,12 +5824,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ +// if(remark.length() > 1000){ // String message = ""; // if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ -// message = errorMsg + "备注不能超过300个字符, "; +// message = errorMsg + "备注不能超过1000个字符, "; // }else{ -// message = errorMsg + " Note The value cannot exceed 300 characters, "; +// message = errorMsg + " Note The value cannot exceed 1000 characters, "; // } // msgList.add(message); // } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 8852e0412..f9d64cd37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -48,6 +48,7 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl children = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList()); int sort = 0; if(StringUtils.isBlank(lawsMonthlyReportTitleTemplateEO.getParentId())){ + //新增父级 if(parent.size() == 0){ lawsMonthlyReportTitleTemplateEO.setSort(0); }else{ @@ -56,10 +57,15 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl childrenList = children.stream() + .filter(e -> lawsMonthlyReportTitleTemplateEO.getParentId().equals(e.getParentId())) + .collect(Collectors.toList()); + + if(childrenList.size() == 0){ lawsMonthlyReportTitleTemplateEO.setSort(0); }else{ - List sortList = parent.stream().map(LawsMonthlyReportTitleTemplateEO::getSort).collect(Collectors.toList()); + List sortList = childrenList.stream().map(LawsMonthlyReportTitleTemplateEO::getSort).collect(Collectors.toList()); Collections.sort(sortList); sort = sortList.get(sortList.size()-1) + 1; } 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 fd8b1d8e7..af9c9838a 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 @@ -112,6 +112,7 @@ public class FileSpiltService { // if (sarFileSplitInfoEO.getStartNumber()<4){ //从第四个开始拆解 nowStart.add("3.1"); + nowStart.add("4"); // } else { // nowStart.add(String.valueOf(sarFileSplitInfoEO.getStartNumber())); // } @@ -153,6 +154,8 @@ public class FileSpiltService { // 记录word自动生成的编号数据 Map numberMap = new HashMap(); boolean menuCanAdd = false; // 判断当前目录下是否可以正常填写数据 + boolean startFlag = false; // 判断开始拆分的起始段落，因为需要从标题：范围 开始拆，但会受目录的影响 + int count = 0; // 记录标题：范围 出现的次数 for (IBodyElement element : elements) { // 段落 if (element instanceof XWPFParagraph) { @@ -160,6 +163,18 @@ public class FileSpiltService { // 处理段落生成编号不识别问题 String paragraphString = p.getText(); + if ("前言".equals(getChinese(paragraphString))) { + count++; + if (count > 1) { + startFlag = true; + } + + continue; + } else { + if(!startFlag) { + continue; + } + } if (StringUtils.isNotBlank(paragraphString)) { paragraphString = paragraphString.replace((char) 12288, ' '); paragraphString = paragraphString.trim(); @@ -168,7 +183,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -179,7 +196,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -200,7 +219,7 @@ public class FileSpiltService { } } if (messageNumber == 0) { - ptest = Pattern.compile("^1\\s{0,3}范围"); + ptest = Pattern.compile("^1\\s{0,50}范围"); matcher = ptest.matcher(paragraphString); while (matcher.find()) { List clauseContent = new ArrayList<>(); @@ -227,7 +246,7 @@ public class FileSpiltService { messageNumber++; } } else if (messageNumber == 1) { - ptest = Pattern.compile("^2\\s{0,3}规范性引用文件"); + ptest = Pattern.compile("^2\\s{0,50}规范性引用文件"); matcher = ptest.matcher(paragraphString); if (matcher.find()) { List clauseContent = new ArrayList<>(); @@ -261,7 +280,7 @@ public class FileSpiltService { } } } else if (messageNumber == 2) { - ptest = Pattern.compile("^3\\s{0,3}术语(和|与)定义"); + ptest = Pattern.compile("^3\\s{0,50}术语(和|与)定义"); matcher = ptest.matcher(paragraphString); if (matcher.find()) { List clauseContent = new ArrayList<>(); @@ -695,7 +714,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -706,7 +727,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -887,7 +910,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -898,7 +923,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -1089,7 +1116,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -1100,7 +1129,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -1461,7 +1492,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -1472,7 +1505,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -1666,7 +1701,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -1677,7 +1714,9 @@ public class FileSpiltService { // 处理当前段落仅为图片的情况 List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { - addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + if (messageList.size() > 0) { + addItermsConditionsImage(messageList.get(messageList.size() - 1), itemValList, p, imageBundleList); + } } continue; } @@ -3025,4 +3064,19 @@ public class FileSpiltService { // } // return personMsgEO; // } + + private String getChinese(String source) { + + char[] chars = source.toCharArray(); + StringBuilder stringBuilder = new StringBuilder(); + for (char aChar : chars) { + int length = String.valueOf(aChar).getBytes().length; + if (length == 3) { + stringBuilder.append(aChar); + } + } + + return stringBuilder.toString(); + } + } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index eff55c5ba..799e01e9e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1154,8 +1154,8 @@ module.exports = { category: 'Category', RegulatoryProcessEvaluationResults: 'Regulatory Process Evaluation Results', ViewConformanceResults: 'View Conformance Results', - CommentsCollectionResultsForReference: 'Comments Collection Results For Reference', - TechnicalEvaluationResultsForReference: 'Technical Evaluation Results For Reference', + CommentsCollectionResultsForReference: 'Comments Collection Results For', + TechnicalEvaluationResultsForReference: 'Technical Evaluation Results For', ComplianceConfirmationRecord: 'Compliance Confirmation Record', complianceConfirmation: 'Compliance Confirmation', noComparisonDocumentSelected: 'No comparison document selected', @@ -1299,4 +1299,14 @@ module.exports = { theResponsiblePersonTaskForTheSecondTime:'The responsible person receives the task for the second time', processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data', exportFileName:'Export file name', + initiateSupplementaryProcess:'Initiate supplementary process', + whetherTheDisassemblySheetIncluded:'Whether the disassembly sheet is included', + inRecentMonths3:'In recent 3 months', + inRecentMonths6:'In recent 6 months', + inRecentYear1:'In recent 1 year', + inRecentYear2:'In recent 2 year', + selectAll:'Select All', + importLocalDisassemblyOrder:'Import local disassembly order', + notExport:'Not export', + hasBeenExport:'Has been export', } \ 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 d4b640677..a4d0c48ec 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1158,7 +1158,6 @@ module.exports = { category: '类别', RegulatoryProcessEvaluationResults: '法规流程评估结果', ViewConformanceResults: '查看符合性结果', - CommentsCollectionResultsForReference: '意见收集结果参考', TechnicalEvaluationResultsForReference: '技术评估结果参考', ComplianceConfirmationRecord: '符合性确认记录', complianceConfirmation: '符合性确认', @@ -1259,8 +1258,8 @@ module.exports = { category: '类别', RegulatoryProcessEvaluationResults: '法规流程评估结果', ViewConformanceResults: '查看符合性结果', - CommentsCollectionResultsForReference: '意见收集结果参考', - TechnicalEvaluationResultsForReference: '技术评估结果参考', + CommentsCollectionResultsForReference: '意见收集结果', + TechnicalEvaluationResultsForReference: '技术评估结果', ComplianceConfirmationRecord: '符合性确认记录', complianceConfirmation: '符合性确认', Deriveconformanceresults: '导出符合性结果', @@ -1401,4 +1400,14 @@ module.exports = { theResponsiblePersonTaskForTheSecondTime:'责任人二次接收任务', processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致；请选择一致的数据', exportFileName:'导出文件名称', + initiateSupplementaryProcess:'发起补充流程', + whetherTheDisassemblySheetIncluded:'是否含有拆解单', + inRecentMonths3:'近3个月内', + inRecentMonths6:'近6个月内', + inRecentYear1:'近1年内', + inRecentYear2:'近2年内', + selectAll:'全选', + importLocalDisassemblyOrder:'导入本地拆解单', + notExport:'未导出', + hasBeenExport:'已导出', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 22eed786f..4cca72ab2 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -98,6 +98,7 @@ this.$route.path == '/problemKnowledgeBaseRelease' || this.$route.path == '/problemKnowledgeBaseView' || this.$route.path == '/regulatoryInitiatingProcess' || + this.$route.path == '/regulatoryEvaluationResults' || this.$route.path == '/regulatoryProcessReview' || this.$route.path == '/handshakeProcess' || this.$route.path == '/projectStatusAndProgress' || diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 6184eda9e..4bf3a540b 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -67,6 +67,24 @@ :type="'select'" :triggerChange="false" :dictCode="item.dict_field"/> +
+
+ {{item.db_field_txt}} +
+ + + + {{ item.name }} + + + +
@@ -190,11 +226,12 @@ methods: { searchQuery() { if (this.isDefault) { + if (!this.queryParam['WarnTimeText']) { + this.queryParam['WarnTimeText'] = '2' + } let startTime = moment(new Date()).format('YYYY-MM-DD') let endTime = this.getNowdate() - if (this.queryParam['WarnTime'].length == 0) { - this.queryParam['WarnTime'] = [startTime, endTime] - } + this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) @@ -203,8 +240,8 @@ this.queryParam = {} if (this.isDefault) { let startTime = moment(new Date()).format('YYYY-MM-DD') + this.queryParam['WarnTimeText'] = '2' let endTime = this.getNowdate() - console.log(endTime) this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } @@ -218,7 +255,17 @@ if (res.success) { this.searchList = res.result if (this.searchQueryList && this.searchQueryList.length > 0) { - this.searchList = this.searchList.concat(this.searchQueryList) + for (let i = 0; i < this.searchList.length; i++) { + if (this.searchList[i].db_field_name == 'issue_time') { + this.searchList.splice(i, 1) + i-- + } + if (this.searchList[i].db_field_name == 'title') { + let data = this.searchList[i + 1] + this.searchList[i + 1] = this.searchQueryList[0] + this.searchList.push(data) + } + } if (this.isDefault) { this.searchReset() } @@ -226,26 +273,41 @@ } }) }, - getNowdate(){ + getNowdate() { + let monthData + let yearData + if (this.queryParam['WarnTimeText'] == '1') { + monthData = 4 + yearData = 1 + } else if (this.queryParam['WarnTimeText'] == '2') { + monthData = 7 + yearData = 1 + } else if (this.queryParam['WarnTimeText'] == '3') { + monthData = 13 + yearData = 1 + } else if (this.queryParam['WarnTimeText'] == '4') { + monthData = 25 + yearData = 2 + } var date_now = new Date()//获取当前时间 var year = date_now.getFullYear()//获取当前时间的年份 var month = date_now.getMonth()//获取当前时间的月份 var day = date_now.getDate()//获取当前时间的日 - var days = new Date(year,month,0)//将获取到的年月赋值给days + var days = new Date(year, month, 0)//将获取到的年月赋值给days days = days.getDate()//获取当前年月的日 var year2 = year - var month2 = parseInt(month+7)//获取当前月份的1一个月以后的月份 - if(month2 > 12){ - year2 = parseInt(year2) + 1 + var month2 = parseInt(month + monthData)//获取当前月份的1一个月以后的月份 + if (month2 > 12) { + year2 = parseInt(year2) + yearData month2 = parseInt(month2) % 12 }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月 var day2 = day - var days2 = new Date(year2,month2,0) + var days2 = new Date(year2, month2, 0) days2 = days2.getDate() - if(day2>days2){ + if (day2 > days2) { day2 = days2 }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2 - if(month2 < 10){ + if (month2 < 10) { month2 = '0' + month2 } var time = year2 + '-' + month2 + '-' + day2 diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue index 49531a79d..882c93446 100644 --- a/jero-web/src/components/viewFileModel/index.vue +++ b/jero-web/src/components/viewFileModel/index.vue @@ -23,7 +23,8 @@ + || record.fileSuffix == '.jpg' || record.fileSuffix == '.png' || record.fileSuffix == '.gif' + || record.fileSuffix == '.jpeg' || record.fileSuffix == '.xlsx' || record.fileSuffix == '.xls' ? false : true"> {{$t('See')}} @@ -77,7 +78,8 @@ } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') - } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls' + || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else { diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index e425791de..1af8d0462 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -342,6 +342,11 @@ export const constantRouterMap = [ name: 'initiatingProcess', component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess') }, + { + path: '/regulatoryEvaluationResults', + name: 'evaluationResultsList', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList') + }, { path: '/evaluationInitiationProcess', name: 'evaluationInitiationProcess', diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 84f19760a..e559e1e27 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -1,64 +1,65 @@ - + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 5c8328c34..d22898423 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -111,6 +111,11 @@ } }, mounted() { + let serial_number = localStorage.getItem('serial_number') + if (serial_number) { + this.searchStr = serial_number + localStorage.removeItem('serial_number') + } this.getList() this.replacePage() }, @@ -406,7 +411,8 @@ text-overflow: ellipsis; word-break: break-all; } - .box-content-left .ant-tag-checkable-checked{ + + .box-content-left .ant-tag-checkable-checked { border: 1px #21c9cc solid; color: #21c9cc; } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index d002831c3..008c74166 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -14,6 +14,26 @@ :placeholder="$t('monthSelection')"/> + +
+
+ {{$t('exportStatus')}} +
+ + + + {{ item.name }} + + + +
+ {{$t('query')}} @@ -54,6 +74,7 @@ :columns="columns" > + {{$t('copy')}} {{$t('view')}} {{$t('edit')}} {{$t('deleteLib')}} @@ -97,6 +118,16 @@ list: '/report/lawsMonthlyReportWriteEO/page', exportData: '/report/lawsMonthlyReportWriteEO/exportMonthlyReport' }, + exportStatusList:[ + { + value:'2', + name:this.$t('hasBeenExport') + }, + { + value:'1', + name:this.$t('notExport') + } + ], loading: false, dataSource: [], selectedRowKeys: [], @@ -151,7 +182,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 190, scopedSlots: { customRender: 'operation' } } ] @@ -162,6 +193,26 @@ this.getList() }, methods: { + copyClick(row){ + let _this = this + this.$confirm({ + content: _this.$t('ConfirmReplication'), + onOk() { + let query = JSON.parse(JSON.stringify(row)) + delete query.id + delete query.exportState + delete query.exportStateName + postAction('/report/lawsMonthlyReportWriteEO/add', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } + }) + }, dateChange(item) { this.queryParam[item.db_field_name] = this.queryParam[item.db_field_name] ? moment(this.queryParam[item.db_field_name]).format('YYYY-MM') : '' this.queryParam = { ...this.queryParam } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index ff3d45cfd..67a9a1ca8 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -216,7 +216,8 @@ } else if (fileSuffix === '.docx' || fileSuffix === '.doc') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') - } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { + } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls' + || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') } else { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index bb0933465..6d44acfc8 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -1,20 +1,93 @@