From e56277542f60f386a109b1b072a1dbda390588fd Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 二月 2026 15:54:29 +0800
Subject: [PATCH] EXISTS 保持一致
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 242 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 172 insertions(+), 70 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index aed1c48..944d128 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -1,10 +1,12 @@
-import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
+import React, { useState, useRef, useEffect, useLayoutEffect, useMemo, useCallback } from "react";
import { useLocation, useNavigate } from 'react-router-dom';
+import { useTabDialogState, getDialogStatePath } from '@/context/TabDialogStateContext';
import {
List,
DatagridConfigurable,
SearchInput,
TopToolbar,
+ Toolbar,
SelectColumnsButton,
EditButton,
FilterButton,
@@ -36,26 +38,30 @@
Button,
useRedirect,
useUnselectAll,
+ useRecordSelection,
} from 'react-admin';
-import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
-import MyCreateButton from "../../components/MyCreateButton";
-import BillStatusField from '../../components/BillStatusField';
-import ConfirmButton from '../../components/ConfirmButton';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import EditIcon from '@mui/icons-material/Edit';
-import request from '@/utils/request';
+import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
+import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import DictionarySelect from "../../components/DictionarySelect";
+import BillStatusField from '../../components/BillStatusField';
+import MyCreateButton from "../../components/MyCreateButton";
+import PageEditDrawer from "../../components/PageEditDrawer";
+import ConfirmButton from '../../components/ConfirmButton';
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
-import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
-import AddIcon from '@mui/icons-material/Add';
-import OutOrderModal from "./OutOrderModal";
+import OutStockWaveDialog from "./OutStockWaveDialog";
+import AddTaskIcon from '@mui/icons-material/AddTask';
import PublicIcon from '@mui/icons-material/Public';
import SelectMatnrModal from "./SelectMatnrModal";
-import AddTaskIcon from '@mui/icons-material/AddTask';
-import PageEditDrawer from "../../components/PageEditDrawer";
+import EditIcon from '@mui/icons-material/Edit';
+import TaskIcon from '@mui/icons-material/Task';
+import OutOrderPreview from "./OutOrderPreview";
+import AddIcon from '@mui/icons-material/Add';
import OutStockPublic from "./OutStockPublic";
+import OutOrderModal from "./OutOrderModal";
+import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -77,47 +83,99 @@
},
}));
-const filters = [
- <SearchInput source="condition" alwaysOn />,
- <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_order_type', group: '2' }} label="table.field.outStock.type" alwaysOn>
- <AutocompleteInput label="table.field.outStock.type" optionValue="value" />
- </ReferenceInput>,
- <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type', group: '2' }} 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: ' 宸查噴鏀�' },
- ]}
- />,
-
- <TextInput label="common.field.memo" source="memo" />,
- <DictionarySelect
- label='table.field.outStock.exceStatus'
- name="exceStatus"
- dictTypeCode="sys_asn_exce_status"
- alwaysOn
- />,
-
-]
-
const OutOrderList = (props) => {
- const translate = useTranslate();
- const [createDialog, setCreateDialog] = useState(false);
+ const location = useLocation();
+ const tabDialogState = useTabDialogState();
+
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
+ const [createDialog, setCreateDialogInner] = useState(false);
const [manualDialog, setManualDialog] = useState(false);
+
+ const pathKey = getDialogStatePath(
+ location.pathname === '/' && typeof window !== 'undefined' && window.location?.hash
+ ? (window.location.hash.replace(/^#/, '') || '/')
+ : location.pathname
+ );
+
+ const setCreateDialog = useCallback((open) => {
+ setCreateDialogInner(open);
+ if (tabDialogState) {
+ const current = tabDialogState.getDialogState(pathKey) || {};
+ tabDialogState.setDialogState(pathKey, { ...current, createDialogOpen: open });
+ }
+ }, [pathKey, tabDialogState]);
+
+ const saveCreateDialogForm = useCallback((formData) => {
+ if (tabDialogState) {
+ const current = tabDialogState.getDialogState(pathKey) || {};
+ tabDialogState.setDialogState(pathKey, { ...current, createDialogOpen: true, createDialogForm: formData });
+ }
+ }, [pathKey, tabDialogState]);
+
+ const savedCreateFormData = tabDialogState?.getDialogState(pathKey)?.createDialogForm;
+
+ useLayoutEffect(() => {
+ if (tabDialogState) {
+ const saved = tabDialogState.getDialogState(pathKey);
+ if (saved?.createDialogOpen) {
+ setCreateDialogInner(true);
+ }
+ }
+ }, [pathKey, tabDialogState]);
const [drawerVal, setDrawerVal] = useState(false);
+ const [waveRule, setWaveRule] = useState(false);
+ const [selectIds, setSelectIds] = useState([]);
+ const [preview, setPreview] = useState(false);
const [modalType, setmodalType] = useState(0);
const [select, setSelect] = useState(0);
+ const translate = useTranslate();
+
+ const filters = [
+ <SearchInput source="condition" alwaysOn placeholder={translate('ra.action.search')} />,
+ <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_order_type', group: '2' }} label="table.field.outStock.type" alwaysOn>
+ <AutocompleteInput label="table.field.outStock.type" optionValue="value" />
+ </ReferenceInput>,
+ <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type', group: '2' }} 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: ' 宸查噴鏀�' },
+ ]}
+ />,
+
+ <TextInput label="common.field.memo" source="memo" />,
+ <DictionarySelect
+ label='table.field.outStock.exceStatus'
+ name="exceStatus"
+ dictTypeCode="sys_asn_exce_status"
+ alwaysOn
+ />,
+ ];
+ const refresh = useRefresh();
+ const notify = useNotify();
const billReload = useRef();
- const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
+
+ //鑾峰彇娉㈡瑙勫垯
+ const closeDialog = async (value) => {
+ setWaveRule(false)
+ const res = await request.post(`/outStock/generate/wave`, { ids: selectIds, waveRuleId: value.id });
+ if (res?.data?.code === 200) {
+ notify(res.data.msg);
+ } else {
+ notify(res.data.msg);
+ }
+ refresh()
+ }
+
return (
<Box display="flex">
<List
@@ -140,8 +198,7 @@
<CreateByOrderButton setCreateDialog={setCreateDialog} />
<MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
<SelectColumnsButton preferenceKey='outStock' />
- <ImportButton value={'outStock'} />
- {/* <MyExportButton /> */}
+ <ImportButton value={'outStockItem'} />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -149,10 +206,10 @@
<StyledDatagrid
sx={{ width: '100%' }}
preferenceKey='outStock'
- bulkActionButtons={<PublicTaskButton />}
+ bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.outStock.code" />
@@ -171,10 +228,15 @@
<BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt" >
- <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
- <EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
+ <OutOrderRowActions
+ setCreateDialog={setManualDialog}
+ setmodalType={setmodalType}
+ setDrawerVal={setDrawerVal}
+ drawerVal={drawerVal}
+ setSelect={setSelect}
+ />
<CancelButton />
- <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
+ <CompleteButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -191,13 +253,19 @@
<OutOrderModal
open={createDialog}
setOpen={setCreateDialog}
+ preview={preview}
+ setPreview={setPreview}
+ initialFormData={savedCreateFormData}
+ saveFormData={saveCreateDialogForm}
/>
+ <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}/>
+ <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
</PageEditDrawer>
</Box >
)
@@ -205,24 +273,16 @@
export default OutOrderList;
-const PublicTaskButton = () => {
+const PublicTaskButton = ({ setWaveRule, setSelectIds }) => {
const record = useRecordContext();
const { selectedIds, onUnselectItems } = useListContext();
const notify = useNotify();
- const refresh = useRefresh();
const redirect = useRedirect();
- const pubClick = async (event) => {
- event.stopPropagation();
+ const pubClick = async () => {
onUnselectItems();
- const res = await request.post(`/outStock/generate/wave`, { ids: selectedIds });
- if (res?.data?.code === 200) {
- notify(res.data.msg);
- redirect("/wave")
- } else {
- notify(res.data.msg);
- }
- refresh();
+ setWaveRule(true);
+ setSelectIds(selectedIds)
}
return (
@@ -230,8 +290,51 @@
onClick={pubClick}
label={"toolbar.createWave"}
startIcon={<PublicIcon />}
- />);
+ />
+ );
}
+
+//瀹屾垚鍗曟嵁
+const CompleteButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const requestComplete = async () => {
+ const { data: { code, data, msg } } = await request.get(`/outStock/complete/${record.id}`);
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (
+ // record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="secondary">
+ // <TaskIcon />
+ // </Button> : )
+ record.exceStatus != 15 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
+ )
+}
+
+/** 鍑哄簱鍗曟墽琛岀姸鎬侊細10=鍒濆鍖栵紙浠呮鐘舵�佹樉绀虹紪杈�/璇︽儏锛� */
+const OUT_STOCK_EXCE_STATUS_INIT = 10;
+
+const OutOrderRowActions = ({ setCreateDialog, setmodalType, setDrawerVal, drawerVal, setSelect }) => {
+ const record = useRecordContext();
+ const isInit = record?.exceStatus === OUT_STOCK_EXCE_STATUS_INIT || record?.exceStatus === '10';
+ return (
+ <>
+ {isInit && (
+ <>
+ <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
+ <EditButton label="toolbar.detail" icon={(<DetailsIcon />)} />
+ </>
+ )}
+ <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
+ </>
+ );
+};
const MyButton = ({ setCreateDialog, setmodalType }) => {
const record = useRecordContext();
@@ -257,7 +360,6 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
-
const createByOrder = async (event) => {
event.stopPropagation();
setCreateDialog(true);
@@ -298,6 +400,6 @@
}
return (
- record.workQty < record.anfme ? <ConfirmButton label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onConfirm={taskEvent} size={"small"} /> : <></>
+ record.workQty < record.anfme ? <Button label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onClick={taskEvent} size={"small"} /> : <></>
)
}
--
Gitblit v1.9.1