From cfd49b795e50386ece3988b20cac77a3bc8595a1 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 13 Jul 2022 11:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=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/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../views/businessSupport/technologyAssessment/index.vue | 6 +++--- jero-web/src/views/dashboard/components/myList.vue | 6 ++++++ .../processCenter/processForm/processDetails/index.vue | 2 +- .../processList/tabComponents/alreadyProcess/index.vue | 3 ++- .../processList/tabComponents/alreadySend/index.vue | 3 ++- .../processList/tabComponents/monitorProcess/index.vue | 3 ++- .../processList/tabComponents/processCenter/index.vue | 9 ++++++++- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d6a2427e1..1540cd94c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1124,4 +1124,5 @@ module.exports = { engineerFeedbackResults:'Engineer feedback results', fileExport:'File export', feedbackTime:'Feedback time', + regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment 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 182b67d00..77280c96f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1128,4 +1128,5 @@ module.exports = { engineerFeedbackResults:'工程师反馈结果', fileExport:'文件导出', feedbackTime:'反馈时间', + regulatoryTechnologyAssessmentProcess:'法规技术评估流程', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 936c45306..eb9627cd0 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -92,10 +92,10 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - - + + {{$t('viewProcess')}} - {{$t('evaluationResults')}} diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 3f1f4e533..637435a0d 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -100,6 +100,12 @@ query: row }) window.open(newUrl.href, '_blank') + }else if (row.prcType == '6') { + let newUrl = this.$router.resolve({ + path: '/evaluationProcess', + query: row + }) + window.open(newUrl.href, '_blank') } } } diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue index a013952f1..b249d372e 100644 --- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue +++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue @@ -13,7 +13,7 @@
- + diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue index cacd6f524..00d243eb9 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue @@ -51,7 +51,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess') + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') }, columns: [ { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue index a9f08e126..de39cef91 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue @@ -52,7 +52,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess') + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') }, columns: [ { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue index 848dcfc44..5df28512c 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue @@ -52,7 +52,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess') + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') }, columns: [ { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index ce1eaeec0..8e318e4f8 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -50,7 +50,8 @@ selectedRowKeys: [], prcTypeName: { 1: this.$t('taskConfirmationProcess'), - 5:this.$t('collectionOfRegulatoryOpinionsProcess') + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') }, columns: [ { @@ -168,6 +169,12 @@ query: row }) window.open(newUrl.href, '_blank') + } else if (row.prcType == '6') { + let newUrl = this.$router.resolve({ + path: '/evaluationProcess', + query: row + }) + window.open(newUrl.href, '_blank') } }, onChange(page, pageSize) {