From 147d06e7b904c02c5e54f584ca147ea6e2c22496 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 19 七月 2025 11:08:37 +0800
Subject: [PATCH] 代码优化
---
rsf-admin/src/page/orders/outStock/OutStockPublic.jsx | 2 +-
rsf-admin/src/page/orders/check/checkDiffItem/CheckDiffItemList.jsx | 29 +++++++++++++++++++++--------
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 2 +-
rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx | 2 +-
rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx | 2 +-
5 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index acf72ae..119072d 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -187,7 +187,7 @@
}
const requestGetBody = async () => {
- const res = await request.post(`/asnOrderItem/page`, { asnId });
+ const res = await request.post(`/asnOrderItem/page`, { orderId: asnId });
if (res?.data?.code === 200) {
setTableData(res.data.data.records)
} else {
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx
index 16a4c28..1353f3b 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx
@@ -29,7 +29,7 @@
}, [asnId, maktx]);
const http = async (parmas) => {
- const res = await request.post('/asnOrderItem/page', { ...parmas, asnId });
+ const res = await request.post('/asnOrderItem/page', { ...parmas, orderId: asnId });
if (res?.data?.code === 200) {
setRows(res.data.data.records)
} else {
diff --git a/rsf-admin/src/page/orders/check/checkDiffItem/CheckDiffItemList.jsx b/rsf-admin/src/page/orders/check/checkDiffItem/CheckDiffItemList.jsx
index 9913099..16208cf 100644
--- a/rsf-admin/src/page/orders/check/checkDiffItem/CheckDiffItemList.jsx
+++ b/rsf-admin/src/page/orders/check/checkDiffItem/CheckDiffItemList.jsx
@@ -35,12 +35,10 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import CheckDiffItemCreate from "./CheckDiffItemCreate";
-import CheckDiffItemPanel from "./CheckDiffItemPanel";
-import EmptyData from "../../../components/EmptyData";
-import MyCreateButton from "../../../components/MyCreateButton";
import MyExportButton from '../../../components/MyExportButton';
import BillStatusField from '../../../components/BillStatusField';
+import ApiOutlinedIcon from '@mui/icons-material/ApiOutlined';
+import ConfirmButton from '../../../components/ConfirmButton';
import PageDrawer from "../../../components/PageDrawer";
import MyField from "../../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
@@ -127,7 +125,7 @@
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={true}
- omit={['id', 'checkId', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'checkId', 'createTime$', 'createBy$', 'memo']}
>
<NumberField source="id" />
<NumberField source="checkId" label="table.field.checkDiffItem.checkId" />
@@ -140,19 +138,34 @@
<TextField source="batch" label="table.field.checkDiffItem.batch" />
<NumberField source="anfme" label="table.field.checkDiffItem.anfme" />
<NumberField source="checkQty" label="table.field.checkDiffItem.checkQty" />
- <CheckDiffField source="diffQty" label="table.field.checkDiffItem.diffQty"/>
+ <CheckDiffField source="diffQty" label="table.field.checkDiffItem.diffQty" />
<TextField source="reason" label="table.field.checkDiffItem.reason" />
- <BillStatusField cellClassName="status" source="exceStatus" label="table.field.checkOrder.exceStatus" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
+ <BillStatusField cellClassName="status" source="exceStatus" label="table.field.checkOrder.exceStatus" />
+ <WrapperField cellClassName="opt" label="common.field.opt">
+ <CheckButton />
+ </WrapperField>
</StyledDatagrid>
</List>
</Box>
)
}
+
+const CheckButton = () => {
+ const record = useRecordContext();
+ const handleEditClick = (btn) => {
+ btn.stopPropagation()
+
+ }
+
+ return (
+ <ConfirmButton label={"ra.action.approved"} startIcon={<ApiOutlinedIcon />} onConfirm={handleEditClick} size={"small"} />
+ )
+}
+
export default CheckDiffItemList;
diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
index 2ad0ae0..719dbf8 100644
--- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
@@ -206,7 +206,7 @@
omit={['id', 'splrName', 'qty', 'poCode',]}
>
<NumberField source="id" />
- <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
+ <TextField source="asnCode" label="table.field.outStockItem.orderCode" />
<TextField source="poCode" label="table.field.outStockItem.poCode" />
<TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
<TextField source="maktx" label="table.field.outStockItem.maktx" />
diff --git a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
index 08e9a61..bc1906e 100644
--- a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
@@ -178,7 +178,7 @@
}
const requestGetBody = async () => {
- const res = await request.post(`/outStockItem/page`, { asnId });
+ const res = await request.post(`/outStockItem/page`, { orderId: asnId });
if (res?.data?.code === 200) {
setTableData(res.data.data.records)
} else {
--
Gitblit v1.9.1