diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 6f5301ea1..11bc4f74e 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1000,6 +1000,7 @@ module.exports = {
relevantSections: 'Relevant sections',
questionsSuggestions: 'Questions or Suggestions',
reason: 'Reason',
+ proposedTime:'Proposed time',
feedbackPoint: 'Feedback point',
link: 'Link',
planNoChinese: 'Plan No.',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 806725d92..8a9fe9351 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1005,12 +1005,13 @@ module.exports = {
relevantSections:'相关章节',
questionsSuggestions:'问题/建议',
link: '链接',
- reason:'附件',
+ reason:'理由',
planNoChinese:'计划号',
feedbackPoint:'反馈点',
standardNameCn:'标准名称中文',
standardNameEn:'标准名称英文',
deadlineForComments:'征求意见截止日期',
+ proposedTime:'提出时间',
standardNo:'标准编号',
implemenDate:'实施日期',
// 上报库
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
new file mode 100644
index 000000000..eb55411df
--- /dev/null
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+
+ 对外意见归档:
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 7383fa0f2..dba067edc 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -182,24 +182,18 @@
dataIndex: 'technology_territory'
},
{
- title: this.$t('vehicleInProductionDate'),
+ title: this.$t('correspondingStandard'),
align: 'center',
ellipsis: true,
- width: 210,
- dataIndex: 'implement_time'
+ width: 170,
+ dataIndex: 'technology_territory'
},
- {
- title: this.$t('ImplementationDate'),
- align: 'center',
- ellipsis: true,
- width: 210,
- dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
- }
]
}
},
mounted() {
document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
+ this.getList()
},
methods: {
pageOnChange(page) {
@@ -216,6 +210,9 @@
},
onSelectChange(value) {
this.selectedRowKeys = value
+ if (this.selectedRowKeys.length > 1) {
+ this.selectedRowKeys.unshift()
+ }
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 87e5a37e6..c74b36e03 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -27,7 +27,7 @@
{{$t('technicalField')}}
+ v-model="queryParam.technologyTerritory">
@@ -37,7 +37,7 @@
{{$t('collectResults')}}
+ v-model="queryParam.gatherResult">
@@ -89,12 +89,18 @@
/>
+