From 313f0515b65ab69e6e811c199f4b33eb630509f3 Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期四, 03 四月 2025 19:09:38 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 144 +++++++++++++++++++++++++++++++++--------------
1 files changed, 100 insertions(+), 44 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
index 095bde5..08016e7 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
@@ -15,6 +15,7 @@
useRecordContext,
useTranslate,
useNotify,
+ useRefresh,
useListContext,
FunctionField,
TextField,
@@ -47,7 +48,8 @@
import ConstructionIcon from "@mui/icons-material/Construction";
import FileDownloadIcon from '@mui/icons-material/FileDownload';
import EditIcon from '@mui/icons-material/Edit';
-
+import TaskIcon from '@mui/icons-material/Task';
+import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -66,7 +68,6 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
-
<TextInput source="code" label="table.field.asnOrder.code" />,
<TextInput source="poCode" label="table.field.asnOrder.poCode" />,
<NumberInput source="poId" label="table.field.asnOrder.poId" />,
@@ -101,41 +102,12 @@
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
+ const [billReload, setBillReload] = useState(null);
const navigate = useNavigate();
const assign = (record) => {
navigate(`/asnOrderItem?asnId=${record.id}`);
};
-
-
- const inspection = () => { };
-
- const print = () => {
- const imageUrls = ['https://www.baidu.com/img/flexible/logo/pc/result@2.png',]
- const iframe = document.createElement('iframe');
- iframe.style.display = 'none';
- document.body.appendChild(iframe);
-
- const iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
- iframeDoc.open();
- iframeDoc.write('<html><head><title>Print Images</title></head><body>');
-
- // 灏嗗浘鐗囨彃鍏ュ埌 iframe 涓�
- imageUrls.forEach((imageUrl) => {
- iframeDoc.write(`<img src="${imageUrl}" style="margin: 10px;">`);
- });
-
- iframeDoc.write('</body></html>');
- iframeDoc.close();
-
- // 绛夊緟鍥剧墖鍔犺浇瀹屾垚鍚庤Е鍙戞墦鍗�
- iframe.contentWindow.onload = () => {
- iframe.contentWindow.print();
- // 鎵撳嵃瀹屾垚鍚庣Щ闄� iframe
- document.body.removeChild(iframe);
- };
- };
-
return (
<Box display="flex">
@@ -155,9 +127,6 @@
actions={(
<TopToolbar>
- <Button onClick={inspection} label={"toolbar.inspection"}>
- <ConstructionIcon />
- </Button>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
<SelectColumnsButton preferenceKey='asnOrder' />
@@ -169,18 +138,18 @@
>
<StyledDatagrid
preferenceKey='asnOrder'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={(e) => <AsnOrderPanel key={Math.floor(Math.random() * 100)} />}
+ bulkActionButtons={<> <InspectionsButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
+ rowClick={() => false}
+ expand={<AsnOrderPanel setBillReload={setBillReload} />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'poId']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrder.code" />
<TextField source="poCode" label="table.field.asnOrder.poCode" />
<NumberField source="poId" label="table.field.asnOrder.poId" />
- <TextField source="type" label="table.field.asnOrder.type" />
- <TextField source="wkType" label="table.field.asnOrder.wkType" />
+ <TextField source="type$" label="table.field.asnOrder.type" />
+ <TextField 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" />
@@ -195,12 +164,13 @@
<TextField source="nickname" />
</ReferenceField>
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <TextField source="exceStatus$" label="common.field.status" />
+ {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt" >
- <Button label="toolbar.print" onClick={print}>
+ {/* <Button label="toolbar.print" onClick={print}>
<FileDownloadIcon />
- </Button>
+ </Button> */}
{/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> */}
<MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
{/* <Button
@@ -211,6 +181,8 @@
label={'ra.action.edit'}
>
</Button> */}
+ <InspectionButton />
+ <CompleteButton />
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
</WrapperField>
</StyledDatagrid>
@@ -219,6 +191,7 @@
open={createDialog}
setOpen={setCreateDialog}
asnId={modalType}
+ billReload={billReload}
/>
<PageDrawer
title='AsnOrder Detail'
@@ -250,3 +223,86 @@
</Button>
)
}
+
+const InspectionButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const inspection = () => {
+ requestInspect([record])
+ };
+
+ const requestInspect = async (rows) => {
+ const { data: { code, data, msg } } = await request.post(`/asnOrder/inspect`, rows);
+
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+
+ return (
+ <Button onClick={inspection} label={"toolbar.inspection"}>
+ <ConstructionIcon />
+ </Button>
+ )
+}
+
+const InspectionsButton = () => {
+ const { selectedIds, onUnselectItems, data } = useListContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const inspection = () => {
+ if (selectedIds.length === 0) {
+ notify('璇烽�夋嫨閫氱煡鍗�');
+ return;
+ } else {
+ const rows = data.filter((item) => selectedIds.includes(item.id))
+ requestInspect(rows)
+ }
+ };
+
+ const requestInspect = async (rows) => {
+ const { data: { code, data, msg } } = await request.post(`/asnOrder/inspect`, rows);
+
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+
+ return (
+ <Button onClick={inspection} label={"toolbar.inspection"}>
+ <ConstructionIcon />
+ </Button>
+ )
+}
+
+const CompleteButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const requestComplete = async () => {
+ const { data: { code, data, msg } } = await request.post(`/asnOrder/complete/${record.id}`);
+
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+
+ return (
+ <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
+ <TaskIcon />
+ </Button>
+ )
+}
--
Gitblit v1.9.1