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:
@@ -68,6 +68,7 @@
|
||||
ref='table'
|
||||
size='middle'
|
||||
rowKey='id'
|
||||
:components="drag(columns,'columns')"
|
||||
:columns='columns'
|
||||
:dataSource='areaTable'
|
||||
:pagination='false'
|
||||
@@ -161,10 +162,12 @@
|
||||
import axios from 'axios'
|
||||
import Vue from 'vue'
|
||||
import { ACCESS_TOKEN } from '@/store/mutation-types'
|
||||
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
|
||||
|
||||
export default {
|
||||
name: 'diolagArea',
|
||||
components: {},
|
||||
mixins:[ResizeHeader, ResizeColumnProvide],
|
||||
data() {
|
||||
return {
|
||||
token: Vue.ls.get(ACCESS_TOKEN),
|
||||
|
||||
@@ -84,6 +84,7 @@
|
||||
<a-table
|
||||
class="table"
|
||||
rowKey="id"
|
||||
:components="drag(columns,'columns')"
|
||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
||||
:pagination="false"
|
||||
:scroll="{x: '100%',y:'calc(100vh - 155px)'}"
|
||||
@@ -136,6 +137,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
|
||||
// import eventBUs from '../../../common/event'
|
||||
import Vue from 'vue'
|
||||
import moment from 'moment'
|
||||
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
|
||||
|
||||
export default {
|
||||
name: 'index',
|
||||
@@ -143,6 +145,7 @@ export default {
|
||||
ExportHistory,
|
||||
globalAdvancedQuery
|
||||
},
|
||||
mixins:[ResizeHeader, ResizeColumnProvide],
|
||||
data() {
|
||||
return {
|
||||
token: Vue.ls.get(ACCESS_TOKEN),
|
||||
|
||||
Reference in New Issue
Block a user