From c81fc5e2a4f4153be2bb8602ed14a0743e6ecd29 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 11:14:50 +0800
Subject: [PATCH] RCS对接优化
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 76 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 8934fe5..6d23aa5 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -1,5 +1,6 @@
-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,
@@ -83,10 +84,44 @@
}));
const OutOrderList = (props) => {
+ const location = useLocation();
+ const tabDialogState = useTabDialogState();
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
- const [createDialog, setCreateDialog] = useState(false);
+ 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([]);
@@ -160,8 +195,8 @@
actions={(
<TopToolbar>
<FilterButton />
- <CreateByOrderButton setCreateDialog={setCreateDialog} />
- <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
+ {/* <CreateByOrderButton setCreateDialog={setCreateDialog} /> 閫氳繃鍗曟嵁鍒涘缓鏆備笉浣跨敤 */}
+ {/* <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} /> 娣诲姞鎸夐挳鏆備笉浣跨敤 */}
<SelectColumnsButton preferenceKey='outStock' />
<ImportButton value={'outStockItem'} />
</TopToolbar>
@@ -181,9 +216,9 @@
<TextField source="poCode" label="table.field.outStock.poCode" />
<TextField source="type$" label="table.field.outStock.type" />
<TextField cellClassName="wkType" source="wkType$" label="table.field.outStock.wkType" />
- <NumberField source="anfme" label="table.field.outStock.anfme" />
- <NumberField source="workQty" label="table.field.outStock.workQty" />
- <NumberField source="qty" label="table.field.outStock.qty" />
+ <NumberField source="anfme" label="table.field.outStock.anfme" options={{ minimumFractionDigits: 2, maximumFractionDigits: 2 }} />
+ <NumberField source="workQty" label="table.field.outStock.workQty" options={{ minimumFractionDigits: 2, maximumFractionDigits: 2 }} />
+ <NumberField source="qty" label="table.field.outStock.qty" options={{ minimumFractionDigits: 2, maximumFractionDigits: 2 }} />
<TextField source="logisNo" label="table.field.outStock.logisNo" />
<TextField source="rleStatus$" label="table.field.outStock.rleStatus" sortable={false} />
<TextField source="updateBy$" label="common.field.updateBy" />
@@ -193,11 +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 />
<CompleteButton />
- <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
</WrapperField>
</StyledDatagrid>
</List>
@@ -216,6 +255,8 @@
setOpen={setCreateDialog}
preview={preview}
setPreview={setPreview}
+ initialFormData={savedCreateFormData}
+ saveFormData={saveCreateDialogForm}
/>
<OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} />
<OutOrderPreview open={preview} setOpen={setPreview} />
@@ -276,6 +317,21 @@
)
}
+/** 鍑哄簱鍗曟墽琛岀姸鎬侊細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();
const handleEditClick = (btn) => {
--
Gitblit v1.9.1