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] =?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 | 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 @@