From 2dbced2f2a0c1652d4658df0aa4a9c6570aeb85f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 23 Jun 2022 10:51:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=B3=95=E8=A7=84=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 8 + jero-web/src/common/lang/zh-cn.js | 8 + jero-web/src/components/layouts/TabLayout.vue | 2 + jero-web/src/config/router.config.js | 10 + .../components/initiatingProcess.vue | 335 ++++++++++++++++++ .../collectionOfRegulatoryOpinions/index.vue | 253 +++++++++++++ .../processForm/regulatoryProcess/index.vue | 31 ++ .../views/regulatoryEarlyWarning/index.vue | 11 +- 8 files changed, 654 insertions(+), 4 deletions(-) create mode 100644 jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue create mode 100644 jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue create mode 100644 jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 726752690..aa0dd1ad9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -985,6 +985,14 @@ module.exports = { primaryCoverageEn:'Primary coverage (En)', workProgressCn:'NIO Work progress (Cn)', workProgressEn:'NIO Work progress (En)', + initiatingProcess:'Initiating Process', + collectResults:'Collect results', + dateOfInitiation:'Date of initiation', + closingDate:'Closing date', + viewProcess:'View process', + evaluationResults:'Evaluation results', + Assessor:'Assessor', + collectionOfRegulatoryOpinions:'Collection Of Regulatory Opinions', link:'Link', // 上报库 Enable: 'Enable', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 324304fe9..3ae3dfc47 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -990,6 +990,14 @@ module.exports = { primaryCoverageEn: '主要内容(英文)', workProgressCn: 'NIO工作进展(中文)', workProgressEn: 'NIO工作进展(英文)', + initiatingProcess: '发起流程', + collectResults: '收集结果', + dateOfInitiation: '发起日期', + closingDate: '截止日期', + viewProcess: '查看流程', + evaluationResults: '评估结果', + Assessor:'评估人', + collectionOfRegulatoryOpinions:'法规意见收集', link: '链接', // 上报库 Enable: '启用', diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index e2b49847b..bd131a3ca 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -92,6 +92,8 @@ this.$route.path == '/virtualListDetails' || this.$route.path == '/taskListProcess' || this.$route.path == '/ProjectDetails' || + this.$route.path == '/regulatoryInitiatingProcess' || + this.$route.path == '/regulatoryProcessReview' || this.$route.path == '/handshakeProcess' || this.$route.path == '/projectStatusAndProgress' || this.$route.path == '/TaskPlanList' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 07c804f03..c00cf28f2 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -337,6 +337,11 @@ export const constantRouterMap = [ name: 'ProjectDetails', component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index') }, + { + path: '/regulatoryInitiatingProcess', + name: 'initiatingProcess', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess') + }, // { // path: '/ParameterItemCollection', // name: 'ParameterItemCollection', @@ -357,6 +362,11 @@ export const constantRouterMap = [ name: 'handshakeProcess', component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/handshakeProcess/index') }, + { + path: '/regulatoryProcessReview', + name: 'regulatoryProcessReview', + component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/regulatoryProcess/index') + }, { path: '/historicalVersion', name: 'historicalVersion', diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue new file mode 100644 index 000000000..7383fa0f2 --- /dev/null +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + * + {{$t('closingDate')}} + + + + + + + + + + * + {{$t('Assessor')}} + + + + + + + + + + + + {{$t('taskDescription')}} + + + + + + + + + + + + {{$t('enclosure')}} + + + + {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' || + formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue new file mode 100644 index 000000000..87e5a37e6 --- /dev/null +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -0,0 +1,253 @@ + + + + + + + + + {{$t('standard')}} + + + + + + + + {{$t('title')}} + + + + + + + + {{$t('technicalField')}} + + + + + + + + + {{$t('collectResults')}} + + + + + + + + {{$t('query')}} + {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + + + + + + + + + {{$t('initiatingProcess')}} + + + + + + {{$t('viewProcess')}} + {{$t('evaluationResults')}} + + + + + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue new file mode 100644 index 000000000..1fa3f63df --- /dev/null +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 541712e30..51f3a47b0 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -195,11 +195,14 @@ clearSelected() { }, - pageOnChange() { - + pageOnChange(page) { + this.pageNo = page + this.getList() }, - SizeChange() { - + SizeChange(pageSize) { + this.pageNo = 1 + this.pageSize = pageSize + this.getList() }, getList() {