Merge branch 'master' into hotFix_vnJsonValue_showHours
gitea/salix-front/pipeline/pr-master This commit is unstable
Details
gitea/salix-front/pipeline/pr-master This commit is unstable
Details
This commit is contained in:
commit
c9e5e86465
|
@ -46,7 +46,6 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
isId: true,
|
isId: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
width: '25px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'workerFk',
|
name: 'workerFk',
|
||||||
|
@ -142,7 +141,6 @@ const columns = computed(() => [
|
||||||
label: 'm3',
|
label: 'm3',
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnClass: 'shrink',
|
columnClass: 'shrink',
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'started',
|
name: 'started',
|
||||||
|
@ -150,7 +148,6 @@ const columns = computed(() => [
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ started }) => toHour(started),
|
format: ({ started }) => toHour(started),
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'finished',
|
name: 'finished',
|
||||||
|
@ -158,7 +155,6 @@ const columns = computed(() => [
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ finished }) => toHour(finished),
|
format: ({ finished }) => toHour(finished),
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'right',
|
align: 'right',
|
||||||
|
|
|
@ -46,7 +46,6 @@ const columns = computed(() => [
|
||||||
condition: () => true,
|
condition: () => true,
|
||||||
},
|
},
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
width: '25px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
@ -57,7 +56,6 @@ const columns = computed(() => [
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
|
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
width: '100px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('globals.agency'),
|
label: t('globals.agency'),
|
||||||
|
@ -102,7 +100,6 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ started }) => toHour(started),
|
format: ({ started }) => toHour(started),
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
@ -111,7 +108,6 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ finished }) => toHour(finished),
|
format: ({ finished }) => toHour(finished),
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
|
Loading…
Reference in New Issue