From c5bee307ac9ab10b524bbccce2fde3190723f467 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 09 五月 2025 19:06:09 +0800
Subject: [PATCH] no message
---
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 345c3a1..0125c45 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -56,6 +56,8 @@
import DictionarySelect from "../../components/DictionarySelect";
import ExitToAppIcon from '@mui/icons-material/ExitToApp';
import ImportButton from "../../components/ImportButton";
+import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined';
+import OrderPrintPreview from "./OrderPrintPreview";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -112,7 +114,8 @@
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
- const [select, setSelect] = useState(0);
+ const [printOrder, setPrintOrder] = useState(false);
+ const [select, setSelect] = useState({});
const billReload = useRef();
const notify = useNotify();
const refresh = useRefresh();
@@ -132,7 +135,6 @@
title={"menu.asnOrder"}
empty={false}
filters={filters}
- filter={{deleted: 0}}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
@@ -168,7 +170,7 @@
<TextField cellClassName="wkType" source="wkType$" label="table.field.asnOrder.wkType" />
<NumberField source="anfme" label="table.field.asnOrder.anfme" />
<NumberField source="qty" label="table.field.asnOrder.qty" />
- <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
+ {/* <TextField source="logisNo" label="table.field.asnOrder.logisNo" /> */}
<DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
<TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
<TextField source="ntyStatus$" label="table.field.asnOrder.ntyStatus" />
@@ -183,7 +185,9 @@
<MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
<InspectionButton />
<CompleteButton />
- <CloseButton />
+ <ODeleteButton />
+ <PrintButton setPrintOrder={setPrintOrder} setSelect={setSelect}/>
+ {/* <CloseButton /> */}
</WrapperField>
</StyledDatagrid>
</List>
@@ -192,6 +196,11 @@
setOpen={setCreateDialog}
asnId={modalType}
billReload={billReload}
+ />
+ <OrderPrintPreview
+ open={printOrder}
+ setOpen={setPrintOrder}
+ record={select}
/>
<PageDrawer
title='AsnOrder Detail'
@@ -204,6 +213,32 @@
}
export default AsnOrderList;
+
+//鎵撳嵃鎸夐挳
+const PrintButton = ({setPrintOrder, setSelect}) => {
+ const record = useRecordContext();
+ const printOrder = (event) => {
+ event.stopPropagation();
+ setPrintOrder(true)
+ setSelect(record)
+ }
+
+ return (
+ <Button label={"toolbar.print"} onClick={printOrder}>
+ <PrintOutlinedIcon />
+ </Button>
+ )
+}
+
+
+const ODeleteButton = () => {
+ const record = useRecordContext();
+ return (
+ record.exceStatus === 0 ? <DeleteButton mutationMode="pessimistic"/> : <></>
+ )
+
+}
+
const MyButton = ({ setCreateDialog, setmodalType }) => {
const record = useRecordContext();
const handleEditClick = (btn) => {
@@ -214,6 +249,7 @@
};
return (
+ record.exceStatus === 1 || record.exceStatus === 0 ?
<Button
color="primary"
startIcon={<EditIcon />}
@@ -222,9 +258,11 @@
label={'ra.action.edit'}
>
</Button>
+ : <></>
)
}
+//鎶ユ
const InspectionButton = () => {
const record = useRecordContext();
const notify = useNotify();
@@ -244,11 +282,8 @@
}
}
-
return (
- <Button onClick={inspection} label={"toolbar.inspection"}>
- <ConstructionIcon />
- </Button>
+ <ConfirmButton label={"toolbar.inspection"} color="secondary" startIcon={<ConstructionIcon />} onConfirm={inspection} />
)
}
@@ -332,6 +367,7 @@
)
}
+//瀹屾垚鍗曟嵁
const CompleteButton = () => {
const record = useRecordContext();
const notify = useNotify();
@@ -348,10 +384,10 @@
}
return (
- record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
- <TaskIcon />
- </Button> : <ConfirmButton label={"toolbar.complete"} color="success" data={'褰撳墠鏀惰揣鏁伴噺灏忎簬璁″垝鏁伴噺锛屾槸鍚︾‘璁ゅ畬鎴�'} startIcon={<TaskIcon />} onConfirm={requestComplete} />)
-
+ // record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="secondary">
+ // <TaskIcon />
+ // </Button> : )
+ record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
)
@@ -373,6 +409,6 @@
}
return (
- <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} />
+ <ConfirmButton label={"toolbar.close"} color="error" startIcon={<CloseIcon />} onConfirm={requestClose} />
)
}
--
Gitblit v1.9.1