From eb8f25832b90056f8db18314989beb81b7830626 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 30 Jun 2022 14:23:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=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 | 6 +- jero-web/src/common/lang/zh-cn.js | 4 + .../components/virtualListDetails.vue | 3 +- .../ProjectDetails/index.vue | 91 +++++++++++++++++-- .../components/ProjectDetails.vue | 8 +- .../components/listOfRegulations.vue | 88 ++++++++++-------- .../components/listOfRelevantPersonnel.vue | 18 ++-- 7 files changed, 162 insertions(+), 56 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 98bb069e4..c2ca4fa7a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -671,6 +671,10 @@ module.exports = { listConfirmation: 'List Confirmation', ListConfirmationDeadline: 'List confirmation deadline', dataConfirmation: 'Please select the data whose list confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', + pleaseSelectinitiatedOrRejected: 'Please select the data whose list confirmation status is not initiated or rejected', + TheEngineerAndCertification: 'The regulatory engineer and Certification Engineer of cannot be blank', + PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', + theProjectContactEmpty: 'The project contact person of cannot be empty', pleaseSelectPersonFirst: 'Please select a person first', onlyOnePersonCanBeSelected: 'Only one person can be selected', overrule: 'Overrule', @@ -939,6 +943,6 @@ module.exports = { question: 'Question', ConfirmQuestion: 'Confirm Question', disableInput: 'Disable input', - taskConfirmationDeadline:'Task Confirmation Deadline', + taskConfirmationDeadline: 'Task Confirmation Deadline', OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' } \ 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 0fda8e702..93aa4ba6f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -680,7 +680,11 @@ module.exports = { listConfirmation: '清单确认', ListConfirmationDeadline: '清单确认截止时间', dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', + pleaseSelectinitiatedOrRejected:'请选择清单确认状态为未发起或拒绝的数据', + TheEngineerAndCertification:'的法规工程师、认证工程师不能为空', taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空', + theProjectContactEmpty:'的工程接口人不能为空', + PleaseTaskConfirmationRejected:'请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据', pleaseSelectPersonFirst: '请先选择人员', onlyOnePersonCanBeSelected: '只能选择一个人员', overrule: '驳回', diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 59c687e9b..74828183e 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -320,8 +320,7 @@ align: 'center', dataIndex: 'subtitle', width: 180, - fixed: 'left', - scopedSlots: { customRender: 'titleName' } + ellipsis: true }, { title: this.$t('zoneOfApplication'), diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 3cbb6655b..4fc5ccbe2 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -27,7 +27,7 @@
-
+
- + {{$t('listOfRegulations')}}
- + {{$t('taskList')}}
- + {{$t('nonConformance')}}
- + {{$t('TaskParameterCollection')}}
+
-
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
\ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 2280ef7c8..d35c3e299 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -5,7 +5,8 @@ {{$t('basicInformationOfParameters')}}
- + {{$t('edit')}}
@@ -92,7 +93,8 @@ {{$t('regulatoryCertificationTaskPlan')}}
- {{$t('setting')}}
@@ -139,6 +141,7 @@ import currentStatusOfTheProjectEcharts from './currentStatusOfTheProjectEcharts' import deliverableStatusEchart from './deliverableStatusEchart' import certificationProgressEchart from './certificationProgressEchart' + import { mapGetters } from 'vuex' export default { name: 'ProjectDetails', @@ -171,6 +174,7 @@ this.getSetting() }, methods: { + ...mapGetters(['userInfo']), getForm() { getAction(this.url.queryById, { id: this.$route.query.id }).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 57b43456c..a03b59624 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -46,7 +46,9 @@
-
+
@@ -151,7 +153,7 @@ class="tableList" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 360px)'}" + :scroll="{x: '100%',y:'calc(100vh - 170px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -229,6 +231,7 @@ @ok="handleOk" @cancel="handleCancel" > + @@ -262,6 +265,7 @@ +
- * + {{$t('regulatoryEngineer')}}
- + +
- * + {{$t('engineeringInterfacePerson')}}
- + +
- * + {{$t('certifiedEngineer')}}
- + + @@ -325,6 +328,9 @@ editOk() { this.$refs.ruleForm.validate(valid => { if (valid) { + if (!this.formInline.certificationEngineer){ + this.formInline.certificationEngineer = '' + } this.confirmLoading = true putAction(this.url.edit, this.formInline).then((res) => { if (res.success) {