From 8f63c5a27b4b99ec8520441520f35f338f470d4e Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Sun, 9 Oct 2022 14:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluationResultsList.vue      |  2 +-
 .../collectionOfRegulatoryOpinions/index.vue  |  7 +++
 .../components/feedbackInformation.vue        | 45 ++++++++++---------
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index 1e8d605e3..85e38ad5a 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -209,7 +209,7 @@
           actiProcInstId: this.actiProcInstId
         }
         downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
-          this.$t('evaluationResults') + '.zip', query)
+          this.$route.query.serialNumber+ ' ' +this.$t('evaluationResults') + '.zip', query)
       },
       getData() {
         this.formInline = JSON.parse(JSON.stringify(this.$route.query))
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 42f004c5b..5ea7211b3 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -193,6 +193,13 @@
             ellipsis: true,
             dataIndex: 'gatherResultShow'
           },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            width: 140,
+            ellipsis: true,
+            dataIndex: 'createBy'
+          },
           {
             title: this.$t('dateOfInitiation'),
             align: 'center',
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 3b9722099..c86a652cb 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -31,25 +31,29 @@
                                    :rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
                                    {max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
                                     }]">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model="item.relatedSection"
-                           :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
+                  <a-textarea :placeholder="$t('PleaseEnter')+$t('relevantSections')"
+                              :disabled="disabled"
+                              v-model="item.relatedSection" :rows="4"/>
+<!--                  <a-input class="box-input"-->
+<!--                           :disabled="disabled"-->
+<!--                           v-model="item.relatedSection"-->
+<!--                           :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>-->
                 </a-form-model-item>
               </div>
             </a-col>
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                  <span class="title-text-text" :title="$t('clauseContent')">{{$t('clauseContent')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="accessoryFile">
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessoryFile',index)">
-                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
-                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                    }}
-                  </a-button>
+                <a-form-model-item class="itemModel"
+                                   :prop="'dataList.'+index+'.clauseContent'"
+                                   :rules="[
+                                     {max: 300,message: $t('clauseContent') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
+                  <a-textarea :placeholder="$t('PleaseEnter')+$t('clauseContent')"
+                              :disabled="disabled"
+                              v-model="item.clauseContent" :rows="4"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -95,16 +99,15 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="title-text-text" :title="$t('clauseContent')">{{$t('clauseContent')}}</span>
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
                 </div>
-                <a-form-model-item class="itemModel"
-                                   :prop="'dataList.'+index+'.clauseContent'"
-                                   :rules="[
-                                     {max: 300,message: $t('clauseContent') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
-                                    }]">
-                  <a-textarea :placeholder="$t('PleaseEnter')+$t('clauseContent')"
-                              :disabled="disabled"
-                              v-model="item.clauseContent" :rows="4"/>
+                <a-form-model-item class="itemModel" prop="accessoryFile">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
                 </a-form-model-item>
               </div>
             </a-col>