From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-flow/src/page/sta/StaEdit.jsx | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/zy-acs-flow/src/page/sta/StaEdit.jsx b/zy-acs-flow/src/page/sta/StaEdit.jsx
index d74a6ed..e79d2da 100644
--- a/zy-acs-flow/src/page/sta/StaEdit.jsx
+++ b/zy-acs-flow/src/page/sta/StaEdit.jsx
@@ -28,6 +28,7 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
+import { compDirectChoices } from "../loc/compDirect";
const FormToolbar = () => {
const { getValues } = useFormContext();
@@ -136,27 +137,34 @@
validate={[required(), greaterThanZero]}
/>
<NumberInput
+ label="table.field.sta.height"
+ source="height"
+ validate={[required(), greaterThanZero]}
+ />
+ {/* <NumberInput
+ label="table.field.sta.depth"
+ source="depth"
+ helperText={translate('page.sta.depthHint')}
+ validate={[required(), greaterThanZero]}
+ /> */}
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
label="table.field.sta.angle"
source="angle"
+ validate={[required(), greaterThanZero]}
+ />
+ <SelectInput
+ label="table.field.sta.actDir"
+ source="actDir"
+ choices={compDirectChoices}
+ translateChoice
validate={[required(), greaterThanZero]}
/>
{/* <NumberInput
label="table.field.sta.offset"
source="offset"
validate={required()}
- /> */}
- <NumberInput
- label="table.field.sta.height"
- source="height"
- validate={[required(), greaterThanZero]}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- {/* <NumberInput
- label="table.field.sta.depth"
- source="depth"
- helperText={translate('page.sta.depthHint')}
- validate={[required(), greaterThanZero]}
/> */}
</Stack>
<Stack direction='row' gap={2}>
--
Gitblit v1.9.1