Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/MBOMConfig/step.vue

@@ -291,7 +291,7 @@ export default {
     getData() {
       this.currentId = this.node.id
       const params = {
-        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': this.node.id }] },
+        'searchItems': { 'items': [{ 'fieldName': 'aircraftSorties.defName', 'operator': 'EQ', 'value': this.$route.query.sortiesName }] },
         'sortItem': [{ 'fieldName': 'serialNumber', 'sortOrder': 'asc' }],
         'openProps': [
           {

applications/dee-mes/src/privateComponents/components/MBOMConfig/tree.vue

@@ -183,7 +183,7 @@ export default {
     },
     getPosition() {
       const params = {
-        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': this.AircraftSortiesId }] },
+        'searchItems': { 'items': [{ 'fieldName': 'aircraftSorties.defName', 'operator': 'EQ', 'value': this.AircraftSortiesName }] },
         'sortItem': [{ 'fieldName': 'serialNumber', 'sortOrder': 'asc' }]
       }