verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3428-item_diary
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2021-12-14 10:01:25 +01:00
parent 9de1d59d98 30e1be3167
commit 97b7ebd717
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ticket/back/methods/ticket/filter.js
View File

@ -177,6 +177,8 @@ module.exports = Self => {
return {'a.provinceFk': value}; return {'a.provinceFk': value};
case 'stateFk': case 'stateFk':
return {'ts.stateFk': value}; return {'ts.stateFk': value};
case 'collectionFk':
return {'cll.id': value};
case 'mine': case 'mine':
case 'myTeam': case 'myTeam':
if (value) if (value)
@ -276,9 +278,8 @@ module.exports = Self => {
if (args.collectionFk) { if (args.collectionFk) {
stmt.merge({ stmt.merge({
sql: ` sql: `
JOIN collection cll ON cll.id = ? JOIN collection cll
JOIN ticketCollection tc ON tc.collectionFk = cll.id AND tc.ticketFk = t.id`, JOIN ticketCollection tc ON tc.collectionFk = cll.id AND tc.ticketFk = t.id`
params: [args.collectionFk]
}); });
} }

1
modules/ticket/front/main/index.js
View File

@ -8,6 +8,7 @@ export default class Ticket extends ModuleMain {
'to', 'to',
'search', 'search',
'clientFk', 'clientFk',
'collectionFk',
'orderFk', 'orderFk',
'refFk', 'refFk',
'scopeDays' 'scopeDays'