From 59e828a166520849e544716e337b960924ab545e Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 14:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=82=B9?= 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/evaluationResultsList.vue | 48 ++++++++++++++++++- .../components/evaluationResultsClause.vue | 39 ++++++++++++--- .../components/evaluationResultsWhole.vue | 32 +++++++++++++ .../technologyAssessment/index.vue | 6 ++- 6 files changed, 117 insertions(+), 10 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 446ed7756..81110e8fe 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1315,4 +1315,5 @@ module.exports = { consistentAssessment:'Consistent assessment', viewConsistentAssessment:'View Consistent Assessment', viewAll:'View All', + endProcess:'End Process', } \ 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 c587adabc..915e962fd 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1416,4 +1416,5 @@ module.exports = { consistentAssessment:'一致评估', viewConsistentAssessment:'查看一致评估', viewAll:'查看全部', + endProcess:'结束流程', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index e559e1e27..1e8d605e3 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -8,6 +8,14 @@ {{$route.query.serialNumber +' '+$t('evaluationResults')}} +
+
+ + {{$t('endProcess')}} +
+
@@ -70,6 +78,7 @@ import viewFileModel from '@/components/viewFileModel/index' import { getAction, putAction, downloadFile } from '@/api/manage' import { mapGetters } from 'vuex' + import { postAction } from '../../../../api/manage' export default { name: 'evaluationResultsList', @@ -85,6 +94,7 @@ pageNo: 1, dataSource: [], formInline: {}, + administrators:false, userInfoQuery: {}, columns: [ { @@ -143,6 +153,14 @@ mounted() { this.userInfoQuery = this.userInfo() this.getData() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), @@ -232,6 +250,20 @@ }, seeFileClick(item) { this.$refs.viewFileModelRef.clickButtonToUpload(item) + }, + endProcessClick() { + let query = { + ids: this.$route.query.id + } + postAction('/lawsOpinionGather/lawsOpinionGatherEO/batchCompleteTask', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.pageNo = 1 + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) } } } @@ -239,6 +271,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 900365c82..02b4003c7 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -10,19 +10,26 @@
- + {{$t('initiateSupplementaryProcess')}}
+
+ + {{$t('endProcess')}} +
- - - - - + + + + +
{{$t('processBackground')}}: {{$route.query.processBackground}} @@ -122,6 +129,7 @@ import PersonnelSelection from '@/components/PersonnelSelection/index' import { getAction, postAction, downloadFile } from '@/api/manage' import viewFileModel from '@/components/viewFileModel/index' + import { mapGetters } from 'vuex' export default { name: 'evaluationResultsClause', @@ -228,14 +236,30 @@ ellipsis: true, width: 160 } - ] + ], + userInfoQuery: {} } }, mounted() { document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') + this.userInfoQuery = this.userInfo() this.getList() }, methods: { + ...mapGetters(['userInfo']), + endProcessClick() { + let query = { + ids: this.$route.query.id + } + postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/batchCompleteTask', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, CurrentStandard() { let query = { firstInitiation: '2', @@ -439,6 +463,7 @@ ::v-deep .ant-table-body { background: transparent !important; } + .operator-text-text { cursor: pointer; margin-right: 23px; diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index 3756367b3..220707ec5 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -13,6 +13,13 @@ {{$t('initiateSupplementaryProcess')}}
+
+ + {{$t('endProcess')}} +
@@ -77,6 +84,7 @@ import PersonnelSelection from '@/components/PersonnelSelection/index' import { getAction, postAction, downloadFile } from '@/api/manage' import viewFileModel from '@/components/viewFileModel/index' + import { mapGetters } from 'vuex' export default { name: 'evaluationResultsWhole', @@ -88,6 +96,7 @@ return { queryParam: {}, dataSource: [], + administrators:false, url: { list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list', exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip' @@ -121,10 +130,33 @@ } }, mounted() { + this.userInfoQuery = this.userInfo() document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') this.getList() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { + ...mapGetters(['userInfo']), + endProcessClick() { + let query = { + ids: this.$route.query.id + } + postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/batchCompleteTask', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, CurrentStandard() { let query = { firstInitiation: '2', diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 36d555566..b10acce8b 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -463,7 +463,8 @@ serialNumber: row.serialNumber, lawsTechnologyEvaluationId: row.id, standId: row.standId, - remark: row.remark + remark: row.remark, + createBy:row.createBy } }) window.open(newUrl.href, '_blank') @@ -476,7 +477,8 @@ serialNumber: row.serialNumber, lawsTechnologyEvaluationId: row.id, standId: row.standId, - remark: row.remark + remark: row.remark, + createBy:row.createBy } }) window.open(newUrl.href, '_blank')