From 8b7fe7d5333f729c840a6a39054eb2e1ed0ad260 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 17:10:53 +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 | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/engineeringConfirmation.vue | 12 +++---- .../components/taskCirculationHistory.vue | 4 --- .../processForm/taskListProcess/index.vue | 32 ++++++++++--------- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1999a53a6..89ee54133 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -865,4 +865,5 @@ module.exports = { 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', + pleaseSubmitStatus:'Please submit the data confirmed by the project in the confirmation status', } \ 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 70210ba58..42e45223d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -870,4 +870,5 @@ module.exports = { pleaseConfirmationResults:'请根据工程确认结果选择符合性状态', pleaseReviewTask:'请您添加对该条审查任务的工程确认信息', pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回', + pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交', } \ 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 3ef9448ae..cc42503a8 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -49,13 +49,12 @@ {{$t('edit')}} @@ -66,13 +65,12 @@ {{$t('answer')}} {{$t('deleteLib')}} @@ -434,7 +432,7 @@ { title: this.$t('operation'), align: 'left', - width: 300, + width: 160, scopedSlots: { customRender: 'operation' } } ], diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index ad4dd00b0..853cd401e 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -46,26 +46,22 @@ title: this.$t('operationNode'), dataIndex: 'name', align: 'left', - width:'20%', }, { title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', - width:'20%', }, { title: this.$t('result'), dataIndex: 'reviewResult', align: 'left', - width:'20%', scopedSlots: { customRender: 'reviewResult' } }, { title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'left', - width:'20%', }, { title: this.$t('operationTime'), diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index e979d8ff1..623e1bf9b 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -260,21 +260,23 @@ if (this.$route.query.TaskKey == 'dreDispose') { this.dreSubmit(res) } else { - // let dataSource = this.$refs.engineeringConfirmationRef.dataSource - // let isTrue - // for (let i = 0; i < dataSource.length; i++) { - // if (dataSource[i].status == 'status' || !dataSource[i].status) { - // isTrue = true - // } else { - // isTrue = false - // this.$message.warning('') - // return - // } - // } - // if (isTrue) { - // - // } - this.completeTask(res) + if (this.$route.query.TaskKey == 'zrrclrw') { + let dataSource = this.$refs.engineeringConfirmationRef.dataSource + let isTrue + for (let i = 0; i < dataSource.length; i++) { + if (dataSource[i].status == 'haveDone' || !dataSource[i].status) { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.$t('pleaseSubmitStatus')) + this.loading = false + return + } + } + if (isTrue) { + this.completeTask(res) + } + } } }) },