From f5b32c89ddb9ab85d7d6678c2070e02b7b080f85 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 15:39:15 +0800 Subject: [PATCH] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 +++ jero-web/src/common/lang/zh-cn.js | 7 +++++-- .../components/engineeringConfirmation.vue | 7 +++---- .../reviewedByThePersonInCharge.vue | 21 ++++++++++++------- .../projectManagement/components/TaskList.vue | 9 +++++--- .../projectManagement/components/addModel.vue | 1 + 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5ed1d3e16..1999a53a6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -862,4 +862,7 @@ module.exports = { fillInProjectDelivery:'Fill in project delivery', Resubmit:'Resubmit', Quantity:'Quantity', + pleaseConfirmationResults:'Please select the compliance status according to the engineering confirmation results', + pleaseReviewTask:'Please add the engineering confirmation information for this review task', + pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned', } \ 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 8c06b73b6..70210ba58 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -596,11 +596,11 @@ module.exports = { certificationType: '认证类型', certificationLevel: '认证级别', areaOfResponsibility: '责任领域', - confirmationOfDesignConformity: '设计符合性确认', + confirmationOfDesignConformity: '法规设计符合性确认', Deliverables: '交付物', personLiable: '责任人', PrehomoConfirmation: 'Pre-Homo确认', - verificationAndConformityconfirmation: '验证符合性确认', + verificationAndConformityconfirmation: '法规验证符合性确认', StandardImplementationDate: '标准实施日期', regulatoryEngineer: '法规工程师', certifiedEngineer: '认证工程师', @@ -867,4 +867,7 @@ module.exports = { fillInProjectDelivery:'填写工程交付', Resubmit:'重新提交', Quantity:'数量', + pleaseConfirmationResults:'请根据工程确认结果选择符合性状态', + pleaseReviewTask:'请您添加对该条审查任务的工程确认信息', + pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 896903852..cedee04b1 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -3,6 +3,8 @@
{{$t('engineeringConfirmation')}} +
@@ -394,11 +396,8 @@ columnsAll: [ { title: 'ID', - dataIndex: 'index', - key: 'index', + dataIndex: 'serialNumber', align: 'left', - width: 140, - customRender: (text, record, index) => `${index + 1}` }, { title: this.$t('completedBy'), diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 1631f0d12..550e59ad7 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -4,6 +4,9 @@
{{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh' ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}} +
@@ -125,18 +128,20 @@ - {{formInline.approvalOpinion}} + {{formInline.PersonChargeFeedback}} -
+
{{$t('sponsorReview')}} +
- +
@@ -221,7 +226,7 @@ this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') { this.formInline.reviewResult = this.queryBy.reviewResult || undefined - this.formInline.approvalOpinion = this.queryBy.approvalOpinion + this.formInline.PersonChargeFeedback = this.$route.query.PersonChargeFeedback this.formInline = { ...this.formInline } } if (this.queryPersonInCharge && this.$route.query.TaskKey == 'dreDispose') { @@ -231,9 +236,11 @@ this.formInline = { ...this.formInline } } if (this.queryBy && this.$route.query.TaskKey == 'zrrclrw') { - this.formInline.reviewResult = this.queryBy.reviewResult || undefined - this.formInline.approvalOpinion = this.queryBy.approvalOpinion - this.formInline = { ...this.formInline } + if (!this.$route.query.isDisplay) { + this.formInline.reviewResult = this.queryBy.reviewResult || undefined + this.formInline.approvalOpinion = this.$route.query.PersonChargeFeedback + this.formInline = { ...this.formInline } + } } }, methods: { diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 848f92710..d7a46d05a 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -296,7 +296,8 @@ remarks: 'designRemark', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.designTaskDetailId + primaryKeyId: val.designTaskDetailId, + PersonChargeFeedback:val.designPersonChargeFeedback, } break case 2: @@ -319,7 +320,8 @@ remarks: 'prehomoRemark', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.prehomoTaskDetailId + primaryKeyId: val.prehomoTaskDetailId, + PersonChargeFeedback:val.prehomoPersonChargeFeedback, } break case 3: @@ -342,7 +344,8 @@ remarks: 'verifyRemark', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.verifyTaskDetailId + primaryKeyId: val.verifyTaskDetailId, + PersonChargeFeedback:val.verifyPersonChargeFeedback, } break } diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index cd17a6816..edeb32d39 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -286,6 +286,7 @@ this.visible = true this.title = this.$t('add') this.formInline = {} + this.getNameList() this.formInline.studioEngineerName = this.userInfo().username this.formInline.studioEngineer = this.userInfo().id this.$nextTick(() => {