diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html
index 4b7661a8f..f75834045 100644
--- a/modules/entry/front/basic-data/index.html
+++ b/modules/entry/front/basic-data/index.html
@@ -35,6 +35,13 @@
{{::agencyModeName}} - {{::warehouseInName}} ({{::shipped | date: 'dd/MM/yyyy'}}) →
{{::warehouseOutName}} ({{::landed | date: 'dd/MM/yyyy'}})
+
+
+
+
@@ -121,4 +128,94 @@
ng-click="watcher.loadOriginalData()">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID
+ Agency
+ Warehouse Out
+ Warehouse In
+ Shipped
+ Landed
+
+
+
+
+
+
+ {{::travel.id}}
+
+
+ {{::travel.agency.name}}
+ {{::travel.warehouseOut.name}}
+ {{::travel.warehouseIn.name}}
+ {{::travel.shipped | date: 'dd/MM/yyyy'}}
+ {{::travel.landed | date: 'dd/MM/yyyy'}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/entry/front/basic-data/index.js b/modules/entry/front/basic-data/index.js
index 141a365fa..80870c3f3 100644
--- a/modules/entry/front/basic-data/index.js
+++ b/modules/entry/front/basic-data/index.js
@@ -1,10 +1,68 @@
import ngModule from '../module';
import Section from 'salix/components/section';
+import './style.scss';
+class Controller extends Section {
+ showFilterDialog(travel) {
+ this.activeTravel = travel;
+ this.travelFilterParams = {};
+ this.travelFilter = {
+ include: [
+ {
+ relation: 'agency',
+ scope: {
+ fields: ['name']
+ }
+ },
+ {
+ relation: 'warehouseIn',
+ scope: {
+ fields: ['name']
+ }
+ },
+ {
+ relation: 'warehouseOut',
+ scope: {
+ fields: ['name']
+ }
+ }
+ ]
+ };
+
+ this.$.filterDialog.show();
+ }
+
+ selectTravel(id) {
+ this.entry.travelFk = id;
+ this.$.filterDialog.hide();
+ }
+
+ filter() {
+ const filter = this.travelFilter;
+ const params = this.travelFilterParams;
+ const where = {};
+ for (let key in params) {
+ const value = params[key];
+ if (!value) continue;
+
+ switch (key) {
+ case 'agencyFk':
+ case 'warehouseInFk':
+ case 'warehouseOutFk':
+ case 'shipped':
+ case 'landed':
+ where[key] = value;
+ }
+ }
+
+ filter.where = where;
+ this.$.travelsModel.applyFilter(filter);
+ }
+}
ngModule.vnComponent('vnEntryBasicData', {
template: require('./index.html'),
- controller: Section,
bindings: {
entry: '<'
- }
+ },
+ controller: Controller
});
diff --git a/modules/entry/front/basic-data/style.scss b/modules/entry/front/basic-data/style.scss
new file mode 100644
index 000000000..508aa9091
--- /dev/null
+++ b/modules/entry/front/basic-data/style.scss
@@ -0,0 +1,3 @@
+.travelFilter{
+ width: 950px;
+}