From 3cc1253bbafc2e729516ec243e98a1831e76acf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 15 Dec 2023 16:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/NcrTrackServiceImpl.java | 7 + jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../experienceReferenceList/index.vue | 147 ++++++++++++++++++ .../components/flowstatusdetial.vue | 19 ++- .../moudles/detilModel.vue | 1 + .../projectStatusBoard/index.vue | 6 + .../components/designCompliance.vue | 11 +- 8 files changed, 184 insertions(+), 9 deletions(-) create mode 100644 jero-web/src/components/experienceReferenceList/index.vue diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 86b1bc1dc..296b6581b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -731,6 +731,9 @@ public class NcrTrackServiceImpl extends ServiceImpl problemManagementEO.setProjectName(StringUtils.join(projectNameList,",")); } } + if(StringUtils.isEmpty(problemManagementEO.getProjectName()) && StringUtils.isNotEmpty(problemManagementEO.getProjectId())){ + problemManagementEO.setProjectName(problemManagementEO.getProjectId()); + } //相关文件连接 if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){ @@ -908,6 +911,10 @@ public class NcrTrackServiceImpl extends ServiceImpl problemManagementEO.setProjectName(StringUtils.join(projectNameList,",")); } } + if(StringUtils.isEmpty(problemManagementEO.getProjectName()) && StringUtils.isNotEmpty(problemManagementEO.getProjectId())){ + problemManagementEO.setProjectName(problemManagementEO.getProjectId()); + } + //相关文件连接 if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){ diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 56b4c3010..c07f2063a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -2035,4 +2035,5 @@ module.exports = { interfacePerson: 'Eng. Interface', regulationEngineerInitiateProcess: 'Regulation Engineer Initiate Process', parameterCollectionDescription:'In the extension parameter collection list, the data highlighted in red represents the deleted parameters after template update, the data highlighted in yellow represents the changed parameters after template update, and for the newly added parameters after template update, homo engineer should find in "More-Add" and add them to the parameter collection list.', + experienceReference:'Experience reference', } \ 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 cd277cc2b..eb71f41de 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3769,4 +3769,5 @@ module.exports = { interfacePerson:'接口人', regulationEngineerInitiateProcess:'法规工程师发起流程', parameterCollectionDescription:'变更扩展参数收集清单中，标红数据为模板更新后被删除参数，标黄数据为模板更新后变更参数，模板更新新增参数请认证工程师在“更多-添加”中查阅并添加至参数收集清单中。', + experienceReference:'经验参考', } \ No newline at end of file diff --git a/jero-web/src/components/experienceReferenceList/index.vue b/jero-web/src/components/experienceReferenceList/index.vue new file mode 100644 index 000000000..66e441627 --- /dev/null +++ b/jero-web/src/components/experienceReferenceList/index.vue @@ -0,0 +1,147 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue index 366871a62..d6bde4594 100644 --- a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue +++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue @@ -48,7 +48,8 @@ -
+ +
- + {{flag == 'design'?record.designFlowStatusName : record.verifyFlowStatusName}} @@ -198,12 +200,14 @@ import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance' import { mapGetters } from 'vuex' + import experienceReferenceList from '@/components/experienceReferenceList/index' export default { name: 'addModel', components: { uploadFile, - designCompliance + designCompliance, + experienceReferenceList }, mixins: [ResizeHeader, ResizeColumnProvide], data() { @@ -281,7 +285,7 @@ ellipsis: true, width: 120, scopedSlots: { customRender: 'ProcessStatus' } - }, + } ], loading: false, visible: false, @@ -320,6 +324,9 @@ this.flag = name == this.$t('designComplianceProcess') ? 'design' : 'verify' this.visible = true this.confirmLoading = true + this.$nextTick(() => { + this.$refs.experienceReferenceListRef.getData(row.serialNumber) + }) getAction('/project/projectLawsInventoryEO/queryPlatformList', { lawsInventoryId: row.id, flowFlag: this.flag @@ -350,7 +357,7 @@ down(id, name) { downloadFile('/sys/common/downLoadFile', name, { id: id }) }, - processStatusClick(row, name){ + processStatusClick(row, name) { let query = {} let TaskKey = '' if (name == this.$t('designComplianceProcess')) { @@ -411,7 +418,7 @@ } } this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name) - }, + } } } diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 5ccaad0e6..82aef2931 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -588,6 +588,7 @@ } .itemModel-text-box { + width: 100%; white-space: pre-wrap; height: 200px; display: inline-block; diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index d4d1345ad..67e121cec 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -121,6 +121,9 @@ +
-
@@ -76,6 +76,7 @@ import reviewedByThePersonInCharge from './reviewedByThePersonInCharge' import circulationHistory from './circulationHistory' import referenceDeliverablesList from './referenceDeliverablesList' + import experienceReferenceList from '@/components/experienceReferenceList/index' import { getAction, postAction, deleteAction, downloadFile, putAction } from '@/api/manage' import { mapGetters } from 'vuex' @@ -88,7 +89,8 @@ reviewedByThePersonInCharge, footerProcess, circulationHistory, - referenceDeliverablesList + referenceDeliverablesList, + experienceReferenceList }, data() { return { @@ -295,9 +297,12 @@ getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => { if (res.success) { this.queryProject = res.result[0] || {} - if(this.queryData.platform){ + if (this.queryData.platform) { this.queryProject.platform = this.queryData.platform } + this.$nextTick(() => { + this.$refs.experienceReferenceListRef.getData(this.queryProject.serialNumber) + }) // if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') { // this.queryProject.endTime = this.queryData.endTime // }