From 98ff050915a395abcbbc3a7263a4540f30cf1fb8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 11 七月 2025 17:00:21 +0800
Subject: [PATCH] #前端
---
rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx | 4 +-
rsf-admin/src/page/orders/stock/OrderList.jsx | 2
rsf-admin/src/page/system/serialRule/SerialRuleList.jsx | 2
rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx | 2
rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx | 7 +++
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 8 +++
rsf-admin/src/page/system/config/ConfigEdit.jsx | 4 +-
rsf-admin/src/page/locItem/LocItemList.jsx | 10 ++++-
rsf-admin/src/page/system/config/ConfigList.jsx | 2
rsf-admin/src/page/locItem/LocItemEdit.jsx | 4 +-
rsf-admin/src/page/locItem/LocQueryList.jsx | 7 +++
rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx | 15 +++++++
rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx | 15 +++++--
13 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/rsf-admin/src/page/locItem/LocItemEdit.jsx b/rsf-admin/src/page/locItem/LocItemEdit.jsx
index 9336316..0274fb8 100644
--- a/rsf-admin/src/page/locItem/LocItemEdit.jsx
+++ b/rsf-admin/src/page/locItem/LocItemEdit.jsx
@@ -186,14 +186,14 @@
</Grid>
</Grid>
</Grid>
- <Grid item xs={12} md={2}>
+ {/* <Grid item xs={12} md={2}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput readOnly />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/locItem/LocItemList.jsx b/rsf-admin/src/page/locItem/LocItemList.jsx
index 8cce6c2..49f35cc 100644
--- a/rsf-admin/src/page/locItem/LocItemList.jsx
+++ b/rsf-admin/src/page/locItem/LocItemList.jsx
@@ -61,6 +61,11 @@
display: 'block',
width: 'auto',
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
@@ -107,7 +112,7 @@
source="useStatus"
optionValue="value"
parse={v => v}
- alwaysOn
+
/>,
<TextInput source="code" label="table.field.loc.code" />,
<AutocompleteInput
@@ -161,6 +166,7 @@
title={"menu.locItem"}
empty={false}
filters={filters}
+ filter={{ useStatus: 'F' }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
@@ -176,7 +182,7 @@
align="left"
bulkActionButtons={false}
rowClick={() => false}
- omit={['id', 'createTime', 'createBy', 'memo', 'updateTime', 'updateBy']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'updateTime', 'updateBy','statusBool','length','width','height']}
>
<NumberField source="id" />
<NumberField source="warehouseId$" label="table.field.loc.warehouseId" />
diff --git a/rsf-admin/src/page/locItem/LocQueryList.jsx b/rsf-admin/src/page/locItem/LocQueryList.jsx
index c429df6..64efb9d 100644
--- a/rsf-admin/src/page/locItem/LocQueryList.jsx
+++ b/rsf-admin/src/page/locItem/LocQueryList.jsx
@@ -52,6 +52,11 @@
'& .opt': {
width: 100
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -205,7 +210,7 @@
rowClick={false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime','spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'splrBatch','createBy', 'memo', 'fieldsIndex']}
+ omit={['id', 'createTime','spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'splrBatch','createBy$', 'memo', 'fieldsIndex','statusBool']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/orders/stock/OrderList.jsx b/rsf-admin/src/page/orders/stock/OrderList.jsx
index bd7c9d8..77918a1 100644
--- a/rsf-admin/src/page/orders/stock/OrderList.jsx
+++ b/rsf-admin/src/page/orders/stock/OrderList.jsx
@@ -116,7 +116,7 @@
bulkActionButtons={false}
rowClick='edit'
expandSingle={false}
- omit={['id', 'createTime', 'sourceId', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'sourceId', 'createBy$', 'memo','statusBool','opt']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.stock.code" />
diff --git a/rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx b/rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx
index dd6f42a..9570f91 100644
--- a/rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx
+++ b/rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx
@@ -54,9 +54,16 @@
},
'& .column-name': {
},
- '& .opt': {
- width: 180
- },
+
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ },
+ '& .opt': {
+ width: 180,
+ whiteSpace: 'normal',
+ }
}));
@@ -232,7 +239,7 @@
rowClick={false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'locId', 'spec', 'model', 'locCode', 'orderId', 'orderItemId', 'matnrId', 'splrBatch', 'createBy', 'memo', 'fieldsIndex']}
+ omit={['id', 'createTime', 'locId', 'spec', 'model', 'locCode', 'orderId', 'orderItemId', 'matnrId', 'splrBatch', 'createBy', 'memo', 'fieldsIndex','updateBy$']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/system/config/ConfigEdit.jsx b/rsf-admin/src/page/system/config/ConfigEdit.jsx
index ef2cfe8..dc3a4ee 100644
--- a/rsf-admin/src/page/system/config/ConfigEdit.jsx
+++ b/rsf-admin/src/page/system/config/ConfigEdit.jsx
@@ -107,14 +107,14 @@
/>
</Stack>
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/system/config/ConfigList.jsx b/rsf-admin/src/page/system/config/ConfigList.jsx
index 7dee9f5..aec1c63 100644
--- a/rsf-admin/src/page/system/config/ConfigList.jsx
+++ b/rsf-admin/src/page/system/config/ConfigList.jsx
@@ -121,7 +121,7 @@
preferenceKey='config'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'memo']}
+ omit={['id', 'createTime', 'memo','statusBool']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.config.uuid" />
diff --git a/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx b/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
index f735912..1216cf4 100644
--- a/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
@@ -125,7 +125,7 @@
setSelect(record)
setEditDialog(true)
}}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy$', 'memo','statusBool']}
>
<NumberField source="id" />
<TextField source="dictTypeId" label="table.field.dictData.dictTypeId" />
diff --git a/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx b/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
index e5b7332..eae0f86 100644
--- a/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
@@ -39,6 +39,7 @@
import MyCreateButton from "../../../components/MyCreateButton";
import MyExportButton from '../../../components/MyExportButton';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { width } from "@mui/system";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -51,6 +52,18 @@
},
'& .opt': {
width: 200
+ },
+
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ },
+ '& .column-description': {
+ maxWidth: '25em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
},
}));
@@ -106,7 +119,7 @@
preferenceKey='dictType'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={'edit'}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy$', 'memo','statusBool']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.dictType.code"
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
index e950bb9..beacb3b 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
@@ -110,14 +110,14 @@
/>
</Stack>
</Grid>
- <Grid item xs={8} md={2}>
+ {/* <Grid item xs={8} md={2}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx
index a4a436d..1a8d836 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx
@@ -69,6 +69,11 @@
"& .opt": {
width: 200,
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -142,7 +147,7 @@
setSelect(record)
setEditDialog(true)
}}
- omit={["id", "ruleId", "createTime", "createBy", "memo"]}
+ omit={["id", "ruleId", "createTime", "createBy$", "memo",'statusBool']}
>
<NumberField source="id" />
<NumberField
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
index 0e8a0c5..4b943f2 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
@@ -143,7 +143,7 @@
<BulkDeleteButton mutationMode={OPERATE_MODE} />
)}
rowClick={'edit'}
- omit={["id", "createTime", "createBy", "memo"]}
+ omit={["id", "createTime", "createBy$", "memo",'statusBool']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.serialRule.code" />
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index eab6bc6..607c6db 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -60,6 +60,11 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -248,7 +253,8 @@
preferenceKey='warehouseAreasItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId', 'platWorkCode', 'projectCode']}
+ omit={['prodTime','unit','platOrderCode','trackCode','id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$',
+ 'weight', 'matnrId', 'batch', 'shipperId', 'splrId', 'platWorkCode', 'projectCode','statusBool']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1