From 7f5d22fc142cee1c82d4b3384767f0963c67c582 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 29 Jun 2022 13:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=9C=88?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RegulationMonthlyManagement.vue           | 21 +++++++++++++------
 .../components/modules/managementAdd.vue      |  8 +++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index a779d23fd..7922b2bbf 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -97,14 +97,23 @@
           {
             title: this.$t('RegulationMonthlyName'),
             align: 'center',
-            dataIndex: 'RegulationMonthlyName',
-            width: 170
+            dataIndex: 'name',
+            width: 190,
+            ellipsis: true
           },
           {
             title: this.$t('monthlyLanguage'),
             align: 'center',
-            dataIndex: 'monthlyLanguage',
-            width: 170
+            dataIndex: 'language',
+            width: 170,
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              if (t == 1) {
+                return this.$t('chinese')
+              } else {
+                return this.$t('English')
+              }
+            }
           },
           {
             title: this.$t('releaseStatus'),
@@ -118,14 +127,14 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'uploadTime'
+            dataIndex: 'createTime'
           },
           {
             title: this.$t('uploadedBy'),
             align: 'center',
             ellipsis: true,
             width: 170,
-            dataIndex: 'uploadedBy'
+            dataIndex: 'createBy'
           },
           {
             title: this.$t('operation'),
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
index d320e53b8..9fb30c097 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
@@ -35,7 +35,7 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('monthlyLanguage')">{{$t('monthlyLanguage')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="useExplain">
+                <a-form-model-item class="itemModel" prop="language">
                   <a-select :placeholder="$t('PleaseSelect')+$t('monthlyLanguage')"
                             :disabled="disabled"
                             class="box-input"
@@ -153,14 +153,18 @@
       /** 上传文件的回调 */
       uploadSuccess(data) {
         let attIdList = []
+        let attNameList = []
         if (data && data.length > 0) {
           data.map(item => {
             attIdList.push(item.id || data.name)
+            attNameList.push(item.fileName)
           })
         }
         /** 赋值给当前对应的表单文件 */
-        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline[this.uploadName] = attNameList.join(',')
+        this.formInline['fileId'] = attIdList.join(',')
         this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.clearValidate(['name'])
       }
     }
   }