Browse Source

update

master
CANCERYS\kw093 2 weeks ago
parent
commit
9f114ba499
5 changed files with 33 additions and 12 deletions
  1. +4
    -0
      src/components/PoDetail/PoDetail.tsx
  2. +9
    -3
      src/components/PoSearch/PoSearch.tsx
  3. +1
    -0
      src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx
  4. +16
    -8
      src/components/SearchBox/SearchBox.tsx
  5. +3
    -1
      src/components/SearchResults/SearchResults.tsx

+ 4
- 0
src/components/PoDetail/PoDetail.tsx View File

@@ -266,6 +266,10 @@ const PoDetail: React.FC<Props> = ({ po, warehouse, printerCombo }) => {
if (result) {
console.log("%c Fetched PO:", "color:orange", result);
setPurchaseOrder(result);
dnFormProps.reset({
dnNo: "",
receiptDate: dayjsToDateString(dayjs()),
});
setRows(result.pol || []);
if (result.pol && result.pol.length > 0) {
if (result.id === selectedPoId && selectedRow?.id) {


+ 9
- 3
src/components/PoSearch/PoSearch.tsx View File

@@ -66,9 +66,15 @@ const PoSearch: React.FC<Props> = ({
{ label: t(`completed`), value: `completed` },
],
},
{ label: t("ETA"), label2: t("ETA To"), paramName: "estimatedArrivalDate", type: "dateRange",
preFilledValue: dayjsToDateString(dayjs(), "input") },
{ label: t("ETA"),
label2: t("ETA To"),
paramName: "estimatedArrivalDate",
type: "dateRange",
preFilledValue: {
from: dayjsToDateString(dayjs(), "input"),
to: dayjsToDateString(dayjs(), "input"),
},
},
];
return searchCriteria;
}, [t]);


+ 1
- 0
src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx View File

@@ -378,6 +378,7 @@ const handleRelease = useCallback(() => {
{t("Release")}
</Button>
)}
</Stack>
</CardContent>
</Card>


+ 16
- 8
src/components/SearchBox/SearchBox.tsx View File

@@ -39,7 +39,7 @@ interface BaseCriterion<T extends string> {
paramName2?: T;
// options?: T[] | string[];
defaultValue?: string;
preFilledValue?: string;
preFilledValue?: string | { from?: string; to?: string };
filterObj?: T;
handleSelectionChange?: (selectedOptions: T[]) => void;
}
@@ -158,14 +158,22 @@ function SearchBox<T extends string>({
const preFilledInputs = useMemo(() => {
const preFilledCriteria = criteria.reduce<Record<T | `${T}To`, string>>(
(acc, c) => {
if (c.preFilledValue !== undefined) {
return {
...acc,
[c.paramName]: c.preFilledValue,
};
} else return acc;
if (c.type === "dateRange" || c.type === "datetimeRange") {
if (typeof c.preFilledValue === "object" && c.preFilledValue !== null) {
return {
...acc,
...(c.preFilledValue.from ? { [c.paramName]: c.preFilledValue.from } : {}),
...(c.preFilledValue.to ? { [`${c.paramName}To`]: c.preFilledValue.to } : {}),
};
}
}
if (typeof c.preFilledValue === "string") {
return { ...acc, [c.paramName]: c.preFilledValue };
}
return acc;
},
{} as Record<T | `${T}To`, string>,);
{} as Record<T | `${T}To`, string>,
);
return {...defaultInputs, ...preFilledCriteria}
}, [defaultInputs])



+ 3
- 1
src/components/SearchResults/SearchResults.tsx View File

@@ -221,12 +221,14 @@ function SearchResults<T extends ResultWithId>({
event,
) => {
console.log(event);
setRowsPerPage(+event.target.value);
const newSize = +event.target.value;
setRowsPerPage(newSize);
setPage(0);
if (setPagingController) {
setPagingController({
...(pagingController ?? defaultPagingController),
pageNum: 1,
pageSize: newSize,
});
}
};


Loading…
Cancel
Save