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:
@@ -159,7 +159,7 @@ export default {
|
||||
columns: [
|
||||
{
|
||||
title: this.$t('zoneOfApplication'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 160,
|
||||
ellipsis: true,
|
||||
sorter:true,
|
||||
@@ -167,7 +167,7 @@ export default {
|
||||
},
|
||||
{
|
||||
title: this.$t('parameterTemplate'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 180,
|
||||
ellipsis: true,
|
||||
sorter:true,
|
||||
@@ -176,7 +176,7 @@ export default {
|
||||
},
|
||||
{
|
||||
title: this.$t('contentDescription'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
dataIndex: 'description',
|
||||
// scopedSlots: { customRender: 'titleName' }
|
||||
@@ -197,7 +197,7 @@ export default {
|
||||
},
|
||||
{
|
||||
title: this.$t('created'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
dataIndex: 'createTime',
|
||||
width: 160,
|
||||
sorter:true,
|
||||
@@ -205,7 +205,7 @@ export default {
|
||||
},
|
||||
{
|
||||
title: this.$t('updated'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
width: 160,
|
||||
ellipsis: true,
|
||||
sorter:true,
|
||||
@@ -213,7 +213,7 @@ export default {
|
||||
},
|
||||
{
|
||||
title: this.$t('operation'),
|
||||
align: 'center',
|
||||
align: 'left',
|
||||
fixed: 'right',
|
||||
width: 200,
|
||||
scopedSlots: { customRender: 'operation' }
|
||||
|
||||
Reference in New Issue
Block a user