From 37e8e06c8d13146e62ef08d018d86443b9f42f00 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 24 二月 2025 14:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/basicInfo/companys/CompanysList.jsx | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/shipper/ShipperList.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
similarity index 65%
rename from rsf-admin/src/page/basicInfo/shipper/ShipperList.jsx
rename to rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
index facfcd5..dd3561b 100644
--- a/rsf-admin/src/page/basicInfo/shipper/ShipperList.jsx
+++ b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
@@ -34,13 +34,13 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import ShipperCreate from "./ShipperCreate";
-import ShipperPanel from "./ShipperPanel";
-import EmptyData from "@/page/components/EmptyData";
-import MyCreateButton from "@/page/components/MyCreateButton";
-import MyExportButton from '@/page/components/MyExportButton';
-import PageDrawer from "@/page/components/PageDrawer";
-import MyField from "@/page/components/MyField";
+import CompanysCreate from "./CompanysCreate";
+import CompanysPanel from "./CompanysPanel";
+import EmptyData from "../../components/EmptyData";
+import MyCreateButton from "../../components/MyCreateButton";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
+import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
@@ -63,8 +63,18 @@
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <TextInput source="uuid" label="table.field.shipper.uuid" />,
- <TextInput source="name" label="table.field.shipper.name" />,
+ <TextInput source="code" label="table.field.companys.code" />,
+ <TextInput source="name" label="table.field.companys.name" />,
+ <TextInput source="nameEn" label="table.field.companys.nameEn" />,
+ <TextInput source="breifCode" label="table.field.companys.breifCode" />,
+ <TextInput source="type" label="table.field.companys.type" />,
+ <TextInput source="contact" label="table.field.companys.contact" />,
+ <TextInput source="tel" label="table.field.companys.tel" />,
+ <TextInput source="email" label="table.field.companys.email" />,
+ <TextInput source="pcode" label="table.field.companys.pcode" />,
+ <TextInput source="province" label="table.field.companys.province" />,
+ <TextInput source="city" label="table.field.companys.city" />,
+ <TextInput source="address" label="table.field.companys.address" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
@@ -78,7 +88,7 @@
/>,
]
-const ShipperList = () => {
+const CompanysList = () => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
@@ -95,7 +105,7 @@
}),
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- title={"menu.shipper"}
+ title={"menu.companys"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
@@ -103,23 +113,33 @@
<TopToolbar>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
- <SelectColumnsButton preferenceKey='shipper' />
+ <SelectColumnsButton preferenceKey='companys' />
<MyExportButton />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
- preferenceKey='shipper'
+ preferenceKey='companys'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <ShipperPanel />}
+ expand={() => <CompanysPanel />}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
- <TextField source="uuid" label="table.field.shipper.uuid" />
- <TextField source="name" label="table.field.shipper.name" />
+ <TextField source="code" label="table.field.companys.code" />
+ <TextField source="name" label="table.field.companys.name" />
+ <TextField source="nameEn" label="table.field.companys.nameEn" />
+ <TextField source="breifCode" label="table.field.companys.breifCode" />
+ <TextField source="type" label="table.field.companys.type" />
+ <TextField source="contact" label="table.field.companys.contact" />
+ <TextField source="tel" label="table.field.companys.tel" />
+ <TextField source="email" label="table.field.companys.email" />
+ <TextField source="pcode" label="table.field.companys.pcode" />
+ <TextField source="province" label="table.field.companys.province" />
+ <TextField source="city" label="table.field.companys.city" />
+ <TextField source="address" label="table.field.companys.address" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
@@ -137,12 +157,12 @@
</WrapperField>
</StyledDatagrid>
</List>
- <ShipperCreate
+ <CompanysCreate
open={createDialog}
setOpen={setCreateDialog}
/>
<PageDrawer
- title='Shipper Detail'
+ title='Companys Detail'
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
@@ -151,4 +171,4 @@
)
}
-export default ShipperList;
+export default CompanysList;
--
Gitblit v1.9.1