From 1c502c82c188292fd8c9337c221e1f09a86a642b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 15 八月 2025 13:34:03 +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 | 74 ++++++++++--------------------------
1 files changed, 21 insertions(+), 53 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderList.jsx b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
index 228316d..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';
@@ -38,9 +39,12 @@
import DetailsIcon from '@mui/icons-material/Details';
import AddTaskIcon from '@mui/icons-material/AddTask';
import PublicIcon from '@mui/icons-material/Public';
+import SelectMatnrModal from "./SelectMatnrModal";
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': {
@@ -65,30 +69,19 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
<TextInput source="code" label="table.field.checkOrder.code" alwaysOn />,
- <TextInput source="poCode" label="table.field.checkOrder.poCode" />,
- <NumberInput source="poId" label="table.field.checkOrder.poId" />,
<ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_order_type', group: '3' }} label="table.field.checkOrder.type" alwaysOn>
<AutocompleteInput label="table.field.checkOrder.type" optionValue="value" />
</ReferenceInput>,
- <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_check_order_type'}} label="table.field.checkOrder.wkType" alwaysOn>
- <AutocompleteInput label="table.field.checkOrder.wkType" optionValue="value" />
+ <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_check_order_type' }} label="table.field.checkOrder.checkType" alwaysOn>
+ <AutocompleteInput label="table.field.checkOrder.checkType" optionValue="value" />
</ReferenceInput>,
- <NumberInput source="anfme" label="table.field.checkOrder.anfme" />,
- <NumberInput source="qty" label="table.field.checkOrder.qty" />,
<TextInput source="logisNo" label="table.field.checkOrder.logisNo" />,
<DateInput source="arrTime" label="table.field.checkOrder.arrTime" />,
- <SelectInput source="rleStatus" label="table.field.checkOrder.rleStatus"
- choices={[
- { id: 0, name: ' 姝ｅ父' },
- { id: 1, name: ' 宸查噴鏀�' },
- ]}
- />,
-
<TextInput label="common.field.memo" source="memo" />,
<DictionarySelect
label='table.field.checkOrder.exceStatus'
name="exceStatus"
- dictTypeCode="sys_asn_exce_status"
+ dictTypeCode="sys_check_exce_status"
alwaysOn
/>,
]
@@ -97,7 +90,6 @@
const translate = useTranslate();
const refresh = useRefresh();
const notify = useNotify();
-
const [createDialog, setCreateDialog] = useState(false);
const [manualDialog, setManualDialog] = useState(false);
const [selectIds, setSelectIds] = useState([]);
@@ -140,31 +132,29 @@
actions={(
<TopToolbar>
<FilterButton />
- <CreateByOrderButton setCreateDialog={setCreateDialog} />
<MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
<SelectColumnsButton preferenceKey='check' />
- <ImportButton value={'checkItem'} />
+ <ImportButton value={'check'} />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<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="poCode" label="table.field.checkOrder.poCode" />
- <TextField source="type$" label="table.field.checkOrder.type" />
- <TextField cellClassName="wkType" source="checkType$" label="table.field.checkOrder.wkType" />
+ {/* <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" />
- <TextField source="logisNo" label="table.field.checkOrder.logisNo" />
- <TextField source="rleStatus$" label="table.field.checkOrder.rleStatus" sortable={false} />
+ <DateField source="arrTime" label="table.field.checkOrder.arrTime" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
@@ -179,31 +169,21 @@
</WrapperField>
</StyledDatagrid>
</List>
- {/* <OutOrderCreate
- open={manualDialog}
- setOpen={setManualDialog}
- /> */}
- {/* <SelectMatnrModal
+ <SelectMatnrModal
asnId={modalType}
billReload={billReload}
open={manualDialog}
setOpen={setManualDialog}
/>
- <OutOrderModal
- open={createDialog}
- setOpen={setCreateDialog}
- preview={preview}
- setPreview={setPreview}
- />
- <OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} />
- <OutOrderPreview open={preview} setOpen={setPreview} />
+ {/* <OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} />
+ <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 >
)
}
@@ -251,26 +231,13 @@
)
}
-const CreateByOrderButton = ({ setCreateDialog }) => {
- const record = useRecordContext();
- const notify = useNotify();
- const refresh = useRefresh();
- const createByOrder = async (event) => {
- event.stopPropagation();
- setCreateDialog(true);
- }
-
- return (
- <Button onClick={createByOrder} label={'toolbar.asnCreate'}> <AddIcon /> </Button>
- )
-}
const CancelButton = () => {
const record = useRecordContext();
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()
@@ -280,10 +247,11 @@
}
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();
--
Gitblit v1.9.1