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/CompanysEdit.jsx | 82 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/rsf-admin/src/page/stock/StockEdit.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx
similarity index 61%
copy from rsf-admin/src/page/stock/StockEdit.jsx
copy to rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx
index 384dd79..a559320 100644
--- a/rsf-admin/src/page/stock/StockEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx
@@ -24,10 +24,10 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import MemoInput from "../../components/MemoInput";
+import StatusSelectInput from "../../components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
@@ -40,7 +40,7 @@
)
}
-const StockEdit = () => {
+const CompanysEdit = () => {
const translate = useTranslate();
return (
@@ -65,66 +65,88 @@
</Typography>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.stock.asnOrder"
- source="asnOrder"
+ label="table.field.companys.code"
+ source="code"
parse={v => v}
autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.companys.name"
+ source="name"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.companys.nameEn"
+ source="nameEn"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.companys.breifCode"
+ source="breifCode"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.companys.type"
+ source="type"
+ parse={v => v}
validate={required()}
/>
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.stock.erpToken"
- source="erpToken"
+ label="table.field.companys.contact"
+ source="contact"
parse={v => v}
/>
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.stock.erpOrder"
- source="erpOrder"
+ label="table.field.companys.tel"
+ source="tel"
parse={v => v}
/>
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.stock.erpStkAdr"
- source="erpStkAdr"
+ label="table.field.companys.email"
+ source="email"
parse={v => v}
/>
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.stock.contractId"
- source="contractId"
+ label="table.field.companys.pcode"
+ source="pcode"
parse={v => v}
/>
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.stock.lockReason"
- source="lockReason"
+ label="table.field.companys.province"
+ source="province"
parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.stock.lockStatus"
- source="lockStatus"
- validate={required()}
/>
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.stock.locker"
- source="locker"
+ label="table.field.companys.city"
+ source="city"
parse={v => v}
/>
</Stack>
<Stack direction='row' gap={2}>
- <DateInput
- label="table.field.stock.lockedTime"
- source="lockedTime"
+ <TextInput
+ label="table.field.companys.address"
+ source="address"
+ parse={v => v}
/>
</Stack>
@@ -143,4 +165,4 @@
)
}
-export default StockEdit;
+export default CompanysEdit;
--
Gitblit v1.9.1