feat(supllier.summary): add two fields
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2022-04-25 12:23:03 +02:00
parent 5211a0d9d7
commit 76ff6330f9
7 changed files with 35 additions and 6 deletions

View File

@ -0,0 +1,2 @@
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, 'principalId')
VALUES('SupplierActivity', '*', '*', 'ALLOW', 'ROLE', 'employee');

View File

@ -41,7 +41,9 @@ module.exports = Self => {
'sageTaxTypeFk', 'sageTaxTypeFk',
'sageTransactionTypeFk', 'sageTransactionTypeFk',
'sageWithholdingFk', 'sageWithholdingFk',
'workerFk' 'workerFk',
'supplierActivityFk',
'healthRegister'
], ],
include: [ include: [
{ {
@ -98,6 +100,12 @@ module.exports = Self => {
} }
} }
}, },
{
relation: 'supplierActivity',
scope: {
fields: ['code', 'name']
}
}
] ]
}; };
let supplier = await Self.app.models.Supplier.findOne(filter); let supplier = await Self.app.models.Supplier.findOne(filter);

View File

@ -56,6 +56,14 @@ module.exports = Self => {
{ {
arg: 'countryFk', arg: 'countryFk',
type: 'any' type: 'any'
},
{
arg: 'supplierActivityFk',
type: 'string'
},
{
arg: 'healthRegister',
type: 'string'
}], }],
returns: { returns: {
arg: 'res', arg: 'res',

View File

@ -32,8 +32,8 @@
</vn-crud-model> </vn-crud-model>
<vn-crud-model <vn-crud-model
auto-load="true" auto-load="true"
url="SupplierActivity" url="SupplierActivities"
data="supplierActivity"> data="supplierActivities">
</vn-crud-model> </vn-crud-model>
<form name="form" vn-http-submit="watcher.submit()" class="vn-w-md"> <form name="form" vn-http-submit="watcher.submit()" class="vn-w-md">
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg">
@ -95,8 +95,8 @@
<vn-horizontal> <vn-horizontal>
<vn-autocomplete vn-one <vn-autocomplete vn-one
ng-model="$ctrl.supplier.supplierActivityFk" ng-model="$ctrl.supplier.supplierActivityFk"
data="supplierActivity" data="supplierActivities"
show-field="code" show-field="name"
value-field="code" value-field="code"
label="Supplier activity" label="Supplier activity"
rule> rule>

View File

@ -1,3 +1,5 @@
Sage tax type: Tipo de impuesto Sage Sage tax type: Tipo de impuesto Sage
Sage transaction type: Tipo de transacción Sage Sage transaction type: Tipo de transacción Sage
Sage withholding: Retención Sage Sage withholding: Retención Sage
Supplier activity: Actividad proveedor
Healt register: Pasaporte sanitario

View File

@ -118,6 +118,13 @@
label="Sage withholding" label="Sage withholding"
value="{{::$ctrl.summary.sageWithholding.withholding}}"> value="{{::$ctrl.summary.sageWithholding.withholding}}">
</vn-label-value> </vn-label-value>
<vn-label-value
label="Supplier activity"
value="{{::$ctrl.summary.supplierActivity.name}}">
</vn-label-value>
<vn-label-value
label="Healt register"
value="{{::$ctrl.summary.healthRegister}}">
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

View File

@ -7,4 +7,6 @@ Sage tax type: Tipo de impuesto Sage
Sage transaction type: Tipo de transacción Sage Sage transaction type: Tipo de transacción Sage
Sage withholding: Retencion Sage Sage withholding: Retencion Sage
Go to the supplier: Ir al proveedor Go to the supplier: Ir al proveedor
Responsible: Responsable Responsible: Responsable
Supplier activity: Actividad proveedor
Healt register: Pasaporte sanitario