IO-3582 Add Return From Inv to Parts Return Table
Signed-off-by: Allan Carr <allan@imexsystems.ca>
This commit is contained in:
@@ -70,6 +70,12 @@ export function PartsOrderListTableComponent({
|
||||
const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
|
||||
|
||||
const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
|
||||
|
||||
const enrichedPartsOrders = parts_orders.map((order) => ({
|
||||
...order,
|
||||
invoice_number: order.bill?.invoice_number
|
||||
}));
|
||||
|
||||
const { refetch } = billsQuery;
|
||||
|
||||
const recordActions = (record, showView = false) => (
|
||||
@@ -222,7 +228,12 @@ export function PartsOrderListTableComponent({
|
||||
dataIndex: "order_number",
|
||||
key: "order_number",
|
||||
sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
|
||||
sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
|
||||
sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order,
|
||||
render: (text, record) => (
|
||||
<span>
|
||||
{record.order_number} {record.invoice_number && `(${record.invoice_number})`}
|
||||
</span>
|
||||
)
|
||||
},
|
||||
{
|
||||
title: t("parts_orders.fields.order_date"),
|
||||
@@ -272,10 +283,10 @@ export function PartsOrderListTableComponent({
|
||||
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
|
||||
};
|
||||
|
||||
const filteredPartsOrders = parts_orders
|
||||
const filteredPartsOrders = enrichedPartsOrders
|
||||
? searchText === ""
|
||||
? parts_orders
|
||||
: parts_orders.filter(
|
||||
? enrichedPartsOrders
|
||||
: enrichedPartsOrders.filter(
|
||||
(b) =>
|
||||
(b.order_number || "").toString().toLowerCase().includes(searchText.toLowerCase()) ||
|
||||
(b.vendor.name || "").toLowerCase().includes(searchText.toLowerCase())
|
||||
|
||||
@@ -91,6 +91,10 @@ export const QUERY_PARTS_BILLS_BY_JOBID = gql`
|
||||
order_number
|
||||
comments
|
||||
user_email
|
||||
bill {
|
||||
id
|
||||
invoice_number
|
||||
}
|
||||
}
|
||||
parts_dispatch(where: { jobid: { _eq: $jobid } }) {
|
||||
id
|
||||
|
||||
Reference in New Issue
Block a user