From 4877c3706d27f7180a3a68b04a1bed1690770d81 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 13 Jul 2022 17:33:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- .../components/initiatingProcess.vue | 9 +- .../components/evaluatorFeedback.vue | 91 ++++++++++++++----- .../processForm/evaluationProcess/index.vue | 77 ++++++++-------- 4 files changed, 116 insertions(+), 63 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 94de35b3b..4c2a26c01 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1134,5 +1134,5 @@ module.exports = { feedbackEvaluation:'反馈评估', clauseEvaluation:'条款评估', standardDocuments:'标准文件', - pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list', + pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 8d2c3dff6..662cbdcf2 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -410,8 +410,9 @@ this.formInline = { ...this.formInline } }, evaluationMethodsChange(key, name) { - this.formInline.evaluationMethods = [] - this.formInline.evaluationMethods = name + this.formInline.evaluationMethods = key + this.formInline.evaluationMethodsName = [] + this.formInline.evaluationMethodsName = name }, dateChange(item) { this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : '' @@ -431,7 +432,7 @@ if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) { this.$message.warning(this.$t('pleaseSelectStandard')) } else { - if (this.$refs.TermInformationRef) { + if (this.isTrue) { this.$refs.TermInformationRef.submitData((dataList) => { this.submitData(startTime, dataList) }) @@ -479,7 +480,7 @@ query = { type: 6, ...value, - msg: JSON.stringify({ evaluators: this.$refs.TermInformationRef.dataList }).replace(/\"/g, '\'') + msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'') } } postAction('/workFlow/startProcess', query).then((res) => { diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index a9b0fcefe..f69d75e3a 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -11,15 +11,19 @@
- * + * {{$t('complianceResults')}}
- - - +
+ {{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}} +
+ + + {{$t('accord')}} - + {{$t('nonConformity')}} @@ -32,21 +36,24 @@ {{$t('feedbackPoint')+(index+1)}}
- * + * {{$t('relevantSections')}}
- + {{item.relatedSection}} +
+
- * + * {{$t('problemDescription')}}
- + {{item.issueOrSuggest}} +
+ @@ -83,7 +93,15 @@
{{$t('enclosure')}}
- +
+ + {{$t('viewUploadedFiles')}} + + + -- + +
+ {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || @@ -98,17 +116,19 @@ + @@ -283,6 +321,17 @@ margin-bottom: 12px; } + .title-text-right { + display: inline-block; + width: calc(100% - 130px); + padding-top: 15px; + font-size: 14px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #000F16; + } + .Required { color: red; margin-right: 4px; diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 3f3f20893..69ff81f3d 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -13,13 +13,14 @@ :standardContentQuery="queryProject" /> @@ -47,6 +48,7 @@ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import moment from 'moment' import { mapGetters } from 'vuex' + export default { name: 'evaluationProcess', components: { @@ -62,12 +64,14 @@ title: this.$t('collectionOfRegulatoryOpinions'), url: { queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds', - list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list' + list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/queryEvaluationResultAndComplianceResult' }, loading: false, isDisplay: true, feedbackDataList: [], queryProject: {}, + complianceResult:{}, + isTrue: false, standardContentList: [ { title: this.$t('standard'), @@ -79,7 +83,7 @@ }, { title: this.$t('regulatoryEngineer'), - value: 'currentUserName' + value: 'regulationOwnerName' }, { title: this.$t('closingDate'), @@ -87,7 +91,7 @@ }, { title: this.$t('evaluationMethod'), - value: 'evaluationMethod', + value: 'evaluationMethodsName' }, { title: this.$t('RelevantMaterials'), @@ -98,44 +102,46 @@ title: this.$t('processBackground'), value: 'processBackground' } - // { - // title: this.$t('remarks'), - // value: 'remark' - // } ] } }, mounted() { this.isDisplay = false - this.queryTaskDetailByTask(() => { - this.lawsOpinionAssessmentResult() - }) + this.queryTaskDetailByTask() }, methods: { ...mapGetters(['userInfo']), - queryTaskDetailByTask(callback) { + queryTaskDetailByTask() { this.loading = true getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { if (res instanceof String) { this.queryProject = JSON.parse(res) || {} - callback && callback() } else { this.queryProject = res || {} - callback && callback() } - this.queryProject.evaluationTypeName = this.queryProject.evaluationType == 'Feedback evaluation' ? this.$t('feedbackEvaluation') :this.$t('clauseEvaluation') + this.isTrue = this.queryProject.evaluationType == 'Feedback evaluation' ? false : true + if (this.isTrue) { + this.standardContentList = this.standardContentList.filter(res => { + return res.title != this.$t('evaluationMethod') + }) + } else { + this.lawsOpinionAssessmentResult() + } }) }, lawsOpinionAssessmentResult() { getAction(this.url.list, { - lawsOpinionGatherId: this.queryProject.id, - actiProcInstId: this.$route.query.prcId + lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId, + actiProcInstId: this.$route.query.prcId, + createBy: this.userInfo().username }).then((res) => { if (res.success) { - this.feedbackDataList = res.result || [] + this.complianceResult = res.result.complianceResult || {} + this.feedbackDataList = res.result.evaluationResultEOList || [] this.loading = false } else { this.feedbackDataList = [] + this.complianceResult = {} this.loading = false } this.isDisplay = true @@ -143,21 +149,21 @@ }, preservation() { this.loading = true - let dataList = this.$refs.feedbackInformationRef.dataList - this.insertBatch(dataList, 1) - }, - insertBatch(list, num) { - list.forEach(res => { - res.lawsOpinionGatherId = this.queryProject.id - res.actiProcInstId = this.$route.query.prcId + this.$refs.evaluatorFeedbackRef.preservationData((res) => { + this.insertBatch(res, 1) }) - postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => { + }, + insertBatch(val, num) { + let query = { + actiProcInstId: this.$route.query.prcId, + lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId, + complianceResult: val.complianceResult, + evaluationResultList: val.dataList + } + postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/evaluatorSaveResult', query).then((res) => { if (res.success) { if (num == 1) { this.$message.success(this.$t('OperationSuccessful')) - this.$router.push({ - path: '/collectionOfRegulatoryOpinions' - }) this.loading = false } else { this.completeTask() @@ -171,9 +177,9 @@ }) }, submit() { - this.$refs.evaluatorFeedbackRef.submitData() - // let dataList = this.$refs.feedbackInformationRef.dataList - // this.insertBatch(dataList, 2) + this.$refs.evaluatorFeedbackRef.submitData((res) => { + this.insertBatch(res, 2) + }) }, completeTask() { let query = { @@ -183,13 +189,10 @@ } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { - // setTimeout(() => { - // window.close() - // }, 1000) this.$message.success(this.$t('OperationSuccessful')) this.loading = false this.$router.push({ - path: '/collectionOfRegulatoryOpinions' + path: '/technologyAssessment' }) } else { this.loading = false