From d2b7ff9b95a28d18bee37a29e2b3a995b3f1f9f1 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 19 Sep 2022 19:26:08 +0800 Subject: [PATCH 01/21] =?UTF-8?q?1.=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commponts/conventionalmodle.vue | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index 93bdcf666..d6adc03d0 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -95,6 +95,21 @@ + + +
+
+ * + {{$t('exportFileName')}} +
+ + + +
+ + + @@ -141,6 +156,14 @@ export default { trigger: 'blur' } ], + exportName:[ + { + max: 70, + message: this.$t('exportFileName') + this.$t('cannotExceed') + 70 + this.$t('Characters'), + trigger: 'blur' + }, + { required: true, message: this.$t('PleaseEnter')+this.$t('exportFileName'), trigger: 'blur' }, + ], certCategory:[ { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' }, // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' }, @@ -289,12 +312,12 @@ export default { query.certCategoryName = this.contentListStart } query.paramsManifestId = this.$route.query.id - let long = localStorage.getItem('language') - if (long && long === 'zh-cn') { - query.exportName = '常规导出' - } else if (long && long === 'en-us') { - query.exportName = 'Normal' - } + // let long = localStorage.getItem('language') + // if (long && long === 'zh-cn') { + // query.exportName = '常规导出' + // } else if (long && long === 'en-us') { + // query.exportName = 'Normal' + // } this.confirmLoading = true downloadFile('report/detail/exportNormal', query.exportName+'.zip', query) this.confirmLoading = false From b07b15952cf2e5e452e2c50c45f6cf9aa7f94ee1 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 20 Sep 2022 15:17:15 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-GB?= =?UTF-8?q?=E7=B1=BB=E5=9E=8Bbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSpiltService.java | 84 +++++++++++++++---- 1 file changed, 69 insertions(+), 15 deletions(-) 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(); + } + } From d716e9c7223464d677622a2f6e58947b65a95fda Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 21 Sep 2022 11:22:30 +0800 Subject: [PATCH 03/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collectionOfRegulatoryOpinions/index.vue | 15 +++++---- .../externalReports/components/addModel.vue | 2 +- jero-web/src/views/externalReports/index.vue | 8 ++--- .../components/feedbackInformation.vue | 33 ++++++++++--------- .../components/standardContent.vue | 16 +++++++-- .../processForm/regulatoryProcess/index.vue | 3 +- 6 files changed, 47 insertions(+), 30 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 348304131..a6bcb5491 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -101,8 +101,9 @@ {{text}} - {{$t('viewProcess')}} - {{$t('viewProcess')}}--> + + {{$t('evaluationResults')}} * {{$t('fileName')}} + :title="$t('file')">{{$t('file')}}
-
- {{ $t('fileName') }} +
+ {{ $t('file') }}
-
@@ -355,7 +355,7 @@ export default { ], columns: [ { - title: this.$t('fileName'), + title: this.$t('file'), align: 'center', dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index b237e6c53..81706b645 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -55,21 +55,6 @@ - -
-
- {{$t('reason')}} -
- - - -
-
@@ -87,6 +72,24 @@
+ +
+
+ * + {{$t('reason')}} +
+ + + +
+
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index b90e95627..846990863 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -17,10 +17,13 @@ @click="urlClick(queryForm[item.value])" v-if="item.type == 1" >{{queryForm[item.value]}} - + {{queryForm[item.value]}} {{ $t('viewFile') }} Date: Wed, 21 Sep 2022 12:01:07 +0800 Subject: [PATCH 04/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 47 ++++++++++++++++--- .../technologyAssessment/index.vue | 28 ++++++----- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index d5ebba0a4..3debb89f8 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -37,8 +37,29 @@
+ + +
+
+ * + {{$t('standardDecompositionDocument')}} +
+ + + + {{$t('yes')}} + + + {{$t('notOnlyRz')}} + + + +
+ + - +
{{$t('selectedStandard')}} @@ -58,7 +79,7 @@ - +
* @@ -76,7 +97,7 @@
- +
{ if (valid) { this.visible = false - this.formInline.firstInitiation = '1' - let newUrl = this.$router.resolve({ - path: '/evaluationInitiationProcess', - query: this.formInline - }) - // let newUrl = this.$router.resolve({ - // path: '/evaluationProcess' - // }) - window.open(newUrl.href, '_blank') + } }) }, initiatingProcessClick() { - this.visible = true - this.formInline = {} - this.$nextTick(() => { - this.$refs.ruleForm.clearValidate() + // this.visible = true + // this.formInline = {} + // this.$nextTick(() => { + // this.$refs.ruleForm.clearValidate() + // }) + this.formInline.firstInitiation = '1' + this.formInline.whetherTobring = '1' + let newUrl = this.$router.resolve({ + path: '/evaluationInitiationProcess', + query: this.formInline }) + // let newUrl = this.$router.resolve({ + // path: '/evaluationProcess' + // }) + window.open(newUrl.href, '_blank') }, viewProcessClick(row) { this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row))) From 418dd15e4f73037968a79062141238a0f8792a7a Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 21 Sep 2022 15:34:00 +0800 Subject: [PATCH 05/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/problemKnowledgeBaseAdd.vue | 5 +++-- .../components/evaluationResultsClause.vue | 11 ++++++----- .../components/evaluationResultsWhole.vue | 4 ++-- .../documentTranslation/components/addModel.vue | 5 +++-- .../processForm/evaluationProcess/index.vue | 6 ++++-- .../processForm/processDetails/index.vue | 7 +++---- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index eff55c5ba..0b8a447f8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1299,4 +1299,5 @@ 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', } \ 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..ff0f048ef 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1401,4 +1401,5 @@ module.exports = { theResponsiblePersonTaskForTheSecondTime:'责任人二次接收任务', processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致；请选择一致的数据', exportFileName:'导出文件名称', + initiateSupplementaryProcess:'发起补充流程', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index b36a85902..5cb25572b 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -52,10 +52,11 @@
- * + {{$t('market')}}
- + +
- {{$t('processBackground')}} - {{$t('initiateProcessForCurrentStandard')}} + {{$t('initiateSupplementaryProcess')}}
+ {{$t('processBackground')}}: {{$route.query.processBackground}}
@@ -237,7 +237,7 @@ processBackground: this.$route.query.processBackground || '', remark: this.$route.query.remark || '', standId: this.$route.query.standId, - lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId + lawsTechnologyEvaluationId: this.$route.query.lawsTechnologyEvaluationId } let newUrl = this.$router.resolve({ path: '/evaluationInitiationProcess', @@ -423,13 +423,14 @@ text-justify: inter-ideograph; word-break: break-all } + ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } ::v-deep .ant-table-body { - background: transparent!important; + background: transparent !important; } \ No newline at end of file From 1c3c1595a391c3c073de990fa27f7cd80f5f5f7b Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 21 Sep 2022 21:13:53 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug-=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5=E6=95=B0=E7=BB=84=E8=B6=8A?= =?UTF-8?q?=E7=95=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 198274289..1f9ce36a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1037,6 +1037,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 24 ? 24 : columNos; Map rowList = new LinkedHashMap<>(); for (int j = 0; j < columNos; j++) { Cell cell = row.getCell(j); From ffcc0b115dacda87be228ba142a4bb39d9ba3432 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 22 Sep 2022 10:27:04 +0800 Subject: [PATCH 10/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 +- jero-web/src/common/lang/zh-cn.js | 5 +-- .../documentComparison/index.vue | 43 +++++++++++-------- .../src/views/regulationsKanban/index.vue | 23 ++++++---- 4 files changed, 43 insertions(+), 32 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ec11969e7..1547b8510 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', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 7e5ff04b1..202ac4dda 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: '导出符合性结果', diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 467d798de..0db7f9fde 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -150,20 +150,20 @@ scopedSlots: { customRender: 'serialNumberLeft' } }, { - title: this.$t('TextStatus'), + title: this.$t('TextStatus') + 1, align: 'center', width: 200, ellipsis: true, dataIndex: 'fileTypeLeft' }, - { - title: this.$t('fileName'), - align: 'center', - width: 270, - ellipsis: true, - dataIndex: 'fileNameLeft', - scopedSlots: { customRender: 'fileNameLeft' } - }, + // { + // title: this.$t('fileName'), + // align: 'center', + // width: 270, + // ellipsis: true, + // dataIndex: 'fileNameLeft', + // scopedSlots: { customRender: 'fileNameLeft' } + // }, { title: this.$t('standard') + 2, align: 'center', @@ -181,20 +181,20 @@ width: 170 }, { - title: this.$t('TextStatus'), + title: this.$t('TextStatus') + 2, align: 'center', width: 200, ellipsis: true, dataIndex: 'fileTypeRight' }, - { - title: this.$t('fileName'), - align: 'center', - width: 270, - ellipsis: true, - dataIndex: 'fileNameRight', - scopedSlots: { customRender: 'fileNameRight' } - }, + // { + // title: this.$t('fileName'), + // align: 'center', + // width: 270, + // ellipsis: true, + // dataIndex: 'fileNameRight', + // scopedSlots: { customRender: 'fileNameRight' } + // }, { title: this.$t('releaseSituation'), align: 'center', @@ -202,6 +202,13 @@ ellipsis: true, dataIndex: 'releaseStateTitle' }, + { + title: this.$t('creater'), + align: 'center', + width: 170, + ellipsis: true, + dataIndex: 'createBy' + }, { title: this.$t('remarks'), align: 'center', diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index b7366a734..4dd1c1f39 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -86,17 +86,17 @@ > - {{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }} + {{ text }} - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + {{ text }} - {{$t('ViewConformanceResults')}} + {{$t('view')}}
@@ -168,21 +168,24 @@ export default { title: this.$t('standard'), align: 'center', dataIndex: 'serialNumber', - width: 180, + width: 300, + ellipsis: true, scopedSlots: { customRender: 'standard' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', - width: 250, + width: 300, + ellipsis: true, scopedSlots: { customRender: 'standard' } }, { title: this.$t('status'), align: 'center', + ellipsis: true, dataIndex: 'state_dicText', - width: 180 + width: 120 }, // { // title: this.$t('category'), @@ -194,13 +197,14 @@ export default { align: 'center', dataIndex: 'technologyTerritory_dicText', width: 250, + ellipsis: true, scopedSlots: { customRender: 'technicalField' } }, { - title: this.$t('RegulatoryProcessEvaluationResults'), + title: this.$t('evaluationResults'), align: 'center', fixed: 'right', - width: 300, + width: 180, scopedSlots: { customRender: 'operation' } } ], @@ -282,7 +286,8 @@ export default { // 导出历史 handlecody(e) { this.drawerVisible = true - this.titleTag = e.serialNumber + this.$t('ComplianceConfirmationRecord') + // e.serialNumber + + this.titleTag = this.$t('evaluationResults') this.paramsManifestId = e.id this.item = {...e} }, From 91208e243830384c54657d4c2f81230d3230319b Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 22 Sep 2022 11:16:28 +0800 Subject: [PATCH 11/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + jero-web/src/components/search/index.vue | 88 ++++++++++++++++--- .../views/regulatoryEarlyWarning/index.vue | 63 ++++++++++--- 4 files changed, 133 insertions(+), 26 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1547b8510..ee96eeee6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1301,4 +1301,8 @@ module.exports = { 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', } \ 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 202ac4dda..f3c0d229a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1402,4 +1402,8 @@ module.exports = { exportFileName:'导出文件名称', initiateSupplementaryProcess:'发起补充流程', whetherTheDisassemblySheetIncluded:'是否含有拆解单', + inRecentMonths3:'近3个月内', + inRecentMonths6:'近6个月内', + inRecentYear1:'近1年内', + inRecentYear2:'近2年内', } \ No newline at end of file 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/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 5920517da..dbb45982a 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -122,9 +122,27 @@ searchParmes: {}, searchQueryList: [ { - field_show_type: 6, + field_show_type: 12, db_field_txt: this.$t('warningTime'), - db_field_name: 'WarnTime' + db_field_name: 'WarnTimeText', + option: [ + { + value: '1', + name:this.$t('inRecentMonths3') + }, + { + value: '2', + name: this.$t('inRecentMonths6') + }, + { + value: '3', + name: this.$t('inRecentYear1') + }, + { + value: '4', + name: this.$t('inRecentYear2') + } + ] } ], @@ -240,7 +258,7 @@ } else { flag = 2 } - this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys)),flag) + this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys)), flag) }) } else { this.$message.warning(this.$t('selectLeastOne')) @@ -272,6 +290,9 @@ this.selectedRowKeys = [] }, clearSelected() { + if (!this.searchParmes['WarnTimeText']) { + this.searchParmes['WarnTimeText'] = '2' + } let startTime = moment(new Date()).format('YYYY-MM-DD') let endTime = this.getNowdate() this.searchParmes['WarnTime'] = [startTime, endTime] @@ -279,26 +300,41 @@ this.pageNo = 1 this.getList() }, - getNowdate(){ + getNowdate() { + let monthData + let yearData + if (this.searchParmes['WarnTimeText'] == '1') { + monthData = 4 + yearData = 1 + } else if (this.searchParmes['WarnTimeText'] == '2') { + monthData = 7 + yearData = 1 + } else if (this.searchParmes['WarnTimeText'] == '3') { + monthData = 13 + yearData = 1 + } else if (this.searchParmes['WarnTimeText'] == '4') { + monthData = 25 + yearData = 2 + } 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 @@ -350,12 +386,13 @@ text-align: right; margin-top: 20px; } + ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } ::v-deep .ant-table-body { - background: transparent!important; + background: transparent !important; } \ No newline at end of file From 6a2ae15e093dde58b69fd8f4cd2299be7585e7df Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 22 Sep 2022 11:55:59 +0800 Subject: [PATCH 12/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/evaluationResultsList.vue | 202 +++++++++++------- .../collectionOfRegulatoryOpinions/index.vue | 14 +- .../components/feedbackInformation.vue | 18 ++ 5 files changed, 161 insertions(+), 79 deletions(-) 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/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/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index e28c012a2..cd3ab69b8 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -396,6 +396,15 @@ window.open(newUrl.href, '_blank') }, KnowledgeDatabaseClick() { + let serial_number = '' + if (this.detailList.length > 0) { + this.detailList[0][this.$t('essentialInformation')].forEach(res => { + if (res.db_field_name == 'serial_number') { + serial_number = res.value + } + }) + } + localStorage.setItem('serial_number',serial_number) let newUrl = this.$router.resolve({ path: '/problemknowledgeBase', }) From 769bd811d4ea23792d4a20419a5f2390dcec1623 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 22 Sep 2022 16:02:41 +0800 Subject: [PATCH 14/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/TermInformation.vue | 172 +++++++++++++++++- .../components/evaluationResultsClause.vue | 14 +- .../components/initiatingProcess.vue | 30 ++- .../technologyAssessment/index.vue | 7 +- .../components/evaluatorFeedbackList.vue | 30 +-- 7 files changed, 213 insertions(+), 42 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6725b7b68..1a51afda9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1306,4 +1306,5 @@ module.exports = { inRecentYear1:'In recent 1 year', inRecentYear2:'In recent 2 year', selectAll:'Select All', + importLocalDisassemblyOrder:'Import local disassembly order', } \ 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 531e3a061..842a79258 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1407,4 +1407,5 @@ module.exports = { inRecentYear1:'近1年内', inRecentYear2:'近2年内', selectAll:'全选', + importLocalDisassemblyOrder:'导入本地拆解单', } \ No newline at end of file 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 @@ diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index fae28b883..57962084a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -32,6 +32,40 @@
+ +
+
+ {{$t('technicalField')}} +
+ +
+ + +
+
+ {{$t('informationCategory')}} +
+ +
+ + + + {{$t('query')}} + {{$t('reset')}} + + @@ -94,6 +128,7 @@ components: { ImportFile }, + props: ['gatherResultList'], data() { return { visible: false, @@ -101,6 +136,7 @@ confirmLoading: false, selectedRowKeys: [], sarFileSplitInfoList: [], + informationCategoryList:[], url: { list: '/split/sarFileSplitItems/getSplitItemsByPage' }, @@ -151,10 +187,23 @@ queryConditionVOList: [], info_id: '', selectedRowKeysData: [], - standardList: '' + standardList: '', + CategoryTreeList: [] } }, + mounted() { + this.getSysCategoryTree() + }, methods: { + getSysCategoryTree() { + getAction('/sys/category/getSysCategoryTree', {}).then((res) => { + if (res.success) { + this.CategoryTreeList = res.result + } else { + this.CategoryTreeList = [] + } + }) + }, handleModule() { }, @@ -176,6 +225,7 @@ this.standData = row this.sarFileSplitInfoList = this.standData.sarFileSplitInfoList || [] this.sarFileSplitInfoList = [...this.sarFileSplitInfoList] + this.queryParam = {} this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : '' this.visible = true if (this.queryParam.info_id) { @@ -219,10 +269,15 @@ replacePage() { let pageNo = JSON.parse(JSON.stringify(this.pageNo)) let pageSize = JSON.parse(JSON.stringify(this.pageSize)) + let queryParam = JSON.parse(JSON.stringify(this.queryParam)) + if (queryParam.technology_territory && queryParam.technology_territory.length > 0){ + queryParam.technology_territory = queryParam.technology_territory.join(',') + } let query = { pageNo: pageNo + '', pageSize: pageSize + '', info_id: this.queryParam.info_id, + technology_territory:queryParam.technology_territory, menu_id: '' } this.loading = true From 787fa17f61b6121e49d6dc5755f53d326944e09d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 22 Sep 2022 18:40:24 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportTitleTemplateEOServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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; } From 127e04110e9b904daa96093593028ad0c1277030 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 23 Sep 2022 09:29:14 +0800 Subject: [PATCH 17/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/RegulationMonthlyFill.vue | 30 +++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1a51afda9..799e01e9e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1307,4 +1307,6 @@ module.exports = { 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 842a79258..a4d0c48ec 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1408,4 +1408,6 @@ module.exports = { inRecentYear2:'近2年内', selectAll:'全选', importLocalDisassemblyOrder:'导入本地拆解单', + notExport:'未导出', + hasBeenExport:'已导出', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index d002831c3..35a2c70b1 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')}} @@ -97,6 +117,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: [], From fa3a63a4f4d5708be66e5164a0096e6fd3da3b36 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 23 Sep 2022 11:33:29 +0800 Subject: [PATCH 18/21] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/RegulationMonthlyFill.vue | 23 ++++++++++++++++++- jero-web/vue.config.js | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 35a2c70b1..008c74166 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -74,6 +74,7 @@ :columns="columns" > + {{$t('copy')}} {{$t('view')}} {{$t('edit')}} {{$t('deleteLib')}} @@ -181,7 +182,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 190, scopedSlots: { customRender: 'operation' } } ] @@ -192,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/vue.config.js b/jero-web/vue.config.js index cc121368a..f8a8eae61 100644 --- a/jero-web/vue.config.js +++ b/jero-web/vue.config.js @@ -92,7 +92,7 @@ module.exports = { } }, */ '/jero-boot': { - target: 'http://localhost:8080', //请求本地 jero-boot后台项目 + target: 'http://10.0.1.14:8080', //请求本地 jero-boot后台项目 // target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目 // target: 'http://10.0.1.25:8080', // target: 'http://10.0.1.5:8080', From aac1bd08d7cb6f9ae49cfa1e37461d41893a8697 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 23 Sep 2022 14:38:32 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5?= =?UTF-8?q?(=E5=A4=87=E6=B3=A8=E7=9A=84=E5=AD=97=E7=AC=A6=E9=99=90?= =?UTF-8?q?=E5=88=B6=E7=94=B1300=E6=94=B9=E4=B8=BA1000)=20SQL(=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E7=94=B1300=E6=94=B9=E4=B8=BA1000)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 10 +++++++++- .../impl/DummyInventoryInfoEOServiceImpl.java | 6 +++--- .../ProjectLawsInventoryEOServiceImpl.java | 18 +++++++++--------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index ccac487e7..6eed5e5d5 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1114,4 +1114,12 @@ 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`; + +-- 虚拟清单表修改备注字段长度由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/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 1f9ce36a1..0c95df461 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1277,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); // } From bcae7f63afabb20e47a80f78e3eedc387b448ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 23 Sep 2022 14:50:59 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=A4=87=E6=B3=A8=E5=92=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E7=BC=96=E5=8F=B7=E5=90=8D=E7=A7=B0=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/editModel.vue | 4 ++-- .../parameter/parameterlist/components/addModel.vue | 12 ++++++------ .../projectManagement/components/listEditModel.vue | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index c2b96b192..3bc053999 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -651,8 +651,8 @@ ], remark: [ { - max: 300, - message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 1000, + message: this.$t('remarks') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 5d5bd090f..f3171c4f8 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -377,7 +377,7 @@ export default { rules: { nioNumber:[ { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' }, - { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' }, + { min:1, max: 20, message: this.$t('cantExeed')+'20'+this.$t('characters'), trigger: 'blur' }, { pattern: /^[0-9a-zA-Z-/ ]{1,}$/, message: this.$t('onlyThree'), @@ -392,7 +392,7 @@ export default { ], paramsName: [ { required: true, message: this.$t('pleaseSelect')+this.$t('Paraname'), trigger: 'blur' }, - { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' }, + { min:1, max: 350, message: this.$t('cantExeed')+'350'+this.$t('characters'), trigger: 'blur' }, ], technologyTerritory: [ { required: true, message: this.$t('pleaseSelect')+this.$t('technicalField'), trigger: 'change' }, @@ -689,8 +689,8 @@ export default { this.$message.warning(this.$t('standard')+this.$t('cannotEmpty')) falg = 0 return - } else if(item.paramsNumber.length > 15){ - this.$message.warning(this.$t('standard')+this.$t('cantExeed')+'15'+this.$t('Characters')) + } else if(item.paramsNumber.length > 20){ + this.$message.warning(this.$t('standard')+this.$t('cantExeed')+'20'+this.$t('Characters')) falg = 0 return } else if(item.paramsNumber.match(reg) === null) { @@ -703,8 +703,8 @@ export default { this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty')) falg = 0 return - } else if(item.paramsName.length > 100){ - this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'100'+this.$t('Characters')) + } else if(item.paramsName.length > 350){ + this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'350'+this.$t('Characters')) falg = 0 return } diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 15205e741..ea45dc0b4 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -945,8 +945,8 @@ ], remark: [ { - max: 300, - message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 1000, + message: this.$t('remarks') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), trigger: 'blur' } ], From cbb56cac4dd121a6ea5e5252e190f04e830e8a98 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 23 Sep 2022 14:55:34 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E8=AE=A4=E8=AF=81-NIO=E7=BC=96=E5=8F=B7,?= =?UTF-8?q?=E7=BC=96=E5=8F=B7,=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 36 +++++++++++++++++++ .../service/impl/ParamsInfoEOServiceImpl.java | 10 +++--- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6eed5e5d5..6e71e6449 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1116,6 +1116,42 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co 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`; +-- 参数项清单 修改字段长度 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`; 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