From 1504150a9e26ef221fc6ac4e0ad494446968d06d Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 30 八月 2025 16:28:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/check/CheckOrderList.jsx | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderList.jsx b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
index 47ea727..766d057 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderList.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
@@ -24,6 +24,7 @@
ReferenceInput,
AutocompleteInput,
Button,
+ BulkDeleteButton,
useRedirect,
} from 'react-admin';
import { styled } from '@mui/material/styles';
@@ -39,10 +40,11 @@
import AddTaskIcon from '@mui/icons-material/AddTask';
import PublicIcon from '@mui/icons-material/Public';
import SelectMatnrModal from "./SelectMatnrModal";
-import CheckOrderModal from "./CheckOrderModal";
import EditIcon from '@mui/icons-material/Edit';
import AddIcon from '@mui/icons-material/Add';
import request from '@/utils/request';
+import PageEditDrawer from "../../components/PageEditDrawer";
+import CheckOrderPub from "./CheckOrderPub";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -79,7 +81,7 @@
<DictionarySelect
label='table.field.checkOrder.exceStatus'
name="exceStatus"
- dictTypeCode="sys_asn_exce_status"
+ dictTypeCode="sys_check_exce_status"
alwaysOn
/>,
]
@@ -139,15 +141,16 @@
>
<StyledDatagrid
preferenceKey='check'
- bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
+ bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic" />}
rowClick={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.checkOrder.code" />
- <TextField source="type$" label="table.field.checkOrder.type" />
- <TextField cellClassName="wkType" source="checkType$" label="table.field.checkOrder.checkType" />
+ {/* <TextField source="type$" label="table.field.checkOrder.type" /> */}
+ <TextField cellClassName="wkType" source="wkType$" label="table.field.checkOrder.type" />
+ <TextField source="checkType$" label="table.field.checkOrder.checkType" />
<NumberField source="anfme" label="table.field.checkOrder.anfme" />
<NumberField source="workQty" label="table.field.checkOrder.workQty" />
<NumberField source="qty" label="table.field.checkOrder.qty" />
@@ -162,13 +165,10 @@
<MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
<CancelButton />
+ <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
</WrapperField>
</StyledDatagrid>
</List>
- {/* <CheckOrderCreate
- open={manualDialog}
- setOpen={setManualDialog}
- /> */}
<SelectMatnrModal
asnId={modalType}
billReload={billReload}
@@ -176,14 +176,14 @@
setOpen={setManualDialog}
/>
{/* <OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} />
- <OutOrderPreview open={preview} setOpen={setPreview} />
+ <OutOrderPreview open={preview} setOpen={setPreview} />*/}
<PageEditDrawer
title={"toolbar.publicWorking"}
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
- <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
- </PageEditDrawer> */}
+ <CheckOrderPub record={select} open={drawerVal} setOpen={setDrawerVal} />
+ </PageEditDrawer>
</Box >
)
}
@@ -237,7 +237,7 @@
const notify = useNotify();
const refresh = useRefresh();
const cancelOrder = async () => {
- const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
+ const { data: { code, data, msg } } = await request.get(`/check/cancel/${record?.id}`);
if (code === 200) {
notify(msg);
refresh()
@@ -247,6 +247,22 @@
}
return (
- record?.exceStatus == 10 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} size={"small"} /> : <></>
+ record?.exceStatus == 0 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} size={"small"} /> : <></>
+ )
+}
+
+
+//涓嬪彂鎵ц
+const PublicButton = ({ setDrawerVal, setSelect }) => {
+ const record = useRecordContext();
+ const refresh = useRefresh();
+ const taskEvent = () => {
+ setDrawerVal(true)
+ setSelect(record)
+ refresh();
+ }
+
+ return (
+ record.workQty < record.anfme ? <Button label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onClick={taskEvent} size={"small"} /> : <></>
)
}
--
Gitblit v1.9.1