diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index ebd5a051d..276fdf7a4 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1013,6 +1013,7 @@ module.exports = {
evaluationResults: 'Evaluation results',
Assessor: 'Assessor',
collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
+ collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
feedbackInformation: 'Feedback Information',
relevantSections: 'Relevant sections',
questionsSuggestions: 'Questions or Suggestions',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index fa467d5f5..2dc448ef7 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1022,6 +1022,7 @@ module.exports = {
evaluationResults: '评估结果',
Assessor:'评估人',
collectionOfRegulatoryOpinions:'法规意见收集',
+ collectionOfRegulatoryOpinionsProcess:'法规意见收集流程',
feedbackInformation:'反馈信息',
relevantSections:'相关章节',
questionsSuggestions:'问题/建议',
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
index 725066153..2258f7fb4 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -237,7 +237,7 @@
}
})
let query = Object.assign(val, {
- month: formInline.month,
+ month: JSON.stringify(formInline.month),
memoriesChapter: formInline.memoriesChapter,
contentTemplate: formInline.contentTemplate
})
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 959ff4f07..5e82f8b97 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -29,7 +29,7 @@
@@ -44,7 +44,7 @@
@@ -69,11 +69,11 @@
{{$t('enclosure')}}
-
+
- {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
- formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ @click="clickButtonToUpload('accessoryFile')">
+ {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' ||
+ formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
@@ -105,7 +105,14 @@
return {
formInline: {},
rules: {},
- dataList: [{ id: 1 }]
+ dataList: [
+ {
+ relatedSection: '',
+ issueOrSuggest: '',
+ reason: '',
+ accessoryFile: ''
+ }
+ ]
}
},
methods: {
@@ -135,7 +142,10 @@
},
addData() {
this.dataList.push({
- id: 2
+ relatedSection: '',
+ issueOrSuggest: '',
+ reason: '',
+ accessoryFile: ''
})
this.dataList = [...this.dataList]
},
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 1cbc5affe..f50da247c 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
@@ -50,7 +50,8 @@
pageSize: 10,
selectedRowKeys: [],
prcTypeName: {
- 1: this.$t('taskConfirmationProcess')
+ 1: this.$t('taskConfirmationProcess'),
+ 5:this.$t('collectionOfRegulatoryOpinionsProcess')
},
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 b3904cdd1..28eab32a9 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
@@ -51,7 +51,8 @@
pageSize: 10,
selectedRowKeys: [],
prcTypeName: {
- 1: this.$t('taskConfirmationProcess')
+ 1: this.$t('taskConfirmationProcess'),
+ 5:this.$t('collectionOfRegulatoryOpinionsProcess')
},
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 9834b57db..47221a072 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
@@ -51,7 +51,8 @@
pageSize: 10,
selectedRowKeys: [],
prcTypeName: {
- 1: this.$t('taskConfirmationProcess')
+ 1: this.$t('taskConfirmationProcess'),
+ 5:this.$t('collectionOfRegulatoryOpinionsProcess')
},
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 0cf614453..e3981099f 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -49,7 +49,8 @@
pageSize: 10,
selectedRowKeys: [],
prcTypeName: {
- 1: this.$t('taskConfirmationProcess')
+ 1: this.$t('taskConfirmationProcess'),
+ 5:this.$t('collectionOfRegulatoryOpinionsProcess')
},
columns: [
{