Merge branch 'dev' into 6443-6444-6445-fix-permissions
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
222335809e
|
@ -16,7 +16,7 @@ class Controller extends Section {
|
||||||
this.filter = {
|
this.filter = {
|
||||||
where: {
|
where: {
|
||||||
itemFk: this.$params.id,
|
itemFk: this.$params.id,
|
||||||
shipped: {
|
landed: {
|
||||||
between: [from, to]
|
between: [from, to]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ class Controller extends Section {
|
||||||
const to = new Date(this._dateTo);
|
const to = new Date(this._dateTo);
|
||||||
to.setHours(23, 59, 59, 59);
|
to.setHours(23, 59, 59, 59);
|
||||||
|
|
||||||
this.filter.where.shipped = {
|
this.filter.where.landed = {
|
||||||
between: [from, to]
|
between: [from, to]
|
||||||
};
|
};
|
||||||
this.$.model.refresh();
|
this.$.model.refresh();
|
||||||
|
@ -53,7 +53,7 @@ class Controller extends Section {
|
||||||
const to = new Date(value);
|
const to = new Date(value);
|
||||||
to.setHours(23, 59, 59, 59);
|
to.setHours(23, 59, 59, 59);
|
||||||
|
|
||||||
this.filter.where.shipped = {
|
this.filter.where.landed = {
|
||||||
between: [from, to]
|
between: [from, to]
|
||||||
};
|
};
|
||||||
this.$.model.refresh();
|
this.$.model.refresh();
|
||||||
|
|
Loading…
Reference in New Issue