From 6c52d89cec7a1810e074a3c42963606b3a36df9c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 11 Aug 2022 11:49:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= 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/components/OcrTable/DocTable.vue | 16 ++++++------- .../regulationsKanban/components/addModel.vue | 23 +++++++++++++++---- .../src/views/regulationsKanban/index.vue | 8 ++++--- 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 858bfb1d5..e31731ca3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -355,7 +355,7 @@ module.exports = { templateDownload: 'Download Template', textInformation: 'Document Files', relatedInformation: 'Relevant Information', - RetrieveFiles: 'Retrieve Library File', + RetrieveFiles: 'Select Stored File', SplitText: 'Split Library File', ImportResults: 'Import Split Results', copy: 'Copy', @@ -589,7 +589,7 @@ module.exports = { withdraw: 'Withdraw', maintenanceList: 'Maintain', instructionForUse: 'Instruction', - subtitle: 'Sub-Title', + subtitle: 'Sub-title', scopeOfApplication: 'Scope', correspondingStandard: 'Compare EU/CN', implementationCategory: 'Usage', diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue index f58b83b24..0d0fa270d 100644 --- a/jero-web/src/components/OcrTable/DocTable.vue +++ b/jero-web/src/components/OcrTable/DocTable.vue @@ -150,14 +150,14 @@ if (res.success) { var jsonHead = res.result this.columns = [] - this.columns.push( - { - title: this.$t('serialNumber'), - dataIndex: 'index', - key: 'index', - align: 'center', - customRender: (text, record, index) => `${index + 1}` - }) + // this.columns.push( + // { + // title: this.$t('serialNumber'), + // dataIndex: 'index', + // key: 'index', + // align: 'center', + // customRender: (text, record, index) => `${index + 1}` + // }) jsonHead.forEach((res, index) => { this.columns.push({ title: res.db_field_txt, diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 67d93b664..56b430397 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -12,10 +12,16 @@ - + + + {{element.text}} + + + + + + @@ -99,6 +105,7 @@ export default { loading: false, editId: '', RelatedItemList:[], + dutyTerritory:[], columns: [ { title: this.$t('areaOfResponsibility'), @@ -180,6 +187,7 @@ export default { mounted() { this.loadData() this.getRelatedItemList() + this.getdutyTerritory() }, methods: { getRelatedItemList(){ @@ -207,6 +215,13 @@ export default { } }) }, + getdutyTerritory(){ + getAction('sys/dict/getDictItems/duty_territory', { }).then((res) => { + if (res.success) { + this.dutyTerritory = res.result + } + }) + }, // 法规技术评估列表 handletechnical(){ diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 61e782c7b..27c048950 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -83,9 +83,9 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - + - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + {{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }} @@ -183,7 +183,9 @@ export default { { title: this.$t('technicalField'), align: 'center', - dataIndex: 'technologyTerritory_dicText' + dataIndex: 'technologyTerritory_dicText', + width: 350, + scopedSlots: { customRender: 'technicalField' } }, { title: this.$t('RegulatoryProcessEvaluationResults'), From 505bc286f3ed586619449e4cce828eb26316b291 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 11 Aug 2022 11:53:58 +0800 Subject: [PATCH 2/5] =?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 3/5] =?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 4/5] =?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 5/5] =?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 @@