From f300ac5af5afc40c7a225768ad4cfa36ff99a11f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 19 七月 2025 13:50:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/check/CheckOrderItemList.jsx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderItemList.jsx b/rsf-admin/src/page/orders/check/CheckOrderItemList.jsx
index c4e97ff..1657f7e 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderItemList.jsx
@@ -39,6 +39,7 @@
import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle } from '@mui/material';
import { styled } from '@mui/material/styles';
import PageDrawer from "../../components/PageDrawer";
+import BillStatusField from '../../components/BillStatusField';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -142,7 +143,6 @@
<TextField source="splrBatch" label="table.field.outStockItem.splrBatch" />
<TextField source="splrCode" label="table.field.outStockItem.splrCode" />
<TextField source="splrName" label="table.field.outStockItem.splrName" />
- <BillStatusField cellClassName="status" source="exceStatus" label="table.field.checkOrder.exceStatus" />
<TextField source="packName" label="table.field.outStockItem.packName" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="updateBy$" label="common.field.updateBy" />
--
Gitblit v1.9.1