Merge remote-tracking branch 'origin/feature_dev_20230109_BTTZ' into dev_2nd_20230213
# Conflicts: # jero-web/src/mixins/header.js # jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue # jero-web/src/views/documentManage/collection/index.vue # jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue # jero-web/src/views/projectManagement/components/customizeList.vue
This commit is contained in:
@@ -244,7 +244,7 @@
|
||||
class="customizetable"
|
||||
:loading="loading"
|
||||
:pagination="false"
|
||||
:scroll="{x: '100%',y:'calc(100vh - 356px)'}"
|
||||
:scroll="{x: '100%',y:'calc(100vh - 300px)'}"
|
||||
rowKey="id"
|
||||
:data-source="dataSource"
|
||||
@change="tableOnChange"
|
||||
@@ -813,7 +813,7 @@
|
||||
title: this.$t('operation'),
|
||||
align: 'left',
|
||||
fixed: 'right',
|
||||
width: 240,
|
||||
width: 200,
|
||||
scopedSlots: { customRender: 'operation' }
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user