This commit is contained in:
parent
7f9d8da7a7
commit
24ea18aeb0
|
@ -60,6 +60,7 @@ module.exports = Self => {
|
|||
DISTINCT c.id clientFk,
|
||||
c.name clientName,
|
||||
c.salesPersonFk,
|
||||
c.businessTypeFk businessType,
|
||||
u.name salesPersonName,
|
||||
d.amount,
|
||||
co.created,
|
||||
|
|
|
@ -39,6 +39,11 @@
|
|||
"type": "belongsTo",
|
||||
"model": "PayMethod",
|
||||
"foreignKey": "payMethod"
|
||||
},
|
||||
"businessType": {
|
||||
"type":"belongsTo",
|
||||
"model": "businessType",
|
||||
"foreignKey": "businessTypeFk"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -54,7 +54,7 @@
|
|||
<th field="clientFk">
|
||||
<span translate>Client</span>
|
||||
</th>
|
||||
<th field="businessTypeFk">
|
||||
<th field="businessType">
|
||||
<span translate>Es trabajador</span>
|
||||
</th>
|
||||
<th field="salesPersonFk">
|
||||
|
@ -116,7 +116,7 @@
|
|||
<td>
|
||||
<vn-check
|
||||
label="isWorker"
|
||||
ng-model="$ctrl.summary.isWorker"
|
||||
ng-model="$ctrl.isWorker"
|
||||
disabled="true">
|
||||
</vn-check>
|
||||
</td>
|
||||
|
|
|
@ -62,6 +62,14 @@ export default class Controller extends Section {
|
|||
{
|
||||
field: 'defaulterSinced',
|
||||
datepicker: true
|
||||
},
|
||||
{
|
||||
field: 'businessType',
|
||||
autocomplete: {
|
||||
url: 'Clients',
|
||||
showField: 'businessTypeFk',
|
||||
valueField: 'id'
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
|
@ -152,6 +160,7 @@ export default class Controller extends Section {
|
|||
switch (param) {
|
||||
case 'creditInsurance':
|
||||
case 'amount':
|
||||
case 'businessTypeFk':
|
||||
case 'clientFk':
|
||||
case 'workerFk':
|
||||
case 'country':
|
||||
|
@ -178,8 +187,8 @@ export default class Controller extends Section {
|
|||
return [minHour, maxHour];
|
||||
}
|
||||
|
||||
isWorker(){
|
||||
if (businessFk === 'worker')
|
||||
isWorker() {
|
||||
if (businessType === 'worker')
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue