5999-defaultCountry #1665
|
@ -70,6 +70,7 @@ module.exports = Self => {
|
||||||
c.creditInsurance,
|
c.creditInsurance,
|
||||||
d.defaulterSinced,
|
d.defaulterSinced,
|
||||||
cn.country,
|
cn.country,
|
||||||
|
c.countryFk,
|
||||||
pm.name payMethod
|
pm.name payMethod
|
||||||
FROM vn.defaulter d
|
FROM vn.defaulter d
|
||||||
JOIN vn.client c ON c.id = d.clientFk
|
JOIN vn.client c ON c.id = d.clientFk
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
"country": {
|
"country": {
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
"model": "Country",
|
"model": "Country",
|
||||||
"foreignKey": "country"
|
"foreignKey": "countryFk"
|
||||||
},
|
},
|
||||||
"payMethod": {
|
"payMethod": {
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
<th field="salesPersonFk">
|
<th field="salesPersonFk">
|
||||||
<span translate>Comercial</span>
|
<span translate>Comercial</span>
|
||||||
</th>
|
</th>
|
||||||
<th field="country">
|
<th field="countryFk">
|
||||||
<span translate>Country</span>
|
<span translate>Country</span>
|
||||||
</th>
|
</th>
|
||||||
<th field="payMethod"
|
<th field="payMethod"
|
||||||
|
|
|
@ -31,10 +31,11 @@ export default class Controller extends Section {
|
||||||
valueField: 'id',
|
valueField: 'id',
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
field: 'country',
|
field: 'countryFk',
|
||||||
autocomplete: {
|
autocomplete: {
|
||||||
|
url: 'Countries',
|
||||||
showField: 'country',
|
showField: 'country',
|
||||||
valueField: 'country'
|
valueField: 'id'
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
field: 'payMethodFk',
|
field: 'payMethodFk',
|
||||||
|
@ -167,7 +168,7 @@ export default class Controller extends Section {
|
||||||
case 'amount':
|
case 'amount':
|
||||||
case 'clientFk':
|
case 'clientFk':
|
||||||
case 'workerFk':
|
case 'workerFk':
|
||||||
case 'country':
|
case 'countryFk':
|
||||||
case 'payMethod':
|
case 'payMethod':
|
||||||
case 'salesPersonFk':
|
case 'salesPersonFk':
|
||||||
return {[`d.${param}`]: value};
|
return {[`d.${param}`]: value};
|
||||||
|
|
Loading…
Reference in New Issue