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/dictData/DictDataCreate.jsx | 72 +++++++++++++----------------------
1 files changed, 27 insertions(+), 45 deletions(-)
diff --git a/rsf-admin/src/page/stock/StockCreate.jsx b/rsf-admin/src/page/dictData/DictDataCreate.jsx
similarity index 72%
rename from rsf-admin/src/page/stock/StockCreate.jsx
rename to rsf-admin/src/page/dictData/DictDataCreate.jsx
index 75fccd1..2c609cc 100644
--- a/rsf-admin/src/page/stock/StockCreate.jsx
+++ b/rsf-admin/src/page/dictData/DictDataCreate.jsx
@@ -31,7 +31,7 @@
import StatusSelectInput from "../components/StatusSelectInput";
import MemoInput from "../components/MemoInput";
-const StockCreate = (props) => {
+const DictDataCreate = (props) => {
const { open, setOpen } = props;
const translate = useTranslate();
@@ -86,8 +86,8 @@
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.stock.asnOrder"
- source="asnOrder"
+ label="table.field.dictData.dictTypeId"
+ source="dictTypeId"
parse={v => v}
autoFocus
validate={required()}
@@ -95,57 +95,39 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.stock.erpToken"
- source="erpToken"
+ label="table.field.dictData.dictTypeCode"
+ source="dictTypeCode"
parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.stock.erpOrder"
- source="erpOrder"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.stock.erpStkAdr"
- source="erpStkAdr"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.stock.contractId"
- source="contractId"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.stock.lockReason"
- source="lockReason"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.stock.lockStatus"
- source="lockStatus"
validate={required()}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.stock.locker"
- source="locker"
+ label="table.field.dictData.value"
+ source="value"
parse={v => v}
+ validate={required()}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <DateInput
- label="table.field.stock.lockedTime"
- source="lockedTime"
+ <TextInput
+ label="table.field.dictData.label"
+ source="label"
+ parse={v => v}
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.dictData.sort"
+ source="sort"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.dictData.color"
+ source="color"
+ parse={v => v}
/>
</Grid>
@@ -171,4 +153,4 @@
)
}
-export default StockCreate;
+export default DictDataCreate;
--
Gitblit v1.9.1