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 @@
*
{{$t('monthlyLanguage')}}
-
+
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'])
}
}
}