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

Merge pull request 'hotfix ticketFutureAdvance warehouse' (!1316) from hotFix-ticketFutureAdvance-warehouse into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1316
This commit is contained in:
Alexandre Riera 2023-02-09 07:18:06 +00:00
parent 71c9ed3a4e 725b7b9bce
commit 0e75a5f23a
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/ticket/front/advance/index.js
View File

@ -65,12 +65,15 @@ export default class Controller extends Section {
let today = new Date(); let today = new Date();
const tomorrow = new Date(today); const tomorrow = new Date(today);
tomorrow.setDate(tomorrow.getDate() + 1); tomorrow.setDate(tomorrow.getDate() + 1);
this.filterParams = { this.$http.get(`UserConfigs/getUserConfig`)
dateFuture: tomorrow, .then(res => {
dateToAdvance: today, this.filterParams = {
warehouseFk: this.vnConfig.warehouseFk dateFuture: tomorrow,
}; dateToAdvance: today,
this.$.model.applyFilter(null, this.filterParams); warehouseFk: res.data.warehouseFk
};
this.$.model.addFilter({}, this.filterParams);
});
} }
compareDate(date) { compareDate(date) {

15
modules/ticket/front/future/index.js
View File

@ -59,12 +59,15 @@ export default class Controller extends Section {
setDefaultFilter() { setDefaultFilter() {
const today = new Date(); const today = new Date();
this.filterParams = { this.$http.get(`UserConfigs/getUserConfig`)
originDated: today, .then(res => {
futureDated: today, this.filterParams = {
warehouseFk: this.vnConfig.warehouseFk originDated: today,
}; futureDated: today,
this.$.model.applyFilter(null, this.filterParams); warehouseFk: res.data.warehouseFk
};
this.$.model.applyFilter(null, this.filterParams);
});
} }
compareDate(date) { compareDate(date) {