Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period

# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue
This commit is contained in:
高嵩
2022-12-30 15:53:39 +08:00
129 changed files with 1418 additions and 765 deletions
@@ -100,19 +100,19 @@ export default {
// },
{
title: this.$t('Exporttype'),
align: 'center',
align: 'left',
dataIndex: 'exportType',
ellipsis: true
},
{
title: this.$t('Exporttime'),
align: 'center',
align: 'left',
dataIndex: 'exportTime',
ellipsis: true
},
{
title: this.$t('file'),
align: 'center',
align: 'left',
dataIndex: 'exportFileName',
scopedSlots: { customRender: 'file' },
ellipsis: true