Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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',

jero-web/src/common/lang/zh-cn.js

@@ -1022,6 +1022,7 @@ module.exports = {
   evaluationResults: '评估结果',
   Assessor:'评估人',
   collectionOfRegulatoryOpinions:'法规意见收集',
+  collectionOfRegulatoryOpinionsProcess:'法规意见收集流程',
   feedbackInformation:'反馈信息',
   relevantSections:'相关章节',
   questionsSuggestions:'问题/建议',

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
               })

jero-web/src/views/processCenter/components/feedbackInformation.vue

@@ -29,7 +29,7 @@
                 <a-form-model-item class="itemModel" prop="relevantSections">
                   <a-input class="box-input"
                            :disabled="false"
-                           v-model="formInline.relevantSections"
+                           v-model="formInline.relatedSection"
                            :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
                 </a-form-model-item>
               </div>
@@ -44,7 +44,7 @@
                 <a-form-model-item class="itemModel" prop="questionsSuggestions">
                   <a-input class="box-input"
                            :disabled="false"
-                           v-model="formInline.questionsSuggestions"
+                           v-model="formInline.issueOrSuggest"
                            :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
                 </a-form-model-item>
               </div>
@@ -69,11 +69,11 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="approvalFile">
+                <a-form-model-item class="itemModel" prop="accessoryFile">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('approvalFile')">
+                            @click="clickButtonToUpload('accessoryFile')">
-                    {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
+                    {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' ||
-                    formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -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]
       },

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: [
           {

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: [
           {

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: [
           {

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: [
           {