对接法规月报

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -97,14 +97,23 @@
           {
             title: this.$t('RegulationMonthlyName'),
             align: 'center',
-            dataIndex: 'RegulationMonthlyName',
+            dataIndex: 'name',
-            width: 170
+            width: 190,
+            ellipsis: true
           },
           {
             title: this.$t('monthlyLanguage'),
             align: 'center',
-            dataIndex: 'monthlyLanguage',
+            dataIndex: 'language',
-            width: 170
+            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'),

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