From b415a174e2289ca9dd52364e39b7beb17030b1a6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 17:17:21 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/purchase/PurchaseList.jsx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
index 3cbbd27..df7db49 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
@@ -43,6 +43,7 @@
import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import ImportButton from "../../components/ImportButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -86,10 +87,8 @@
const PurchaseList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
-
const navigate = useNavigate();
const assign = (record) => {
navigate(`/purchaseItem?poId=${record.id}`);
@@ -115,6 +114,7 @@
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='purchase' />
+ <ImportButton value={'purchaseItem'} />
<MyExportButton />
</TopToolbar>
)}
@@ -131,6 +131,7 @@
<NumberField source="id" />
<TextField source="code" label="table.field.purchase.code" />
<TextField source="type$" label="table.field.purchase.type" />
+ <TextField source="wkType$" label="table.field.purchase.wkType" />
<TextField source="source" label="table.field.purchase.source" />
<DateField source="preArr" label="table.field.purchase.preArr" showTime />
<NumberField source="anfme" label="table.field.purchase.anfme" />
--
Gitblit v1.9.1