From 5c90daa2c919f3f07df0a154ff91f0e015bf8d66 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 17:07:28 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx b/rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx
index 81df873..64f2008 100644
--- a/rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx
+++ b/rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx
@@ -31,6 +31,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ Button,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -39,6 +40,9 @@
import EmptyData from "../../../components/EmptyData";
import MyCreateButton from "../../../components/MyCreateButton";
import MyExportButton from '../../../components/MyExportButton';
+import ApiOutlinedIcon from '@mui/icons-material/ApiOutlined';
+import BillStatusField from '../../../components/BillStatusField';
+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';
@@ -62,12 +66,11 @@
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="orderCode" label="table.field.checkDiff.orderCode" />,
<SelectInput source="checkType" label="table.field.checkDiff.checkType"
choices={[
{ id: 0, name: '鏄庣洏' },
- { id: 1, name: '鏆楃洏' },
+ { id: 1, name: '鏆楃洏' },
]}
/>,
<NumberInput source="areaId" label="table.field.checkDiff.areaId" />,
@@ -75,7 +78,6 @@
<NumberInput source="anfme" label="table.field.checkDiff.anfme" />,
<NumberInput source="checkQty" label="table.field.checkDiff.checkQty" />,
<NumberInput source="exceStatus" label="table.field.checkDiff.exceStatus" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -90,7 +92,6 @@
const CheckDiffList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -106,7 +107,7 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.checkDiff"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -123,8 +124,8 @@
preferenceKey='checkDiff'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <CheckDiffPanel />}
- expandSingle={true}
+ expand={false}
+ expandSingle={false}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
@@ -134,21 +135,16 @@
<TextField source="areaName" label="table.field.checkDiff.areaName" />
<NumberField source="anfme" label="table.field.checkDiff.anfme" />
<NumberField source="checkQty" label="table.field.checkDiff.checkQty" />
- <NumberField source="exceStatus" label="table.field.checkDiff.exceStatus" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ {/* <NumberField source="exceStatus" label="table.field.checkDiff.exceStatus" /> */}
+ <NumberField source="updateBy$" label="common.field.updateBy" />
+ <NumberField source="createBy$" label="common.field.createBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <BillStatusField cellClassName="status" source="exceStatus" label="table.field.checkOrder.exceStatus" />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
</WrapperField>
</StyledDatagrid>
</List>
--
Gitblit v1.9.1