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:
@@ -572,7 +572,7 @@
|
||||
if (res.type) {
|
||||
this.columns.push({
|
||||
dataIndex: res.db_field_name,
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
sorter: res.sort,
|
||||
width: 500
|
||||
@@ -588,7 +588,7 @@
|
||||
this.columns.push({
|
||||
title: res.db_field_txt,
|
||||
dataIndex: res.db_field_name,
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
// ellipsis: true,
|
||||
fixed: res.fixedLeft ? 'left' : '',
|
||||
sorter: res.sort,
|
||||
|
||||
Reference in New Issue
Block a user