Improved: Added support to search by external order name shipment att…

…ribute on shipments screen.
hotwax · Feb 26, 2024 · 995da47 · 995da47
1 parent b9f8f0c
commit 995da47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/store/modules/shipment/actions.ts b/src/store/modules/shipment/actions.ts
@@ -19,13 +19,10 @@ const actions: ActionTree<ShipmentState, RootState> = {
         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
@@ -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);