From d329d3764120f1caa5932f69654248331604a890 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 09:59:01 +0800
Subject: [PATCH] 盘点功能代码优化
---
rsf-admin/src/page/orders/check/CheckOrderList.jsx | 68 +++++-----------------------------
1 files changed, 10 insertions(+), 58 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderList.jsx b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
index 228316d..47ea727 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderList.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
@@ -38,6 +38,8 @@
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 CheckOrderModal from "./CheckOrderModal";
import EditIcon from '@mui/icons-material/Edit';
import AddIcon from '@mui/icons-material/Add';
import request from '@/utils/request';
@@ -65,25 +67,14 @@
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'
@@ -97,7 +88,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,10 +130,9 @@
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}
@@ -157,14 +146,12 @@
>
<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 cellClassName="wkType" 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" />
@@ -175,27 +162,20 @@
<MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
<CancelButton />
- <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
</WrapperField>
</StyledDatagrid>
</List>
- {/* <OutOrderCreate
+ {/* <CheckOrderCreate
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} />
+ {/* <OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} />
<OutOrderPreview open={preview} setOpen={setPreview} />
<PageEditDrawer
title={"toolbar.publicWorking"}
@@ -251,19 +231,6 @@
)
}
-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();
@@ -281,20 +248,5 @@
return (
record?.exceStatus == 10 ? <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