From 1dbfb930e943fede7adfffea8fd9977d894a903b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 08:57:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/system/user/RolesField.jsx | 2
rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx | 62 +++++++++++----
rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx | 2
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 10 +-
rsf-admin/src/page/orders/asnOrder/AsnOrderCreate.jsx | 4
rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx | 2
rsf-admin/src/page/orders/transfer/TransferCreate.jsx | 2
rsf-admin/src/page/system/user/UserList.jsx | 25 +++--
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 18 ++--
rsf-admin/src/page/work/outBound/OutBoundList.jsx | 2
rsf-admin/src/page/orders/check/SelectMatnrModal.jsx | 2
rsf-admin/src/page/system/user/UserListAside.jsx | 8 +-
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 39 +++++++--
rsf-admin/src/page/statistics/stockManage/WarehouseStockInfo.jsx | 2
rsf-admin/src/page/orders/asnOrder/POItemModal.jsx | 2
rsf-admin/src/page/stockManage/locRevise/LocReviseCreate.jsx | 2
rsf-admin/src/page/orders/transfer/ManualCreate.jsx | 2
rsf-admin/src/i18n/zh.js | 1
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 12 ++-
rsf-admin/src/i18n/en.js | 1
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 26 +++---
rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx | 12 ++
22 files changed, 155 insertions(+), 83 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index cc8b7ec..937d155 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -404,6 +404,7 @@
valid: "validity",
validWarn: "validityWarn",
flagCheck: "flagCheck",
+ tenantId: "tenantId",
},
matnrGroup: {
name: "name",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index d465106..41c7cda 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -433,6 +433,7 @@
valid: "淇濊川鏈�(澶�)",
validWarn: "鏁堟湡棰勮(澶�)",
flagCheck: "鍏嶆",
+ tenantId: "浣跨敤缁勭粐",
},
matnrGroup: {
name: "鐗╂枡鍒嗙粍鍚嶇О",
diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
index 732f9a8..d65f0c1 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -114,6 +114,8 @@
label="table.field.loc.areaId"
optionText="name"
filterToQuery={(val) => ({ name: val })}
+ sx={{ minWidth: 260 }}
+
/>
</ReferenceInput>,
<AutocompleteInput
@@ -232,11 +234,10 @@
{/* <NumberField source="flagLogic" label="table.field.loc.flagLogic" />
<TextField source="fucAtrrs" label="table.field.loc.fucAtrrs" />
*/}
- {/* <TextField source="unit" label="table.field.loc.unit" /> */}
- <TextField source="barcode" label="table.field.loc.barcode" />
- <TextField source="length" label="table.field.loc.length" />
+ {/* <TextField source="unit" label="table.field.loc.unit" /> */}
+ {/* <TextField source="length" label="table.field.loc.length" />
<TextField source="width" label="table.field.loc.width" />
- <TextField source="height" label="table.field.loc.height" />
+ <TextField source="height" label="table.field.loc.height" /> */}
<NumberField source="row" label="table.field.loc.row" />
<NumberField source="col" label="table.field.loc.col" />
<NumberField source="lev" label="table.field.loc.lev" />
@@ -247,12 +248,13 @@
<NumberField source="flagLabelMange" label="table.field.loc.flagLabelMange" />
<TextField source="locAttrs" label="table.field.loc.locAttrs" /> */}
<TextField source="useStatus$" label="table.field.loc.useStatus" />
- <TextField source="updateBy$" label="common.field.updateBy" />
+ <TextField source="barcode" label="table.field.loc.barcode" />
+ {/* <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime align="left" />
<TextField source="createBy$" label="common.field.createBy" />
- <DateField source="createTime" label="common.field.createTime" showTime align="left" />
+ <DateField source="createTime" label="common.field.createTime" showTime align="left" /> */}
<BooleanField source="statusBool" label="common.field.status" sortable={false} align="left" />
- <TextField source="memo" label="common.field.memo" sortable={false} />
+ {/* <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} /> */}
@@ -448,4 +450,4 @@
</>
)
-}
\ No newline at end of file
+}
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index ef49214..3e4b4c7 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -169,6 +169,10 @@
if (code === 200) {
const arr = [
<NumberField key="id" source="id" />,
+ // <TextField key="tenantId" source="tenantId" label="table.field.matnr.tenantId" />,
+ <ReferenceField key="tenantId" source="tenantId" label="table.field.matnr.tenantId" reference="tenant" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>,
<TextField key="code" source="code" label="table.field.matnr.code" />,
<TooltipField key="name" source="name" label="table.field.matnr.name" cellClassName="name" />,
// <TextField key="shipperId$" source="shipperId$" label="table.field.matnr.shipperId" />,
@@ -183,7 +187,7 @@
// <NumberField key="nromNum" source="nromNum" label="table.field.matnr.nromNum" />,
<TextField key="unit" source="unit" label="table.field.matnr.unit" />,
// <TextField key="purchaseUnit" source="purchaseUnit" label="table.field.matnr.purUnit" />,
- <TextField key="stockUnit" source="stockUnit" label="table.field.matnr.stockUnit" />,
+ // <TextField key="stockUnit" source="stockUnit" label="table.field.matnr.stockUnit" />,
// <TextField key="stockLeval$" source="stockLeval$" label="table.field.matnr.stockLevel" sortable={false} />,
// <TextField key="flagLabelMange$" source="flagLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />,
// <NumberField key="safeQty" source="safeQty" label="table.field.matnr.safeQty" />,
@@ -256,10 +260,10 @@
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>}
rowClick={(id, resource, record) => false}
- omit={['id', 'shipperId', 'platCode', 'model', 'weight', 'color', 'describle'
- , 'nromNum', 'unit', 'purchaseUnit', 'stockUnit', 'isLabelMange', 'safeQty'
+ omit={['id', 'shipperId', 'platCode', 'weight', 'color', 'describle'
+ , 'nromNum', 'purchaseUnit', 'isLabelMange', 'safeQty'
, 'minQty', 'maxQty', 'stagn', 'valid', 'validWarn', 'flagCheck', 'updateTime', 'updateBy'
- , 'createTime', 'createBy', 'memo', 'rglarId', 'groupId','statusBool', 'stockLeval$']}
+ , 'createTime', 'createBy', 'memo', 'rglarId', 'statusBool', 'stockLeval$']} //'stockUnit',
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderCreate.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderCreate.jsx
index 6ace1c2..e805509 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderCreate.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderCreate.jsx
@@ -135,7 +135,7 @@
validate={required()}
/>
</Grid> */}
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.asnOrder.logisNo"
source="logisNo"
@@ -147,7 +147,7 @@
label="table.field.asnOrder.arrTime"
source="arrTime"
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.asnOrder.rleStatus"
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
index 9a86482..7bd2671 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
@@ -72,19 +72,19 @@
{translate('common.edit.title.main')}
</Typography>
<Stack direction='row' gap={2}>
- <TextInput
+ {/* <TextInput
label="table.field.asnOrder.code"
source="code"
readOnly
parse={v => v}
- />
+ /> */}
<TextInput
label="table.field.asnOrder.poCode"
source="poCode"
readOnly
parse={v => v}
/>
- <AutocompleteInput
+ {/* <AutocompleteInput
choices={dicts}
optionText="label"
label="table.field.asnOrder.type"
@@ -92,7 +92,7 @@
optionValue="value"
parse={v => v}
readOnly
- />
+ /> */}
<AutocompleteInput
choices={business}
optionText="label"
@@ -101,14 +101,6 @@
optionValue="value"
parse={v => v}
readOnly
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.asnOrder.logisNo"
- source="logisNo"
- readOnly
- parse={v => v}
/>
<TextInput
label="table.field.asnOrder.anfme"
@@ -122,12 +114,50 @@
readOnly
parse={v => v}
/>
- <DateInput
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="閲囪喘缁勭粐" //table.field.asnOrder.purchaseOrgName
+ source="purchaseOrgName"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="閲囪喘鍛�" //table.field.asnOrder.purchaseOrgName
+ source="purchaseUserName"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="閲囪喘鏃ユ湡" //table.field.asnOrder.purchaseOrgName
+ source="purchaseDate"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="渚涘簲鍟嗙紪鐮�" //table.field.asnOrder.purchaseOrgName
+ source="supplierId"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="渚涘簲鍟�" //table.field.asnOrder.purchaseOrgName
+ source="supplierName"
+ readOnly
+ parse={v => v}
+ />
+ {/* <TextInput
+ label="table.field.asnOrder.logisNo"
+ source="logisNo"
+ readOnly
+ parse={v => v}
+ /> */}
+ {/* <DateInput
label="table.field.asnOrder.arrTime"
source="arrTime"
readOnly
- />
- <SelectInput
+ /> */}
+ {/* <SelectInput
label="table.field.asnOrder.rleStatus"
source="rleStatus"
readOnly
@@ -136,7 +166,7 @@
{ id: 1, name: ' 宸查噴鏀�' },
]}
validate={required()}
- />
+ /> */}
</Stack>
</Grid>
</Grid>
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 94f1c29..9b65ac7 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -169,17 +169,40 @@
const { isLoading } = useListContext();
const refresh = useRefresh();
useEffect(() => {
- getDynamicFields();
+ getDynamicFields();
}, []);
const getDynamicFields = async () => {
- const result = await fetchInOrderItemColumns();
- if (result.success) {
- setColumns(result.columns);
- } else {
- notify(result.msg);
- }
+ const result = await fetchInOrderItemColumns();
+ if (result.success) {
+ const hiddenSources = [
+ 'splrName',
+ 'businessTime', 'extendFields.[businessTime]',
+ 'wkType', 'extendFields.[wkType]',
+ 'type', 'extendFields.[type]',
+ 'priceUnitId',
+ 'id', 'orderId', 'orderCode', 'poCode', 'poId','wkType',
+ 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit',
+ 'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode',
+ 'supplierId', 'supplierName', 'shipperId',
+ 'updateTime', 'updateBy', 'updateBy$',
+ 'createTime', 'createBy', 'createBy$',
+ ];
+ const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
+ setColumns(columns);
+ } else {
+ notify(result.msg);
+ }
}
+
+ // const getDynamicFields = async () => {
+ // const result = await fetchInOrderItemColumns();
+ // if (result.success) {
+ // setColumns(result.columns);
+ // } else {
+ // notify(result.msg);
+ // }
+ // }
return (
<Box sx={{ position: 'relative', minHeight: "60vh", }}>
@@ -199,7 +222,7 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'orderId', 'orderCode', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
+ omit={['id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId', 'shipperId', 'businessTime', 'extendFields.[businessTime]', 'extendFields.[wkType]', 'extendFields.[type]']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 30787ea..ffe1aaf 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -164,7 +164,7 @@
{/* <TextField source="code" label="table.field.asnOrder.code" /> */}
<TextField source="poCode" label="table.field.asnOrder.poCode" />
<NumberField source="poId" label="table.field.asnOrder.poId" />
- <TextField source="type$" label="table.field.asnOrder.type" />
+ {/* <TextField source="type$" label="table.field.asnOrder.type" /> */}
<TextField cellClassName="wkType" source="wkType$" label="table.field.asnOrder.wkType" />
<NumberField source="anfme" label="table.field.asnOrder.anfme" />
<NumberField source="qty" label="table.field.asnOrder.qty" />
@@ -176,9 +176,9 @@
<TextField source="supplierId" label="渚涘簲鍟嗙紪鐮�" />
<TextField source="supplierName" label="渚涘簲鍟�" />
- <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
- <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
- <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
+ {/* <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime /> */}
+ {/* <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} /> */}
+ {/* <TextField source="logisNo" label="table.field.asnOrder.logisNo" /> */}
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
@@ -188,7 +188,7 @@
<WrapperField cellClassName="opt" label="common.field.opt" >
<EditButton label="toolbar.detail"></EditButton>
<MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
- <InspectionButton />
+ {/* <InspectionButton /> */}
<CompleteButton />
<ODeleteButton />
<PrintButton setPrintOrder={setPrintOrder} setSelect={setSelect} />
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index abe737c..b801437 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -263,7 +263,7 @@
onChange={(e) => handleChange(e.target.value, 'poCode')}
/>
</Grid>
- <Grid item md={2}>
+ {/* <Grid item md={2}>
<TextField
label={translate("table.field.asnOrder.logisNo")}
value={formData.logisNo}
@@ -278,7 +278,7 @@
value={formData.arrTime}
onChange={(e) => handleChange(e.target.value, 'arrTime')}
/>
- </Grid>
+ </Grid> */}
</Grid>
</Form>
</Box>
@@ -532,17 +532,17 @@
// ),
// headerClassName: "custom",
// },
- {
- field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName') + "*",
- minWidth: 100,
- flex: 1,
- editable: true,
- renderEditCell: (params) => (
- <SelectInputSplrNameEditCell {...params} />
- ),
- headerClassName: "custom",
- },
+ // {
+ // field: 'splrName',
+ // headerName: translate('table.field.asnOrderItem.splrName') + "*",
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // renderEditCell: (params) => (
+ // <SelectInputSplrNameEditCell {...params} />
+ // ),
+ // headerClassName: "custom",
+ // },
{
field: 'platItemId',
headerName: translate('table.field.asnOrderItem.platItemId') + "*",
diff --git a/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx b/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
index 65d8f88..9ca6c82 100644
--- a/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
@@ -394,7 +394,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
onRowSelectionModelChange={handleSelectionChange}
diff --git a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
index d8719bf..7e9a946 100644
--- a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
@@ -149,7 +149,14 @@
const getDynamicFields = async () => {
const result = await fetchInOrderItemColumns();
if (result.success) {
- setColumns(result.columns);
+ const hiddenSources = [
+ 'splrName',
+ 'businessTime', 'extendFields.[businessTime]',
+ 'wkType', 'extendFields.[wkType]',
+ 'type', 'extendFields.[type]'
+ ];
+ const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
+ setColumns(columns);
} else {
notify(result.msg);
}
@@ -173,7 +180,8 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'createBy', 'createTime']}
+ omit={['id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId', 'shipperId', 'businessTime', 'extendFields.[businessTime]', 'extendFields.[wkType]', 'extendFields.[type]']}
+ // omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'createBy', 'createTime']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
index a25c4c0..09a2daa 100644
--- a/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
@@ -553,7 +553,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
diff --git a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
index 75f916f..60a403d 100644
--- a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
@@ -570,7 +570,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
diff --git a/rsf-admin/src/page/orders/transfer/ManualCreate.jsx b/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
index 2990e16..99e66f5 100644
--- a/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
+++ b/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
@@ -487,7 +487,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
checkboxSelection
rowSelectionModel={tableIds}
diff --git a/rsf-admin/src/page/orders/transfer/TransferCreate.jsx b/rsf-admin/src/page/orders/transfer/TransferCreate.jsx
index a6a754e..c32c8fb 100644
--- a/rsf-admin/src/page/orders/transfer/TransferCreate.jsx
+++ b/rsf-admin/src/page/orders/transfer/TransferCreate.jsx
@@ -366,7 +366,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
diff --git a/rsf-admin/src/page/statistics/stockManage/WarehouseStockInfo.jsx b/rsf-admin/src/page/statistics/stockManage/WarehouseStockInfo.jsx
index b781f69..c6fd22f 100644
--- a/rsf-admin/src/page/statistics/stockManage/WarehouseStockInfo.jsx
+++ b/rsf-admin/src/page/statistics/stockManage/WarehouseStockInfo.jsx
@@ -396,7 +396,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
selectionModel={selectedRows}
diff --git a/rsf-admin/src/page/stockManage/locRevise/LocReviseCreate.jsx b/rsf-admin/src/page/stockManage/locRevise/LocReviseCreate.jsx
index 9ff7444..70791d8 100644
--- a/rsf-admin/src/page/stockManage/locRevise/LocReviseCreate.jsx
+++ b/rsf-admin/src/page/stockManage/locRevise/LocReviseCreate.jsx
@@ -534,7 +534,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
checkboxSelection
rowSelectionModel={tableIds}
diff --git a/rsf-admin/src/page/system/user/RolesField.jsx b/rsf-admin/src/page/system/user/RolesField.jsx
index ff7f221..54b16a0 100644
--- a/rsf-admin/src/page/system/user/RolesField.jsx
+++ b/rsf-admin/src/page/system/user/RolesField.jsx
@@ -25,4 +25,4 @@
)
}
-export default RolesField;
\ No newline at end of file
+export default RolesField;
diff --git a/rsf-admin/src/page/system/user/UserList.jsx b/rsf-admin/src/page/system/user/UserList.jsx
index 687d50a..9356a61 100644
--- a/rsf-admin/src/page/system/user/UserList.jsx
+++ b/rsf-admin/src/page/system/user/UserList.jsx
@@ -84,6 +84,9 @@
"& .opt": {
width: 200,
},
+ "& .roles": {
+ maxWidth: 400,
+ },
"& .column-statusBool": {
maxWidth: 60,
},
@@ -159,6 +162,7 @@
>
<NumberField source="id" />
<TextField source="username" label="table.field.user.username" />
+ <TextField source="nickname" label="table.field.user.nickname" />
<ReferenceField
source="deptId"
label="table.field.user.deptId"
@@ -167,10 +171,9 @@
sortable={false}
>
<TextField source="name" />
- </ReferenceField>
- <TextField source="nickname" label="table.field.user.nickname" />
- <TextField source="code" label="table.field.user.code" />
- <FunctionField
+ </ReferenceField>
+ {/* <TextField source="code" label="table.field.user.code" /> */}
+ {/* <FunctionField
label="table.field.user.sex"
sortable={false}
render={(record) => {
@@ -185,18 +188,18 @@
return "";
}
}}
- />
+ /> */}
<TextField source="phone" label="table.field.user.phone" />
- <TextField source="email" label="table.field.user.email" />
+ {/* <TextField source="email" label="table.field.user.email" />
<TextField source="realName" label="table.field.user.realName" />
<TextField source="idCard" label="table.field.user.idCard" />
- <TextField source="birthday" label="table.field.user.birthday" />
- <RolesField
+ <TextField source="birthday" label="table.field.user.birthday" /> */}
+ <RolesField cellClassName="roles"
source="roles"
label="table.field.user.role"
sortable={false}
/>
- <DateField
+ {/* <DateField
source="updateTime"
label="common.field.updateTime"
showTime
@@ -210,8 +213,8 @@
source="statusBool"
label="common.field.status"
sortable={false}
- />
- <TextField source="memo" label="common.field.memo" sortable={false} />
+ /> */}
+ {/* <TextField source="memo" label="common.field.memo" sortable={false} /> */}
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: "1px", fontSize: ".75rem" }} />
<DeleteButton
diff --git a/rsf-admin/src/page/system/user/UserListAside.jsx b/rsf-admin/src/page/system/user/UserListAside.jsx
index 7e44a1c..8cd587d 100644
--- a/rsf-admin/src/page/system/user/UserListAside.jsx
+++ b/rsf-admin/src/page/system/user/UserListAside.jsx
@@ -66,7 +66,7 @@
<SavedQueriesList icon={<BookmarkIcon />} />
<FilterLiveSearch source='condition' hiddenLabel />
- <FilterList
+ {/* <FilterList
label="filters.lastCreated"
icon={<AccessTimeIcon />}
>
@@ -112,13 +112,13 @@
timeEnd: subMonths(startOfMonth(new Date()), 1).toISOString(),
}}
/>
- </FilterList>
+ </FilterList> */}
- <FilterList label="table.field.user.sex" icon={<WcIcon />}>
+ {/* <FilterList label="table.field.user.sex" icon={<WcIcon />}>
<FilterListItem label="table.field.user.sexes.female" value={{ sex: '2' }} />
<FilterListItem label="table.field.user.sexes.male" value={{ sex: '1' }} />
<FilterListItem label="table.field.user.sexes.unknown" value={{ sex: '0' }} />
- </FilterList>
+ </FilterList> */}
<FilterList label="table.field.user.role" icon={<StyleIcon />}>
{roles.map(role => {
diff --git a/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx b/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
index 89f8a5e..8c58bb9 100644
--- a/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
+++ b/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
@@ -332,7 +332,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
checkboxSelection = {false}
onRowSelectionModelChange={handleSelectionChange}
diff --git a/rsf-admin/src/page/work/outBound/OutBoundList.jsx b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
index 1831c4f..bdc4ed7 100644
--- a/rsf-admin/src/page/work/outBound/OutBoundList.jsx
+++ b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
@@ -351,7 +351,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
checkboxSelection = {false}
onRowSelectionModelChange={handleSelectionChange}
--
Gitblit v1.9.1