From d2ea33b96cb1394b5546b1bfc557c1c984e4bc5b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 12:36:50 +0800
Subject: [PATCH] 出库单明细功能优化
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index f5b9dd5..dfff8b0 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -56,7 +56,7 @@
import ExitToAppIcon from '@mui/icons-material/ExitToApp';
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
-
+import CancelIcon from '@mui/icons-material/Cancel';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -79,18 +79,20 @@
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" />,
- <TextInput source="type" label="table.field.asnOrder.type" />,
- <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.asnOrder.wkType">
- <AutocompleteInput label="table.field.asnOrder.wkType" optionValue="value" />
+ <TextInput source="code" label="table.field.outStock.code" alwaysOn />,
+ <TextInput source="poCode" label="table.field.outStock.poCode" />,
+ <NumberInput source="poId" label="table.field.outStock.poId" />,
+ <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.outStock.type" alwaysOn>
+ <AutocompleteInput label="table.field.outStock.type" optionValue="value" />
</ReferenceInput>,
- <NumberInput source="anfme" label="table.field.asnOrder.anfme" />,
- <NumberInput source="qty" label="table.field.asnOrder.qty" />,
- <TextInput source="logisNo" label="table.field.asnOrder.logisNo" />,
- <DateInput source="arrTime" label="table.field.asnOrder.arrTime" />,
- <SelectInput source="rleStatus" label="table.field.asnOrder.rleStatus"
+ <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.outStock.wkType" alwaysOn>
+ <AutocompleteInput label="table.field.outStock.wkType" optionValue="value" />
+ </ReferenceInput>,
+ <NumberInput source="anfme" label="table.field.outStock.anfme" />,
+ <NumberInput source="qty" label="table.field.outStock.qty" />,
+ <TextInput source="logisNo" label="table.field.outStock.logisNo" />,
+ <DateInput source="arrTime" label="table.field.outStock.arrTime" />,
+ <SelectInput source="rleStatus" label="table.field.outStock.rleStatus"
choices={[
{ id: 0, name: ' 姝ｅ父' },
{ id: 1, name: ' 宸查噴鏀�' },
@@ -99,7 +101,7 @@
<TextInput label="common.field.memo" source="memo" />,
<DictionarySelect
- label='table.field.asnOrder.exceStatus'
+ label='table.field.outStock.exceStatus'
name="exceStatus"
dictTypeCode="sys_asn_exce_status"
alwaysOn
@@ -131,14 +133,14 @@
title={"menu.outStock"}
empty={<EmptyData onClick={() => { setCreateDialog(true); setmodalType(0) }} />}
filters={filters}
- filter={{deleted: 0, type: 'out'}}
+ filter={{ deleted: 0, type: 'out' }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
<SelectColumnsButton preferenceKey='outStock' />
- <ImportButton value={'asnOrderItem'} />
+ <ImportButton value={'asnOrderItem'} />
<MyExportButton />
</TopToolbar>
)}
@@ -177,6 +179,7 @@
<WrapperField cellClassName="opt" label="common.field.opt" >
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
<MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
+ <CancelButton></CancelButton>
{/* <CompleteButton /> */}
</WrapperField>
</StyledDatagrid>
@@ -242,12 +245,32 @@
)
}
+const CancelButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+ const cancelOrder = async () => {
+ const { data: { code, data, msg } } = await request.post(`/outStock/cancel/${record.id}`);
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (
+ <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelIcon />} onConfirm={cancelOrder} />
+ )
+}
+
const CloseButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
const requestClose = async () => {
- const { data: { code, data, msg } } = await request.post(`/asnOrder/close/${record.id}`);
+ const { data: { code, data, msg } } = await request.post(`/outStock/close/${record.id}`);
if (code === 200) {
notify(msg);
--
Gitblit v1.9.1