From 16a09540001bd00f01b848f0ca125d16bf314450 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/check/CheckOrderList.jsx | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderList.jsx b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
index b9cee96..766d057 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderList.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
@@ -24,7 +24,7 @@
ReferenceInput,
AutocompleteInput,
Button,
- BulkDeleteButton,
+ BulkDeleteButton,
useRedirect,
} from 'react-admin';
import { styled } from '@mui/material/styles';
@@ -141,15 +141,16 @@
>
<StyledDatagrid
preferenceKey='check'
- bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic"/>}
+ bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic" />}
rowClick={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.checkOrder.code" />
- <TextField source="type$" label="table.field.checkOrder.type" />
- <TextField cellClassName="wkType" source="checkType$" label="table.field.checkOrder.checkType" />
+ {/* <TextField source="type$" label="table.field.checkOrder.type" /> */}
+ <TextField cellClassName="wkType" source="wkType$" label="table.field.checkOrder.type" />
+ <TextField source="checkType$" label="table.field.checkOrder.checkType" />
<NumberField source="anfme" label="table.field.checkOrder.anfme" />
<NumberField source="workQty" label="table.field.checkOrder.workQty" />
<NumberField source="qty" label="table.field.checkOrder.qty" />
@@ -181,8 +182,8 @@
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
- <CheckOrderPub record={select} open={drawerVal} setOpen={setDrawerVal} />
- </PageEditDrawer>
+ <CheckOrderPub record={select} open={drawerVal} setOpen={setDrawerVal} />
+ </PageEditDrawer>
</Box >
)
}
--
Gitblit v1.9.1