Merge branch 'master' into 7679-hotFix_vnLocation
gitea/salix-front/pipeline/pr-master This commit looks good
Details
gitea/salix-front/pipeline/pr-master This commit looks good
Details
This commit is contained in:
commit
108ffbe7a8
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "24.30.1",
|
"version": "24.30.2",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
|
|
@ -19,58 +19,61 @@ const columns = computed(() => [
|
||||||
label: t('supplier.list.tableVisibleColumns.name'),
|
label: t('supplier.list.tableVisibleColumns.name'),
|
||||||
name: 'socialName',
|
name: 'socialName',
|
||||||
create: true,
|
create: true,
|
||||||
|
columnCreate: {
|
||||||
component: 'input',
|
component: 'input',
|
||||||
columnField: {
|
},
|
||||||
component: null,
|
columnFilter: {
|
||||||
|
name: 'search',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('supplier.list.tableVisibleColumns.nif'),
|
label: t('supplier.list.tableVisibleColumns.nif'),
|
||||||
name: 'nif',
|
name: 'nif',
|
||||||
component: 'input',
|
columnFilter: {
|
||||||
columnField: {
|
inWhere: true,
|
||||||
component: null,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('supplier.list.tableVisibleColumns.nickname'),
|
label: t('supplier.list.tableVisibleColumns.nickname'),
|
||||||
name: 'alias',
|
name: 'alias',
|
||||||
component: 'input',
|
columnFilter: {
|
||||||
columnField: {
|
name: 'search',
|
||||||
component: null,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('supplier.list.tableVisibleColumns.account'),
|
label: t('supplier.list.tableVisibleColumns.account'),
|
||||||
name: 'account',
|
name: 'account',
|
||||||
component: 'input',
|
columnFilter: {
|
||||||
columnField: {
|
inWhere: true,
|
||||||
component: null,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('supplier.list.tableVisibleColumns.payMethod'),
|
label: t('supplier.list.tableVisibleColumns.payMethod'),
|
||||||
name: 'payMethod',
|
name: 'payMethod',
|
||||||
|
columnFilter: {
|
||||||
|
inWhere: true,
|
||||||
|
name: 'payMethodFk',
|
||||||
component: 'select',
|
component: 'select',
|
||||||
attrs: {
|
attrs: {
|
||||||
url: 'payMethods',
|
url: 'payMethods',
|
||||||
fields: ['id', 'name'],
|
fields: ['id', 'name'],
|
||||||
|
find: {
|
||||||
|
value: 'payMethodFk',
|
||||||
|
label: 'name',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
columnField: {
|
|
||||||
component: null,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('supplier.list.tableVisibleColumns.payDay'),
|
label: t('supplier.list.tableVisibleColumns.payDay'),
|
||||||
name: 'payDat',
|
name: 'payDay',
|
||||||
component: 'input',
|
columnFilter: {
|
||||||
columnField: {
|
inWhere: true,
|
||||||
component: null,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
@ -99,7 +102,6 @@ const columns = computed(() => [
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
en:
|
||||||
Search suppliers: Search suppliers
|
Search suppliers: Search suppliers
|
||||||
|
|
||||||
es:
|
es:
|
||||||
Search suppliers: Buscar proveedores
|
Search suppliers: Buscar proveedores
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
Loading…
Reference in New Issue