From 505bc286f3ed586619449e4cce828eb26316b291 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 11 Aug 2022 11:53:58 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=A6=85=E9=81=93=2057722=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/xml/LawsComplianceBoardMapper.xml | 4 ++-- .../service/impl/LawsComplianceBoardServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml index 1e4382b0e..ded62bf91 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml @@ -16,8 +16,8 @@ LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id ) WHERE ( - bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather) - OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation) + bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather where gather_result = #{params.gatherResult}) + OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation where flow_status = #{params.flowStatus}) or pti.design_p_id IS NOT NULL OR pti.prehomo_p_id IS NOT NULL OR pti.verify_p_id IS NOT NULL diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java index 8277a6789..d29882c06 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.document.vo.QueryConditionVO; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; @@ -68,6 +69,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi //封装查询条件(包含高级搜索) String condition = this.getConditionStr(params); params.put("condition",condition); + //只查询 法规技术评估流程状态、法规意见收集 收集结果 为已完成的数据 + params.put("flowStatus", GatherResultEnum.COMPLETED.getValue()); + params.put("gatherResult", GatherResultEnum.COMPLETED.getValue()); IPage page = new Page(pageNo, pageSize); IPage infoPage = this.lawsComplianceBoardMapper.queryPageList(page, params); List records = infoPage.getRecords(); @@ -139,12 +143,14 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi //查询当前数据是否有法规意见收集流程数据 QueryWrapper opinionGatherEOQueryWrapper = new QueryWrapper<>(); opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getStandId,id); + opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult,GatherResultEnum.COMPLETED.getValue()); int opinionGatherCount = this.lawsOpinionGatherEOService.count(opinionGatherEOQueryWrapper); result.put("opinionGather",opinionGatherCount); //查询当前数据是否有法规技术评估流程数据 QueryWrapper evaluationEOQueryWrapper = new QueryWrapper<>(); evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getStandId,id); + evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus,GatherResultEnum.COMPLETED.getValue()); int evaluationCount = this.lawsTechnologyEvaluationEOService.count(evaluationEOQueryWrapper); result.put("technologyEvaluation",evaluationCount); return result; From ec8f64669c0454b731fe4100f58f768984898c45 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 11 Aug 2022 11:54:48 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= 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 | 3 +-- .../components/TermInformation.vue | 21 ++++++++++++++++++- .../components/standardDecompositionSheet.vue | 16 +++++++++----- .../components/evaluatorFeedbackList.vue | 14 ++++++++----- 5 files changed, 42 insertions(+), 14 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e31731ca3..24961f2ca 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1134,7 +1134,7 @@ module.exports = { feedbackEvaluation: 'Feedback Evaluation', clauseEvaluation: 'Clause Evaluation', standardDocuments: 'Standard Documents', - pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluation method or evaluator in the list', + pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluator in the list', reviewComments: 'Review comments', PleaseCompleteList: 'Please complete the compliance results in the list', sponsorFeedback: 'Sponsor feedback', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 413c5702b..1d7a7a212 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1139,7 +1139,6 @@ module.exports = { feedbackEvaluation: '反馈评估', clauseEvaluation: '条款评估', standardDocuments: '标准文件', - pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人', reviewComments: '审核意见', PleaseCompleteList: '请补全列表中符合性结果', sponsorFeedback: '发起人反馈', @@ -1240,7 +1239,7 @@ module.exports = { feedbackEvaluation: '反馈评估', clauseEvaluation: '条款评估', standardDocuments: '标准文件', - pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人', + pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估人', reviewComments: '审核意见', PleaseCompleteList: '请补全列表中符合性结果', sponsorFeedback: '发起人反馈', diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 9e8fec8bc..70f7cc514 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -169,7 +169,7 @@ dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',') } dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID - if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) { + if (!dataList[i].evaluatorIds) { this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator')) return } @@ -202,4 +202,23 @@ text-justify: inter-ideograph; word-break: break-all } + + ::v-deep .ant-select-tree-treenode-switcher-close { + width: 255px; + } + + ::v-deep .ant-select-tree-node-content-wrapper { + text-align: left; + float: right; + margin-top: -2px !important; + } + + ::v-deep .ant-select-tree-title { + width: 100%; + display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index 6394fc303..6d6ceec7a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -49,7 +49,7 @@ { - return value.itemId != res + this.selectedRowKeys = this.selectedRowKeys.filter(res => { + return !res.includes(value.itemId) }) - this.selectedRowKeysData = this.selectedRowKeysData.filter(res=>{ + this.selectedRowKeysData = this.selectedRowKeysData.filter(res => { return value.itemId != res.id }) } @@ -239,8 +239,14 @@ } }, onSelectChange(value, record) { + this.selectedRowKeysData = [] this.selectedRowKeys = value - this.selectedRowKeysData = record + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.selectedRowKeys.forEach(res => { + this.selectedRowKeysData.push(JSON.parse(res)) + }) + } + // this.selectedRowKeysData = record } } } diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 8bf9385c3..2f49be832 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -10,7 +10,7 @@ ref="table" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:500}" :data-source="dataSource" :columns="columns" > @@ -26,18 +26,21 @@ @@ -75,7 +78,8 @@ From 5803cc97d3376b4c32598c1b3047fae86423c8f6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 11 Aug 2022 14:01:57 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= 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 | 22 ++++++++++++------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 24961f2ca..01d833f72 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1256,4 +1256,5 @@ module.exports = { HaveReleased:'Have released', forward:'Forward', issuedBy:'Issued by', + pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard 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 1d7a7a212..e5c4705a5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1358,4 +1358,5 @@ module.exports = { HaveReleased:'已发布', forward:'转发', issuedBy:'发布人', + pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', } \ 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 70f7cc514..1ea9fa210 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -164,16 +164,22 @@ }, submitData(callback) { let dataList = JSON.parse(JSON.stringify(this.dataList)) - for (let i = 0; i < dataList.length; i++) { - if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) { - dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',') - } - dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID - if (!dataList[i].evaluatorIds) { - this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator')) - return + if (dataList && dataList.length > 0) { + for (let i = 0; i < dataList.length; i++) { + if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) { + dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',') + } + dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID + if (!dataList[i].evaluatorIds) { + this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator')) + return + } } + } else { + this.$message.warning(this.$t('pleaseDecompositionStandardOrder')) + return } + callback && callback(dataList) }, handleModule() { From 7713aa5e41eec6ded6085b619ce5fc665029f7eb Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 11 Aug 2022 14:10:09 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technologyAssessment/components/initiatingProcess.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index b6ec3e600..45bb0b312 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -100,7 +100,6 @@ @@ -115,7 +114,6 @@ From 1c7c779a7f2a7adb6e7ed3bbb2e970f6b7cb27d2 Mon Sep 17 00:00:00 2001 From: gaosong Date: Thu, 11 Aug 2022 14:32:25 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=8C=85=E5=90=AB=E6=B2=A1=E6=9C=89=E4=BC=A0?= =?UTF-8?q?=E5=9B=9E=E6=96=87=E6=A1=A3=E5=BA=93=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/split/controller/SarFileSplitInfoController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index d7cb9f67e..3c447ac77 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -66,6 +66,9 @@ public class SarFileSplitInfoController extends JeroController Date: Thu, 11 Aug 2022 14:38:24 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarFileCompareInfoController.java | 1 + .../impl/SarFileCompareInfoServiceImpl.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 93a4db427..2623a233d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -65,6 +65,7 @@ public class SarFileCompareInfoController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); queryWrapper.eq("create_by", sysUser.getUsername()).or().eq("release_state", ReleaseConditionEnum.PUBLISHED.getValue()); + queryWrapper.orderByAsc("create_by"); Page page = new Page<>(pageNo, pageSize); IPage pageList = sarFileCompareInfoService.page(page, queryWrapper); for (SarFileCompareInfo info : pageList.getRecords()) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index 732a8c6b1..f0d77ba71 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.compare.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.compare.entity.*; import com.jero.modules.compare.mapper.SarFileCompareInfoMapper; @@ -9,6 +10,7 @@ import com.jero.modules.compare.service.ISarFileCompareMenuService; import com.jero.modules.compare.utils.CompHanLPUtils; import com.jero.modules.compare.utils.CompareConst; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; @@ -44,6 +46,9 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(leftInfo.getSerialNumber()); + if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { + sarFileCompareInfo.setFileKeyLeft(bussDocumentLibraryEOList.get(0).get("id").toString()); + } sarFileCompareInfo.setFileNameLeft(leftInfo.getFileName()); sarFileCompareInfo.setTitleLeft(leftInfo.getTitle()); sarFileCompareInfo.setFileTypeLeft(leftInfo.getFileType()); sarFileCompareInfo.setSerialNumberLeft(leftInfo.getSerialNumber()); sarFileCompareInfo.setFileIdRight(rightInfo.getId()); + // 处理文档库id字段 根据编号和标题查询 + List> bussDocumentLibraryEOList1 = bussDocumentLibraryEOService.getListBySerialNumber(rightInfo.getSerialNumber()); + if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList1)) { + sarFileCompareInfo.setFileKeyRight(bussDocumentLibraryEOList1.get(0).get("id").toString()); + } sarFileCompareInfo.setFileKeyRight(rightInfo.getConnectId()); sarFileCompareInfo.setFileNameRight(rightInfo.getFileName()); sarFileCompareInfo.setFileTypeRight(rightInfo.getFileType()); From eb6bab453404b56abf01151bed0b79384fda15e6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 11 Aug 2022 15:26:21 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/ImportFile/index.vue | 4 ++-- .../components/initiatingProcess.vue | 9 ++++++++- .../components/standardDecompositionSheet.vue | 19 ++++++++++++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index 21d8893ef..43ea9932a 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -124,7 +124,7 @@ } else { eventBUs.$emit('searchReset') } - this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`) + this.$message.success(this.$t('OperationSuccessful')) } this.spinning = false } else { @@ -187,7 +187,7 @@ } this.spinning = false } else { - this.$message.error(`文件导入失败: ${info.file.msg} `) + this.$message.error(this.$t('operationFailed')) this.spinning = false } } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 45bb0b312..583c1df2a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -256,6 +256,7 @@ }, searchParmes: {}, selectedRowKeysRecord: [], + standardList: [], whetherDisplay: false, columns: [ { @@ -434,15 +435,21 @@ }, standardDecompositionDocumentClick() { if (this.standardDecomposition && this.standardDecomposition.length > 0) { - this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0]))) + this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])), this.standardList) } else { this.$message.warning(this.$t('pleaseSelectStandardFirst')) } }, standardDecompositionSheetForm(value) { + this.standardList = JSON.parse(JSON.stringify(value)) this.$refs.TermInformationRef.getData(JSON.parse(JSON.stringify(value))) }, TermInformationRefForm(value) { + if (value && value.itemId) { + this.standardList = this.standardList.filter(res => { + return value.itemId != res.id + }) + } this.$refs.standardDecompositionSheetRef.getRowList(JSON.parse(JSON.stringify(value))) }, clickButtonToUpload(item) { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index 6d6ceec7a..9b09465bb 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -150,7 +150,8 @@ fieldList: [], queryConditionVOList: [], info_id: '', - selectedRowKeysData: [] + selectedRowKeysData: [], + standardList: '' } }, methods: { @@ -160,7 +161,16 @@ standardDocumentsChange(value) { this.replacePage() }, - getData(row) { + getData(row, standardList) { + this.selectedRowKeys = [] + this.selectedRowKeysData = [] + this.standardList = JSON.parse(JSON.stringify(standardList)) + if (this.standardList && this.standardList.length > 0) { + this.standardList.forEach(val => { + this.selectedRowKeys.push(JSON.stringify(val)) + }) + this.selectedRowKeysData = this.standardList + } this.total = 0 this.dataList = [] this.standData = row @@ -169,6 +179,7 @@ this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : '' this.visible = true if (this.queryParam.info_id) { + this.pageNo = 1 this.replacePage() } }, @@ -232,15 +243,17 @@ }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$emit('standardDecompositionSheetForm', this.selectedRowKeysData) + this.$emit('standardDecompositionSheetForm', JSON.parse(JSON.stringify(this.selectedRowKeysData))) this.visible = false } else { this.$message.warning(this.$t('PleaseSelectData')) } }, onSelectChange(value, record) { + console.log(value) this.selectedRowKeysData = [] this.selectedRowKeys = value + console.log(this.selectedRowKeys) if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.selectedRowKeys.forEach(res => { this.selectedRowKeysData.push(JSON.parse(res)) From 5724ff4a237b9067a028a3e71d6e1eaee659abcb Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 11 Aug 2022 15:42:32 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 2 ++ .../processForm/evaluationProcess/index.vue | 2 ++ .../processList/tabComponents/processCenter/index.vue | 11 ++++------- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index c2042a3c1..929c4f38c 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -361,6 +361,8 @@ }) }, completeTask(value, taskId, isTrue) { + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + value.operatorTime = handlingTime Object.keys(value).forEach(res => { if (value[res] && value[res] instanceof String) { value[res] = value[res].replace(/\"/g, '“') diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index ac1f757f6..abf4e7853 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -308,6 +308,8 @@ }, completeTask() { let value = JSON.parse(JSON.stringify(this.queryProject)) + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + value.operatorTime = handlingTime Object.keys(value).forEach(res => { if (value[res] && value[res] instanceof String) { value[res] = value[res].replace(/\"/g, '“') diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index 8e318e4f8..52c578b8b 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -50,8 +50,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess'), - 6:this.$t('regulatoryTechnologyAssessmentProcess') + 5: this.$t('collectionOfRegulatoryOpinionsProcess'), + 6: this.$t('regulatoryTechnologyAssessmentProcess') }, columns: [ { @@ -92,13 +92,10 @@ }, { title: this.$t('createTime'), - dataIndex: 'createTime', + dataIndex: 'creatTime', align: 'center', width: 180, - ellipsis: true, - customRender: function(t, r, index) { - return moment(t).format('YYYY-MM-DD HH:mm:ss') - } + ellipsis: true }, { title: this.$t('cutoffTime'), From ed63a91585cf27009bd5cd88d95f54ba5fc26a2d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 11 Aug 2022 15:50:17 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/globalAdvancedQuery/index.vue | 3 +++ .../regulationReport/components/RegulationMonthlyFill.vue | 2 ++ .../processCenter/processForm/regulatoryProcess/index.vue | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 90a5dda09..5d0ad277d 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -712,4 +712,7 @@ /deep/ .ant-calendar-picker{ display: block; } + ::v-deep .ant-modal-body{ + overflow-y: visible!important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 04c9f615a..587a41d0c 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -109,12 +109,14 @@ title: this.$t('chapterContents'), align: 'center', dataIndex: 'memoriesChapterName', + ellipsis: true, width: 170 }, { title: this.$t('chineseTitle'), align: 'center', dataIndex: 'titleCn', + ellipsis: true, width: 170 }, { diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 604e429ce..b7e990823 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -89,7 +89,7 @@ { title: this.$t('taskDescription'), value: 'taskExplain', - type:4, + type: 4 } // { // title: this.$t('remarks'), @@ -121,7 +121,8 @@ lawsOpinionAssessmentResult() { getAction(this.url.list, { lawsOpinionGatherId: this.queryProject.id, - actiProcInstId: this.$route.query.prcId + actiProcInstId: this.$route.query.prcId, + createBy: this.userInfo().username }).then((res) => { if (res.success) { this.feedbackDataList = res.result || [] From 9f6367d4fe0c875161abce25ee0153d5dfc80e45 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 11 Aug 2022 16:22:48 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/commentList.vue | 11 +++++++++ .../components/comparisonResults.vue | 18 ++++++++------- .../components/documentDataComparison.vue | 23 ++++++++++--------- .../components/initiateComparison.vue | 18 ++++++++------- .../documentComparison/index.vue | 2 +- 5 files changed, 44 insertions(+), 28 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue index 00e59eb5d..8ca470ca2 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue @@ -122,6 +122,11 @@ required: true, message: this.$t('publishComment') + this.$t('cannotEmpty'), trigger: 'blur' + }, + { + max: 500, + message: this.$t('publishComment') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' } ], replyContent: [ @@ -129,6 +134,11 @@ required: true, message: this.$t('replyToComments') + this.$t('cannotEmpty'), trigger: 'blur' + }, + { + max: 500, + message: this.$t('replyToComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' } ] } @@ -286,6 +296,7 @@ display: inline-block; margin-top: 22px; margin-left: 40px; + word-break: break-word; } .title-text { diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index cc41ad401..fdcb3c505 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -28,10 +28,12 @@ style="margin-left: 20px;float: left">
{{$t('selectedStandard')}}：{{resultData.serialNumberLeft}} {{resultData.fileNameLeft}}
{{$t('selectedStandard')}}：{{resultData.serialNumberRight}} {{resultData.fileNameRight}}
@@ -87,8 +89,8 @@
-
- {{$t('fullTextComments')}}: {{resultData.comments}} +
+ {{$t('fullTextComments')}}: {{resultData.comments}}
@@ -307,8 +309,8 @@ this.rulesText = { comment: [ { - max: 300, - message: this.$t('fullTextComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 500, + message: this.$t('fullTextComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ] @@ -326,8 +328,8 @@ this.rulesText = { comment: [ { - max: 300, - message: this.$t('comparativeComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 500, + message: this.$t('comparativeComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ] @@ -572,6 +574,7 @@ font-size: 14px; font-weight: 400; color: #040B29; + word-break: break-word; } .detail-content-content-text-left-text { @@ -586,8 +589,7 @@ -webkit-box-orient: vertical; -webkit-line-clamp: 3; /*! autoprefixer: on;*/ - text-justify: inter-ideograph; - word-break: break-all + word-break: break-word; } .box-title-text-Remarks { diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 971c3c12e..dfe2eeb53 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -30,7 +30,7 @@
-
+
{{this.resultData.serialNumberLeft}}  {{this.resultData.fileNameLeft}}
@@ -56,14 +56,15 @@
- + {{this.resultData.serialNumberRight}}  {{this.resultData.fileNameRight}} - - - - + + + +
{{$t('standard')}}
- +
@@ -29,8 +29,8 @@
{{$t('title')}}
- +
@@ -84,8 +84,8 @@
{{$t('standard')}}
- +
@@ -93,8 +93,8 @@
{{$t('title')}}
- +
@@ -348,6 +348,7 @@ let query = { pageNo: this.pageNoLeft, pageSize: this.pageSizeLeft, + fileId:'1', ...queryParam } this.loadingLeft = true @@ -371,6 +372,7 @@ let query = { pageNo: this.pageNoRight, pageSize: this.pageSizeRight, + fileId:'1', ...queryParam } this.loadingRight = true diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index d147eefe1..974e48a5b 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -57,7 +57,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 280px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" From 2a686b6d5d9435c0efda718bde728abf0b8ade15 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 11 Aug 2022 16:29:00 +0800 Subject: [PATCH 11/11] bug 57240 --- .../jero/modules/oss/service/impl/OSSFileServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index a14d95991..6c249ec1e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -146,7 +146,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); } } } @@ -265,7 +265,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); } } } @@ -357,7 +357,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); } } }