From 72139f39a0845f8de31fd44bc5dd7077df17d48e Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期一, 05 一月 2026 09:56:29 +0800
Subject: [PATCH] 仓库和库区页面优化
---
rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx | 50 +--
rsf-admin/src/page/orders/preparation/MatPreparationPublic.jsx | 9
rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx | 4
rsf-admin/src/i18n/core/chineseMessages.js | 6
rsf-admin/src/page/locPreview/LocPreviewList.jsx | 63 +++++
rsf-admin/src/page/orders/preparation/MatPreparationList.jsx | 16
rsf-admin/src/page/orders/preparation/MatPreparationPanel.jsx | 39 ++
rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx | 123 +++++----
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx | 90 +++---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 2
rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx | 179 ++++++++++----
rsf-admin/src/themes/ThemeSwapper.jsx | 4
rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx | 10
rsf-admin/src/i18n/zh.js | 33 +-
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 4
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 28 +-
rsf-admin/src/page/orders/preparation/MatPreparationItemList.jsx | 51 ++-
17 files changed, 448 insertions(+), 263 deletions(-)
diff --git a/rsf-admin/src/i18n/core/chineseMessages.js b/rsf-admin/src/i18n/core/chineseMessages.js
index 228f551..59a0d7d 100644
--- a/rsf-admin/src/i18n/core/chineseMessages.js
+++ b/rsf-admin/src/i18n/core/chineseMessages.js
@@ -126,9 +126,9 @@
skip_nav: "Skip to content",
},
sort: {
- sort_by: "Sort by %{field} %{order}",
- ASC: "ascending",
- DESC: "descending",
+ sort_by: "鎸夌収 \"%{field}\" %{order}",
+ ASC: "鍗囧簭鎺掑垪",
+ DESC: "闄嶅簭鎺掑垪",
},
auth: {
auth_check_error: "Please login to continue",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 67ea0fd..6563ae3 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -162,7 +162,7 @@
locItem: '搴撳瓨鏄庣粏',
locType: '搴撲綅绫诲瀷(搴�)',
locArea: '閫昏緫鍒嗗尯(搴�)',
- locAreaMat: '閫昏緫鍒嗗尯(搴�)',
+ locAreaMat: '閫昏緫鍒嗗尯',
locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
container: '瀹瑰櫒绠＄悊(搴�)',
contract: '鍚堝悓淇℃伅(搴�)',
@@ -175,7 +175,7 @@
serialRule: '缂栫爜瑙勫垯',
asnOrder: '鍏ュ簱閫氱煡鍗�',
asnOrderItem: '鏀惰揣鏄庣粏',
- asnOrderLog: '鏀惰揣鍘嗗彶鍗�',
+ asnOrderLog: '鍘嗗彶閫氱煡鍗�',
asnOrderItemLog: '鏀惰揣鍘嗗彶鏄庣粏',
purchase: 'PO鍗�',
purchaseItem: 'PO鍗曟槑缁�',
@@ -184,7 +184,7 @@
fieldsItem: '鎵╁睍瀛楁鏄庣粏',
warehouseAreasItem: '鏀惰揣搴撳瓨',
deviceSite: '璺緞绠＄悊',
- waitPakin: '缁勬墭閫氱煡妗�',
+ waitPakin: '缁勬墭妗�',
waitPakinItem: '缁勬墭妗ｆ槑缁�',
waitPakinLog: '缁勬墭鍘嗗彶妗�',
waitPakinItemLog: '缁勬墭鍘嗗彶妗ｆ槑缁�',
@@ -221,7 +221,7 @@
transfer: '璋冩嫈鍗�',
transferItem: '璋冩嫈鍗曟槑缁�',
locRevise: '搴撳瓨璋冩暣',
- statisticReport: '鏃ュ織鎶ヨ〃',
+ statisticReport: '鎶ヨ〃绠＄悊',
locDeadReport: '搴撳瓨鍋滄粸鎶ヨ〃',
stockStatistic: '鏃ュ叆搴撴眹鎬绘煡璇�',
outStatistic: '鏃ュ嚭搴撴眹鎬绘煡璇�',
@@ -232,7 +232,9 @@
preparation: '澶囨枡鍗�',
check: '鐩樼偣绠＄悊',
abnormal: '寮傚父绠＄悊',
- platform: '骞冲彴绠＄悊'
+ platform: '骞冲彴绠＄悊',
+ freeze: '搴撳瓨鍐荤粨',
+ transferPoces: '璋冩嫧绠＄悊',
},
table: {
field: {
@@ -419,7 +421,7 @@
warehouse: {
name: "浠撳簱鍚嶇О",
code: "浠撳簱缂栫爜",
- factory: "宸ュ巶",
+ factory: "浣跨敤缁勭粐",
address: "鍦板潃",
longitude: "缁忓害",
latgitude: "绾害",
@@ -437,7 +439,7 @@
supplierId: "渚涘簲鍟�",
flagMinus: "鍏佽璐熷簱瀛�",
flagLabelMange: "鏍囩绠＄悊",
- flagMix: "娣锋斁",
+ flagMix: "鍏佽娣锋斁",
},
warehouseAreasItem: {
asnCode: '鍗曞彿',
@@ -648,7 +650,7 @@
},
asnOrder: {
code: "ASN鍗曞彿",
- poCode: "PO缂栫爜",
+ poCode: "鍗曟嵁缂栫爜",
poId: "PO鏍囪瘑",
type: "鍗曟嵁绫诲瀷",
wkType: "涓氬姟绫诲瀷",
@@ -662,12 +664,12 @@
},
outStock: {
code: "鍑哄簱鍗曞彿",
- poCode: "DO鍗曞彿",
+ poCode: "鍗曟嵁缂栫爜",
poId: "DO鏍囪瘑",
type: "绫诲瀷",
wkType: "涓氬姟绫诲瀷",
- anfme: "鏁伴噺",
- workQty: '鎵ц鏁�',
+ anfme: "搴斿嚭鏁伴噺",
+ workQty: '瀹炲嚭鏁伴噺',
qty: "瀹屾垚鏁�",
logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
@@ -788,7 +790,7 @@
orderId: "涓诲崟鏍囪瘑",
orderCode: "鍗曞彿",
poDetlId: "PO鍗旾D",
- poDetlCode: "PO鍗�",
+ poDetlCode: "鍗曟嵁缂栫爜",
platItemId: '琛屽彿',
matnrId: "鐗╂枡鏍囪瘑",
platOrderCode: '瀹㈡埛鍗曞彿',
@@ -820,19 +822,19 @@
outStockItem: {
orderId: "涓诲崟鏍囪瘑",
orderCode: "鍗曞彿",
- poCode: 'DO鍗曞彿',
+ poCode: '鍗曟嵁缂栫爜',
poDetlId: "骞冲彴鏄庣粏ID",
poDetlCode: "DO鍗�",
matnrId: "鐗╂枡鏍囪瘑",
maktx: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
platOrderCode: '瀹㈠崟鍙�',
- anfme: "璁″垝鍑哄簱鏁�",
+ anfme: "搴斿嚭鏁伴噺",
stockUnit: "搴撳瓨鍗曚綅",
workQty: '宸插嚭鏁伴噺',
purQty: "涓嬪崟鏁伴噺",
purUnit: "鍗曚綅",
- qty: "瀹屾垚鏁伴噺",
+ qty: "瀹炲嚭鏁伴噺",
splrBatch: "鎵规",
splrCode: "渚涘簲鍟嗙紪鐮�",
splrName: "渚涘簲鍟嗗悕绉�",
@@ -1402,6 +1404,7 @@
recover: "缁х画鏀惰揣",
modiftySite: '淇敼搴撳彛',
selectWave: '娉㈡瑙勫垯',
+ transformation: "杞崲",
},
placeholder: {
warehouseAreasCode: "鐢ㄤ簬搴撲綅缂栫爜鍓嶇紑鍗犱綅绗�",
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index daf37a0..458b4de 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -114,11 +114,11 @@
<TextInput
label="table.field.warehouse.address"
source="address"
- validate={[required()]}
+ // validate={[required()]}
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.warehouse.longitude"
source="longitude"
@@ -143,7 +143,7 @@
label="table.field.warehouse.height"
source="height"
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
@@ -155,8 +155,8 @@
parse={v => v}
fullWidth
multiline
- minRows={2}
- autoFocus
+ // minRows={2}
+ // autoFocus
/>
{/* <Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index 292d1a1..57a42ef 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
@@ -70,14 +70,6 @@
source="factory"
validate={[required()]}
parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.warehouse.name"
- source="name"
- validate={[required()]}
- parse={v => v}
autoFocus
/>
</Stack>
@@ -89,16 +81,23 @@
parse={v => v}
/>
</Stack>
-
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.warehouse.name"
+ source="name"
+ validate={[required()]}
+ parse={v => v}
+ />
+ </Stack>
<Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouse.address"
source="address"
- validate={[required()]}
+ // validate={[required()]}
parse={v => v}
/>
</Stack>
- <Stack direction='row' gap={2}>
+ {/* <Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouse.longitude"
source="longitude"
@@ -126,21 +125,24 @@
label="table.field.warehouse.height"
source="height"
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<SelectInput
label="common.field.status"
source="status"
+ validate={[required()]}
choices={[
{ id: '1', name: 'common.enums.statusTrue' },
{ id: '0', name: 'common.enums.statusFalse' },
]}
resettable
/>
+ </Stack>
+ <Stack direction='row' gap={2}>
<TextInput
label="common.field.memo"
source="memo"
- validate={[required()]}
+ // validate={[required()]}
parse={v => v}
/>
</Stack>
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
index 2a73389..a72b962 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
@@ -70,33 +70,30 @@
// }));
const filters = [
- <SearchInput source="condition" alwaysOn />,
-
- <TextInput source="name" label="table.field.warehouse.name" />,
- <TextInput source="code" label="table.field.warehouse.code" />,
+ <SearchInput source="condition" placeholder="鎼滅储浠撳簱鍚嶇О" alwaysOn />,
<TextInput source="factory" label="table.field.warehouse.factory" />,
- <TextInput source="address" label="table.field.warehouse.address" />,
- <TextInput source="longitude" label="table.field.warehouse.longitude" />,
- <TextInput source="latgitude" label="table.field.warehouse.latgitude" />,
- <NumberInput source="length" label="table.field.warehouse.length" />,
- <NumberInput source="width" label="table.field.warehouse.width" />,
- <NumberInput source="height" label="table.field.warehouse.height" />,
-
- <TextInput label="common.field.memo" source="memo" />,
- <SelectInput
- label="common.field.status"
- source="status"
- choices={[
- { id: '1', name: 'common.enums.statusTrue' },
- { id: '0', name: 'common.enums.statusFalse' },
- ]}
- resettable
- />,
+ <TextInput source="code" label="table.field.warehouse.code" />,
+ <TextInput source="name" label="table.field.warehouse.name" />,
+ // <TextInput source="address" label="table.field.warehouse.address" />,
+ // <TextInput source="longitude" label="table.field.warehouse.longitude" />,
+ // <TextInput source="latgitude" label="table.field.warehouse.latgitude" />,
+ // <NumberInput source="length" label="table.field.warehouse.length" />,
+ // <NumberInput source="width" label="table.field.warehouse.width" />,
+ // <NumberInput source="height" label="table.field.warehouse.height" />,
+ // <TextInput label="common.field.memo" source="memo" />,
+ // <SelectInput
+ // label="common.field.status"
+ // source="status"
+ // choices={[
+ // { id: '1', name: 'common.enums.statusTrue' },
+ // { id: '0', name: 'common.enums.statusFalse' },
+ // ]}
+ // resettable
+ // />,
]
const WarehouseList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -129,19 +126,18 @@
preferenceKey='warehouse'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- omit={['id', 'factory', 'createTime', 'createBy', 'memo', 'longitude', 'latgitude', 'length', 'width', 'height']}
+ omit={['id', 'updateTime', 'updateBy', 'createTime', 'createBy', 'longitude', 'latgitude', 'length', 'width', 'height']}
>
<NumberField source="id" />
+ <TextField source="factory" label="table.field.warehouse.factory" />
<TextField source="code" label="table.field.warehouse.code" />
<TextField source="name" label="table.field.warehouse.name" />
<TextField source="address" label="table.field.warehouse.address" />
- <TextField source="factory" label="table.field.warehouse.factory" />
- <TextField source="longitude" label="table.field.warehouse.longitude" />
+ {/* <TextField source="longitude" label="table.field.warehouse.longitude" />
<TextField source="latgitude" label="table.field.warehouse.latgitude" />
<NumberField source="length" label="table.field.warehouse.length" />
<NumberField source="width" label="table.field.warehouse.width" />
- <NumberField source="height" label="table.field.warehouse.height" />
-
+ <NumberField source="height" label="table.field.warehouse.height" /> */}
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
index af584fa..59ef899 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
@@ -64,7 +64,7 @@
property={record.address}
/>
</Grid>
- <Grid item xs={3}>
+ {/* <Grid item xs={3}>
<PanelTypography
title="table.field.warehouse.longitude"
property={record.longitude}
@@ -93,7 +93,7 @@
title="table.field.warehouse.height"
property={record.height}
/>
- </Grid>
+ </Grid> */}
</Grid>
</CardContent>
diff --git a/rsf-admin/src/page/locPreview/LocPreviewList.jsx b/rsf-admin/src/page/locPreview/LocPreviewList.jsx
index a30d41a..6ee064f 100644
--- a/rsf-admin/src/page/locPreview/LocPreviewList.jsx
+++ b/rsf-admin/src/page/locPreview/LocPreviewList.jsx
@@ -201,6 +201,8 @@
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} label="toolbar.detail" />
+ {/* <LocButton sx={{ padding: '1px', fontSize: '.75rem' }} ></LocButton>
+ <UnLockButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /><UnLockButton /> */}
</WrapperField>
</StyledDatagrid>
</List>
@@ -208,4 +210,63 @@
)
}
-export default LocPreviewList;
\ No newline at end of file
+export default LocPreviewList;
+
+/**
+ * 鎿嶄綔
+ * @returns
+ */
+const LocButton = (props) => {
+ // const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const clickComplete = () => {
+ completeTask(record)
+ };
+ //瀹屾垚浠诲姟
+ const completeTask = async (row) => {
+ const { data: { code, data, msg } } = await request.post(`task/complete/` + row.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ <ConfirmButton label={"鍐荤粨"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />
+ )
+}
+
+/**
+ * 鍙栨秷鎸夐挳
+ * @returns
+ */
+const UnLockButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const clickCancel = () => {
+ cancleTask(record)
+ };
+ //鍙栨秷浠诲姟
+ const cancleTask = async (row) => {
+ const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 107 || record.taskType == 103 || record.taskType == 11) ?
+ <ConfirmButton
+ onConfirm={clickCancel}
+ startIcon={<CancelIcon />}
+ label={"toolbar.cancel"}>
+ </ConfirmButton>
+ :
+ <></>
+ )
+}
\ No newline at end of file
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 0edff6f..f6588e0 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -217,7 +217,7 @@
<TextField source="nickname" />
</ReferenceField>,
<DateField source="createTime" label="common.field.createTime" showTime />,
- <TextField source="memo" label="common.field.memo" sortable={false} />,
+ // <TextField source="memo" label="common.field.memo" sortable={false} />,
]
setColumns([...arr, ...fields, ...lastArr]);
} else {
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 814e17b..580c415 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -72,7 +72,7 @@
'& .column-name': {
},
'& .opt': {
- width: 220
+ width: 420
},
'& .wkType': {
width: 110
@@ -190,7 +190,6 @@
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
- <BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
<TextField source="memo" label="common.field.memo" sortable={false} />
{/* 閾跺骇鏂板 */}
@@ -200,6 +199,7 @@
<TextField source="customerId" label="瀹㈡埛缂栫爜" />
<TextField source="customerName" label="瀹㈡埛" />
+ <BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
<WrapperField cellClassName="opt" label="common.field.opt" >
<MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
diff --git a/rsf-admin/src/page/orders/preparation/MatPreparationItemList.jsx b/rsf-admin/src/page/orders/preparation/MatPreparationItemList.jsx
index 86a8c30..1f3317e 100644
--- a/rsf-admin/src/page/orders/preparation/MatPreparationItemList.jsx
+++ b/rsf-admin/src/page/orders/preparation/MatPreparationItemList.jsx
@@ -49,10 +49,10 @@
<SearchInput source="condition" alwaysOn />,
// <DateInput label='common.time.after' source="timeStart" />,
// <DateInput label='common.time.before' source="timeEnd" />,
- <NumberInput source="taskId" label="table.field.taskItem.taskId" />,
- <NumberInput source="orderId" label="table.field.taskItem.orderId" />,
- <NumberInput source="orderType" label="table.field.taskItem.orderType" />,
- <NumberInput source="orderItemId" label="table.field.taskItem.orderItemId" />,
+ // <NumberInput source="taskId" label="table.field.taskItem.taskId" />,
+ // <NumberInput source="orderId" label="table.field.taskItem.orderId" />,
+ // <NumberInput source="orderType" label="table.field.taskItem.orderType" />,
+ // <NumberInput source="orderItemId" label="table.field.taskItem.orderItemId" />,
<NumberInput source="matnrId" label="table.field.taskItem.matnrId" />,
<TextInput source="maktx" label="table.field.taskItem.maktx" />,
<TextInput source="matnrCode" label="table.field.taskItem.matnrCode" />,
@@ -142,24 +142,31 @@
const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
if (code == 200) {
const arr = [
- <NumberField source="id" />,
- // <NumberField source="taskId" label="table.field.taskItem.taskId" />,
- // <NumberField source="orderId" label="table.field.taskItem.orderId" />,
- // <NumberField source="orderType$" label="table.field.taskItem.orderType" />,
- // <NumberField source="wkType$" label="table.field.taskItem.wkType" />,
- <NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />,
- <NumberField source="matnrId" label="table.field.taskItem.matnrId" />,
- <TextField source="maktx" label="table.field.taskItem.maktx" />,
- <TextField source="matnrCode" label="table.field.taskItem.matnrCode" />,
- <TextField source="unit" label="table.field.taskItem.unit" />,
- <NumberField source="anfme" label="table.field.taskItem.anfme" />,
- <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
- <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
- <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
- <TextField source="batch" label="table.field.taskItem.batch" />,
- <TextField source="isptResult$" label="table.field.taskItem.isptResult" />,
- <TextField source="spec" label="table.field.taskItem.spec" />,
- <TextField source="model" label="table.field.taskItem.model" />,
+ <TextField source="matnrCode" label="鐗╂枡缂栫爜" />,
+ <TextField source="maktx" label="鐗╂枡鍚嶇О" />,
+ <TextField source="spec" label="瑙勬牸" />,
+ <TextField source="unit" label="鍗曚綅" />,
+ <TextField source="anfme" label="鏁伴噺" />,
+
+
+ // <NumberField source="id" />,
+ // // <NumberField source="taskId" label="table.field.taskItem.taskId" />,
+ // // <NumberField source="orderId" label="table.field.taskItem.orderId" />,
+ // // <NumberField source="orderType$" label="table.field.taskItem.orderType" />,
+ // // <NumberField source="wkType$" label="table.field.taskItem.wkType" />,
+ // <NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />,
+ // <NumberField source="matnrId" label="table.field.taskItem.matnrId" />,
+ // <TextField source="maktx" label="table.field.taskItem.maktx" />,
+ // <TextField source="matnrCode" label="table.field.taskItem.matnrCode" />,
+ // <TextField source="unit" label="table.field.taskItem.unit" />,
+ // <NumberField source="anfme" label="table.field.taskItem.anfme" />,
+ // <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ // <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ // <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
+ // <TextField source="batch" label="table.field.taskItem.batch" />,
+ // <TextField source="isptResult$" label="table.field.taskItem.isptResult" />,
+ // <TextField source="spec" label="table.field.taskItem.spec" />,
+ // <TextField source="model" label="table.field.taskItem.model" />,
]
const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
const lastArr = [
diff --git a/rsf-admin/src/page/orders/preparation/MatPreparationList.jsx b/rsf-admin/src/page/orders/preparation/MatPreparationList.jsx
index 206a82d..58580fc 100644
--- a/rsf-admin/src/page/orders/preparation/MatPreparationList.jsx
+++ b/rsf-admin/src/page/orders/preparation/MatPreparationList.jsx
@@ -58,9 +58,9 @@
width: 248
},
'& .MuiTableCell-root': {
- whiteSpace: 'nowrap',
- overflow: 'visible',
- textOverflow: 'unset'
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
}
}));
@@ -144,7 +144,7 @@
sort={{ field: "sort", order: "desc" }}
actions={(
<TopToolbar>
- <BulkAutoStartButton autoExce={autoExce} setAutoExce={setAutoExce}/>
+ {/* <BulkAutoStartButton autoExce={autoExce} setAutoExce={setAutoExce}/> */}
<BulkAutoPauseButton autoExce={autoExce} setAutoExce={setAutoExce} />
<FilterButton />
<SelectColumnsButton preferenceKey='preparation' />
@@ -158,7 +158,7 @@
rowClick={false}
expand={<MatPreparationPanel />}
expandSingle={true}
- omit={['id', 'sort', 'taskCode', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status','warehType$']}
+ omit={['id', 'sort', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status','warehType$']}
>
<NumberField source="id" />
<TextField source="taskCode" label="澶囨枡鍙�" />
@@ -188,11 +188,11 @@
<TextField source="memo" label="common.field.memo" sortable={false} /> */}
<WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
<EditButton label="toolbar.detail" />
- <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
+ <DoneButton title="杞崲" label="杞崲" sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
<CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
<CheckButton />
<PickButton />
- <SetTopButton />
+ {/* <SetTopButton /> */}
</WrapperField>
</StyledDatagrid>
</List>
@@ -311,7 +311,7 @@
}
}
return (
- ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) || (record?.taskType == 11 && record?.taskStatus == 101) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
+ ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) || (record?.taskType == 11 && record?.taskStatus == 101) ? (<ConfirmButton label={"杞崲"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
)
}
diff --git a/rsf-admin/src/page/orders/preparation/MatPreparationPanel.jsx b/rsf-admin/src/page/orders/preparation/MatPreparationPanel.jsx
index 7939c3b..3892186 100644
--- a/rsf-admin/src/page/orders/preparation/MatPreparationPanel.jsx
+++ b/rsf-admin/src/page/orders/preparation/MatPreparationPanel.jsx
@@ -28,6 +28,32 @@
'& .opt': {
width: 200
},
+ // 娣诲姞鍒楀鏍峰紡
+ '& .col-code': {
+ width: 120,
+ minWidth: 120,
+ maxWidth: 150,
+ },
+ '& .col-name': {
+ width: 180,
+ minWidth: 150,
+ maxWidth: 250,
+ },
+ '& .col-spec': {
+ width: 120,
+ minWidth: 120,
+ maxWidth: 200,
+ },
+ '& .col-unit': {
+ width: 80,
+ minWidth: 60,
+ maxWidth: 100,
+ },
+ '& .col-quantity': {
+ width: 100,
+ minWidth: 80,
+ maxWidth: 120,
+ },
}));
const MatPreparationPanel = () => {
@@ -60,11 +86,16 @@
expandSingle
omit={['id', 'taskId', 'createTime', 'createBy$', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
>
- <NumberField source="id" />
- {/* <NumberField source="taskId" label="table.field.taskItem.taskId" /> */}
+ <TextField source="matnrCode" label="鐗╂枡缂栫爜" cellClassName="col-code" />,
+ <TextField source="maktx" label="鐗╂枡鍚嶇О" cellClassName="col-name" />,
+ {/* <TextField source="spec" label="瑙勬牸" cellClassName="col-spec" />, */}
+ {/* <TextField source="unit" label="鍗曚綅" cellClassName="col-unit" />, */}
+ <TextField source="anfme" label="鏁伴噺" cellClassName="col-quantity" />,
+ {/* <NumberField source="id" />
+ <NumberField source="taskId" label="table.field.taskItem.taskId" />
<NumberField source="orderId" label="table.field.preparationItem.orderId" />
<NumberField source="orderType$" label="table.field.preparationItem.orderType" />
- {/* <TextField source="sourceCode" label="table.field.taskItem.sourceCode" /> */}
+ <TextField source="sourceCode" label="table.field.taskItem.sourceCode" />
<NumberField source="orderItemId" label="table.field.preparationItem.orderItemId" />
<NumberField source="matnrId" label="table.field.preparationItem.matnrId" />
<TextField source="maktx" label="table.field.preparationItem.maktx" />
@@ -73,7 +104,7 @@
<NumberField source="anfme" label="table.field.preparationItem.anfme" />
<TextField source="batch" label="table.field.preparationItem.batch" />
<TextField source="spec" label="table.field.preparationItem.spec" />
- <TextField source="model" label="table.field.preparationItem.model" />
+ <TextField source="model" label="table.field.preparationItem.model" /> */}
{/* <TextField source="updateBy$" label="common.field.updateBy"/>
<TextField source="createBy$" label="common.field.createBy"/>
<DateField source="updateTime" label="common.field.updateTime" showTime />
diff --git a/rsf-admin/src/page/orders/preparation/MatPreparationPublic.jsx b/rsf-admin/src/page/orders/preparation/MatPreparationPublic.jsx
index a1cfb21..c40f37d 100644
--- a/rsf-admin/src/page/orders/preparation/MatPreparationPublic.jsx
+++ b/rsf-admin/src/page/orders/preparation/MatPreparationPublic.jsx
@@ -208,7 +208,12 @@
</>}
omit={['id', 'splrName', 'qty', 'poCode',]}
>
- <NumberField source="id" />
+ <TextField source="matnrCode" label="鐗╂枡缂栫爜" />,
+ <TextField source="maktx" label="鐗╂枡鍚嶇О" />,
+ <TextField source="spec" label="瑙勬牸" />,
+ <TextField source="unit" label="鍗曚綅" />,
+ <TextField source="anfme" label="鏁伴噺" />,
+ {/* <NumberField source="id" />
<TextField source="asnCode" label="table.field.outStockItem.orderCode" />
<TextField source="poCode" label="table.field.outStockItem.poCode" />
<TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
@@ -217,7 +222,7 @@
<NumberField source="workQty" label="table.field.outStockItem.workQty" />
<NumberField source="qty" label="table.field.outStockItem.qty" />
<TextField source="stockUnit" label="table.field.outStockItem.stockUnit" />
- <TextField source="splrName" label="table.field.outStockItem.splrName" />
+ <TextField source="splrName" label="table.field.outStockItem.splrName" /> */}
</StyledDatagrid>
</List>
</Card>
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
index f7af039..3cf95b4 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
@@ -92,32 +92,9 @@
<DialogContent sx={{ mt: 2 }}>
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={12} display="flex" gap={1}>
- <TextInput
- label="table.field.warehouseAreas.name"
- source="name"
- validate={[required()]}
- parse={(v) => v}
- />
- <TextInput
- label="table.field.warehouseAreas.code"
- source="code"
- validate={[required()]}
- parse={(v) => v}
- placeholder={translate("placeholder.warehouseAreasCode")}
- />
- <AutocompleteInput
- choices={dicts}
- optionText="label"
- label="table.field.warehouseAreas.type"
- source="type"
- optionValue="value"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={12} display="flex" gap={1}>
<ReferenceInput
source="warehouseId"
- reference="warehouse"
+ reference="warehouse"
>
<AutocompleteInput
label="table.field.warehouseAreas.wareId"
@@ -126,7 +103,59 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
-
+ <TextInput
+ label="table.field.warehouseAreas.code"
+ source="code"
+ validate={[required()]}
+ parse={(v) => v}
+ placeholder={translate("placeholder.warehouseAreasCode")}
+ />
+ <TextInput
+ label="table.field.warehouseAreas.name"
+ source="name"
+ validate={[required()]}
+ parse={(v) => v}
+ />
+ </Grid>
+ <Grid item xs={12} display="flex" gap={1}>
+ <AutocompleteInput
+ choices={dicts}
+ optionText="label"
+ label="table.field.warehouseAreas.type"
+ source="type"
+ optionValue="value"
+ parse={v => v}
+ validate={[required()]}
+ />
+ {/* <SelectInput
+ label="table.field.warehouseAreas.flagLabelMange"
+ source="flagLabelMange"
+ validate={[required()]}
+ choices={[
+ { id: 0, name: " 鍚�" },
+ { id: 1, name: " 鏄�" },
+ ]}
+ /> */}
+ <SelectInput
+ label="table.field.warehouseAreas.flagMix"
+ source="flagMix"
+ validate={[required()]}
+ choices={[
+ { id: 0, name: "鍚�" },
+ { id: 1, name: "鏄�" },
+ ]}
+ />
+ <SelectInput
+ label="table.field.warehouseAreas.flagMinus"
+ source="flagMinus"
+ validate={[required()]}
+ choices={[
+ { id: 0, name: "鍚�" },
+ { id: 1, name: "鏄�" },
+ ]}
+ />
+ </Grid>
+ <Grid item xs={12} display="flex" gap={1}>
<ReferenceInput source="shipperId" reference="companys" filter={{ type: 'shipper' }}>
<AutocompleteInput
label="table.field.warehouseAreas.shipperId"
@@ -142,44 +171,22 @@
/>
</ReferenceInput>
</Grid>
- <Grid item xs={12} display="flex" gap={1}>
- <SelectInput
- label="table.field.warehouseAreas.flagMinus"
- source="flagMinus"
- validate={[required()]}
- choices={[
- { id: 0, name: "鍚�" },
- { id: 1, name: "鏄�" },
- ]}
- />
- <SelectInput
- label="table.field.warehouseAreas.flagLabelMange"
- source="flagLabelMange"
- validate={[required()]}
- choices={[
- { id: 0, name: " 鍚�" },
- { id: 1, name: " 鏄�" },
- ]}
- />
- <SelectInput
- label="table.field.warehouseAreas.flagMix"
- source="flagMix"
- validate={[required()]}
- choices={[
- { id: 0, name: "鍚�" },
- { id: 1, name: "鏄�" },
- ]}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <StatusSelectInput />
- </Grid>
<Grid item xs={12} display="flex" gap={1}>
+ <StatusSelectInput />
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ parse={v => v}
+ // fullWidth
+ multiline
+ />
+ </Grid>
+ {/* <Grid item xs={12} display="flex" gap={1}>
<Stack direction="column" spacing={1} width={"100%"}>
<MemoInput />
</Stack>
- </Grid>
+ </Grid> */}
</Grid>
</DialogContent>
<DialogActions
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
index db033ef..aea80ce 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
@@ -61,8 +61,8 @@
defaultValues={{}}
// validate={(values) => { }}
>
- <Grid container width={{ xs: '100%', xl: '100%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={16} md={10}>
+ <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={1} columnSpacing={3}>
+ <Grid item xs={12} md={6} display="flex" flexDirection="column" gap={1} sx={{ '& .MuiFormControl-root': { mb: 0 } }}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
@@ -75,28 +75,11 @@
autoFocus
/>
</Stack> */}
- <Stack xs={16} direction='row' gap={2}>
- <TextInput
- label="table.field.warehouseAreas.name"
- source="name"
- validate={[required()]}
- parse={v => v}
- />
- <TextInput
- label="table.field.warehouseAreas.code"
- source="code"
- validate={[required()]}
- parse={v => v}
- />
- <DictionarySelect
- label='table.field.warehouseAreas.type'
- name="type"
- dictTypeCode="sys_ware_areas_type"
- alwaysOn
- />
+ <Stack direction='row' gap={2}>
<ReferenceInput
source="warehouseId"
reference="warehouse"
+ autoFocus
>
<AutocompleteInput
label="table.field.warehouseAreas.wareId"
@@ -107,6 +90,103 @@
/>
</ReferenceInput>
</Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.warehouseAreas.code"
+ source="code"
+ validate={[required()]}
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.warehouseAreas.name"
+ source="name"
+ validate={[required()]}
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <DictionarySelect
+ label='table.field.warehouseAreas.type'
+ name="type"
+ dictTypeCode="sys_ware_areas_type"
+ alwaysOn
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.warehouseAreas.flagMix"
+ source="flagMix"
+ validate={[required()]}
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.warehouseAreas.flagMinus"
+ source="flagMinus"
+ validate={[required()]}
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ />
+ </Stack>
+ {/* <Stack direction='row' gap={2}>
+ <ReferenceInput
+ source="shipperId"
+ reference="companys"
+ filter={{ type: 'shipper' }}
+ >
+ <AutocompleteInput
+ label="table.field.warehouseAreas.shipperId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <ReferenceInput
+ source="supplierId"
+ reference="companys"
+ filter={{ type: 'supplier' }}
+ >
+ <AutocompleteInput
+ label="table.field.warehouseAreas.supplierId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <StatusSelectInput />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ parse={v => v}
+ multiline
+ />
+ </Stack> */}
+ </Grid>
+ {/* <Grid item xs={8} md={2}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.common')}
+ </Typography>
+ <StatusSelectInput />
+ <Box mt="2em" />
+ <MemoInput />
+ </Grid> */}
+ <Grid item xs={12} md={6} display="flex" flexDirection="column" gap={1} sx={{ '& .MuiFormControl-root': { mb: 0 } }}>
+ <Typography variant="h6" gutterBottom>
+
+ {/* {translate('common.edit.title.main')} */}
+ </Typography>
<Stack direction='row' gap={2}>
<ReferenceInput
source="shipperId"
@@ -119,6 +199,17 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
+ {/* <SelectInput
+ label="table.field.warehouseAreas.flagLabelMange"
+ source="flagLabelMange"
+ validate={[required()]}
+ choices={[
+ { id: 0, name: ' 鍚�' },
+ { id: 1, name: ' 鏄�' },
+ ]}
+ /> */}
+ </Stack>
+ <Stack direction='row' gap={2}>
<ReferenceInput
source="supplierId"
reference="companys"
@@ -130,42 +221,28 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
+ </Stack>
+ <Stack direction='row' gap={2}>
+ {/* <StatusSelectInput /> */}
<SelectInput
- label="table.field.warehouseAreas.flagMinus"
- source="flagMinus"
+ label="common.field.status"
+ source="status"
validate={[required()]}
choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
]}
- />
- <SelectInput
- label="table.field.warehouseAreas.flagLabelMange"
- source="flagLabelMange"
- validate={[required()]}
- choices={[
- { id: 0, name: ' 鍚�' },
- { id: 1, name: ' 鏄�' },
- ]}
- />
- <SelectInput
- label="table.field.warehouseAreas.flagMix"
- source="flagMix"
- validate={[required()]}
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
+ resettable
/>
</Stack>
- </Grid>
- <Grid item xs={8} md={2}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.common')}
- </Typography>
- <StatusSelectInput />
- <Box mt="2em" />
- <MemoInput />
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ parse={v => v}
+ multiline
+ />
+ </Stack>
</Grid>
</Grid>
</SimpleForm>
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index 2ab6e3b..4e3ce12 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
@@ -67,7 +67,7 @@
}));
const filters = [
- <SearchInput source="condition" alwaysOn />,
+ <SearchInput source="condition" placeholder="鎼滅储搴撳尯鍚嶇О" alwaysOn />,
<ReferenceInput
source="warehouseId"
label="table.field.loc.warehouseId"
@@ -79,42 +79,41 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>,
- <TextInput source="uuid" label="table.field.warehouseAreas.uuid" />,
- <TextInput source="name" label="table.field.warehouseAreas.name" />,
+ // <TextInput source="uuid" label="table.field.warehouseAreas.uuid" />,
<TextInput source="code" label="table.field.warehouseAreas.code" />,
+ <TextInput source="name" label="table.field.warehouseAreas.name" />,
<ReferenceInput source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper">
<AutocompleteInput label="table.field.warehouseAreas.shipperId" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<NumberInput source="supplierId" label="table.field.warehouseAreas.supplierId" />,
- <SelectInput source="flagMinus" label="table.field.warehouseAreas.flagMinus"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- />,
- <SelectInput source="flagLabelMange" label="table.field.warehouseAreas.flagLabelMange"
- choices={[
- { id: 0, name: ' 鍚�' },
- { id: 1, name: ' 鏄�' },
- ]}
- />,
- <SelectInput source="flagMix" label="table.field.warehouseAreas.flagMix"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- />,
-
- <TextInput label="common.field.memo" source="memo" />,
- <SelectInput
- label="common.field.status"
- source="status"
- choices={[
- { id: '1', name: 'common.enums.statusTrue' },
- { id: '0', name: 'common.enums.statusFalse' },
- ]}
- resettable
- />,
+ // <SelectInput source="flagMinus" label="table.field.warehouseAreas.flagMinus"
+ // choices={[
+ // { id: 0, name: '鍚�' },
+ // { id: 1, name: '鏄�' },
+ // ]}
+ // />,
+ // <SelectInput source="flagLabelMange" label="table.field.warehouseAreas.flagLabelMange"
+ // choices={[
+ // { id: 0, name: ' 鍚�' },
+ // { id: 1, name: ' 鏄�' },
+ // ]}
+ // />,
+ // <SelectInput source="flagMix" label="table.field.warehouseAreas.flagMix"
+ // choices={[
+ // { id: 0, name: '鍚�' },
+ // { id: 1, name: '鏄�' },
+ // ]}
+ // />,
+ // <TextInput label="common.field.memo" source="memo" />,
+ // <SelectInput
+ // label="common.field.status"
+ // source="status"
+ // choices={[
+ // { id: '1', name: 'common.enums.statusTrue' },
+ // { id: '0', name: 'common.enums.statusFalse' },
+ // ]}
+ // resettable
+ // />,
]
const WarehouseAreasList = () => {
@@ -147,9 +146,6 @@
)}
perPage={DEFAULT_PAGE_SIZE}
>
-
-
-
<StyledDatagrid
preferenceKey='warehouseAreas'
bulkActionButtons={
@@ -161,23 +157,17 @@
</>
}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo','statusBool','flagMix$','flagLabelMange$','shipperId$','supplierId']}
+ omit={['id', 'createTime', 'createBy', 'statusBool', 'flagLabelMange$','shipperId$','supplierId', 'updateBy', 'updateTime']}
>
<NumberField source="id" />
- {/* <TextField source="uuid" label="table.field.warehouseAreas.uuid" /> */}
- <TextField source="code" label="table.field.warehouseAreas.code" />
- <TextField source="name" label="table.field.warehouseAreas.name" />
-
- <TextField source="type$" label="table.field.warehouseAreas.type"/>
- {/* <ReferenceField source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper" link={false} sortable={false}>
- <TextField source="name" />
- </ReferenceField> */}
<TextField source="warehouseId$" label="table.field.warehouseAreas.wareId" />
+ <TextField source="code" label="table.field.warehouseAreas.code" />
+ <TextField source="name" label="table.field.warehouseAreas.name" />
+ <TextField source="type$" label="table.field.warehouseAreas.type"/>
<TextField source="shipperId$" label="table.field.warehouseAreas.shipperId" />
<NumberField source="supplierId" label="table.field.warehouseAreas.supplierId" />
- <TextField source="flagMinus$" label="table.field.warehouseAreas.flagMinus" sortable={false} />
- <TextField source="flagLabelMange$" label="table.field.warehouseAreas.flagLabelMange" sortable={false} />
<TextField source="flagMix$" label="table.field.warehouseAreas.flagMix" sortable={false} />
+ <TextField source="flagMinus$" label="table.field.warehouseAreas.flagMinus" sortable={false} />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
@@ -186,12 +176,18 @@
<TextField source="nickname" />
</ReferenceField>
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ {/* <BooleanField source="statusBool" label="common.field.status" 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} />
</WrapperField>
+
+ {/* <TextField source="flagLabelMange$" label="table.field.warehouseAreas.flagLabelMange" sortable={false} /> */}
+ {/* <TextField source="uuid" label="table.field.warehouseAreas.uuid" /> */}
+ {/* <ReferenceField source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField> */}
</StyledDatagrid>
</List>
diff --git a/rsf-admin/src/themes/ThemeSwapper.jsx b/rsf-admin/src/themes/ThemeSwapper.jsx
index 1d0707b..c726222 100644
--- a/rsf-admin/src/themes/ThemeSwapper.jsx
+++ b/rsf-admin/src/themes/ThemeSwapper.jsx
@@ -41,7 +41,7 @@
</IconButton>
</Tooltip>
{currentTheme?.dark ? <ToggleThemeButton /> : null}
- {/* <Menu open={open} onClose={handleClose} anchorEl={anchorEl}>
+ <Menu open={open} onClose={handleClose} anchorEl={anchorEl}>
{themes.map((theme, index) => (
<MenuItem
onClick={event => handleChange(event, index)}
@@ -52,7 +52,7 @@
{ucFirst(theme.name)}
</MenuItem>
))}
- </Menu> */}
+ </Menu>
</>
);
};
--
Gitblit v1.9.1