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:
高嵩
2023-02-13 09:51:53 +08:00
120 changed files with 1852 additions and 950 deletions
@@ -70,6 +70,7 @@
<a-table
ref="table"
size="middle"
:components="drag(columns,'columns')"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 130px)'}"
@@ -113,12 +114,15 @@ import axios from 'axios'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import ImportFileOnlyList from '@/components/ImportFileOnlyList/index'
import Vue from 'vue'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'index',
components: {
addModel,
ImportFileOnlyList
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
certCategoryParamsInfoEOList: [],
@@ -174,6 +178,7 @@ export default {
align: 'left',
dataIndex: 'description',
ellipsis: true,
width: 180,
// scopedSlots: { customRender: 'titleName' }
},
{
@@ -527,4 +532,8 @@ export default {
::v-deep .ant-table-body {
background: transparent!important;
}
::v-deep .ant-table-placeholder{
margin-top: 8px !important;
}
</style>