diff --git a/src/components/PoDetail/QcFormVer2.tsx b/src/components/PoDetail/QcComponent.tsx similarity index 97% rename from src/components/PoDetail/QcFormVer2.tsx rename to src/components/PoDetail/QcComponent.tsx index 09efa8d..9780f02 100644 --- a/src/components/PoDetail/QcFormVer2.tsx +++ b/src/components/PoDetail/QcComponent.tsx @@ -71,7 +71,7 @@ type EntryError = type QcRow = TableRow, EntryError>; // fetchQcItemCheck -const QcFormVer2: React.FC = ({ qc, itemDetail, disabled, qcItems, setQcItems }) => { +const QcComponent: React.FC = ({ qc, itemDetail, disabled, qcItems, setQcItems }) => { const { t } = useTranslation("purchaseOrder"); const apiRef = useGridApiRef(); const { @@ -462,8 +462,9 @@ const QcFormVer2: React.FC = ({ qc, itemDetail, disabled, qcItems, setQcI }} > } label="接受" /> - + value="1" control={} label="接受來貨" /> + + {itemDetail.status == "escalated" && ( = ({ qc, itemDetail, disabled, qcItems, setQcI error={Boolean(errors.acceptQty)} helperText={errors.acceptQty?.message} /> - + )} + + {itemDetail.status == "pending" && (<> } sx={{"& .Mui-checked": {color: "red"}}} - label="不接受" /> + label="不接受並退貨" /> + + } sx={{"& .Mui-checked": {color: "blue"}}} label="上報品檢結果" /> + )} )} /> @@ -518,4 +524,4 @@ const QcFormVer2: React.FC = ({ qc, itemDetail, disabled, qcItems, setQcI ); }; -export default QcFormVer2; +export default QcComponent; diff --git a/src/components/PoDetail/QcStockInModalVer2.tsx b/src/components/PoDetail/QcStockInModalVer2.tsx index a9b86d2..18c7568 100644 --- a/src/components/PoDetail/QcStockInModalVer2.tsx +++ b/src/components/PoDetail/QcStockInModalVer2.tsx @@ -17,8 +17,8 @@ import { StockInLineRow } from "./PoInputGrid"; import { useTranslation } from "react-i18next"; import StockInForm from "./StockInForm"; import StockInFormVer2 from "./StockInFormVer2"; -import QcFormVer2 from "./QcFormVer2"; import PutawayForm from "./PutawayForm"; +import QcComponent from "./QcComponent"; import { dummyPutawayLine, dummyQCData } from "./dummyQcTemplate"; import { useGridApiRef } from "@mui/x-data-grid"; import {submitDialogWithWarning} from "../Swal/CustomAlerts"; @@ -28,6 +28,7 @@ import { watch } from "fs"; import { EscalationResult } from "@/app/api/escalation"; import { SessionWithTokens } from "@/config/authConfig"; + const style = { position: "absolute", top: "50%", @@ -474,7 +475,7 @@ const [qcItems, setQcItems] = useState(dummyQCData) justifyContent="flex-start" alignItems="flex-start" > -