From 995da476422fa14d46260091a023f6ec2662a081 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Mon, 26 Feb 2024 18:04:46 +0530 Subject: [PATCH] Improved: Added support to search by external order name shipment attribute on shipments screen. --- src/store/modules/shipment/actions.ts | 3 --- src/views/Shipments.vue | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/store/modules/shipment/actions.ts b/src/store/modules/shipment/actions.ts index cdff8f20..5d4ed214 100644 --- a/src/store/modules/shipment/actions.ts +++ b/src/store/modules/shipment/actions.ts @@ -19,13 +19,10 @@ const actions: ActionTree = { const statuses = await this.dispatch('util/fetchStatus', statusIds); const shipmentIds = shipments.map((shipment: any) => shipment.shipmentId); - const shipmentAttributes = await ShipmentService.fetchShipmentAttributes(shipmentIds) const trackingCodes = await ShipmentService.fetchTrackingCodes(shipmentIds) shipments.map(async (shipment: any) => { shipment.statusDesc = statuses[shipment.statusId] - shipment.externalOrderId = shipmentAttributes[shipment.shipmentId]?.['EXTERNAL_ORDER_ID'] - shipment.externalOrderName = shipmentAttributes[shipment.shipmentId]?.['EXTERNAL_ORDER_NAME'] shipment.trackingIdNumber = trackingCodes?.[shipment.shipmentId]; }); diff --git a/src/views/Shipments.vue b/src/views/Shipments.vue index 178f0636..08d708fc 100644 --- a/src/views/Shipments.vue +++ b/src/views/Shipments.vue @@ -115,7 +115,7 @@ export default defineComponent({ "grp_op_1": "OR" }, "entityName": "ShipmentAndTypeAndItemCount", - "fieldList" : [ "shipmentId","primaryShipGroupSeqId","partyIdFrom","partyIdTo","estimatedArrivalDate","destinationFacilityId","statusId", "shipmentItemCount", "externalId", "externalOrderId", "shipmentTypeId" ], + "fieldList" : [ "shipmentId","primaryShipGroupSeqId","partyIdFrom","partyIdTo","estimatedArrivalDate","destinationFacilityId","statusId", "shipmentItemCount", "externalId", "externalOrderId", "externalOrderName", "shipmentTypeId" ], "noConditionFind": "Y", "viewSize": viewSize, "viewIndex": viewIndex, @@ -129,6 +129,10 @@ export default defineComponent({ payload.inputFields["externalOrderId_op"] = 'contains' payload.inputFields["externalOrderId_ic"] = 'Y' payload.inputFields["externalOrderId_grp"] = '2' + payload.inputFields["externalOrderName_value"] = this.queryString + payload.inputFields["externalOrderName_op"] = 'contains' + payload.inputFields["externalOrderName_ic"] = 'Y' + payload.inputFields["externalOrderName_grp"] = '2' payload.inputFields["grp_op_2"] = 'OR' } await this.store.dispatch("shipment/findShipment", payload);