From 82416a8117dd69be757380e8a42ecbac6e861e11 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 19 三月 2026 11:12:36 +0800
Subject: [PATCH] Merge branch 'rcs_master' into jdxaj
---
zy-acs-flow/src/page/code/CodeCreate.jsx | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/page/code/CodeCreate.jsx b/zy-acs-flow/src/page/code/CodeCreate.jsx
index 0e72673..e150ac1 100644
--- a/zy-acs-flow/src/page/code/CodeCreate.jsx
+++ b/zy-acs-flow/src/page/code/CodeCreate.jsx
@@ -33,8 +33,7 @@
import ImportButton from '../components/ImportButton'
import { useCodeImport } from './useCodeImport';
-import * as importTemp from './importTemp.csv?raw';
-const IMPORT_TEMP_URL = `data:text/csv;name=crm_contacts_sample.csv;charset=utf-8,${encodeURIComponent(importTemp.default)}`;
+const IMPORT_TEMP_URL = '/imports/code_import_template.xlsx';
const CodeCreate = (props) => {
const { open, setOpen } = props;
@@ -110,9 +109,10 @@
label="table.field.code.corner"
source="corner"
choices={[
- { id: 1, name: '鏄�' },
- { id: 0, name: '鍚�' },
+ { id: 0, name: 'common.enums.false' },
+ { id: 1, name: 'common.enums.true' },
]}
+ validate={required()}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -127,13 +127,25 @@
source="y"
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.code.scale"
source="scale"
parse={v => v}
/>
- </Grid>
+ </Grid> */}
+ {/* <Grid item xs={6} display="flex" gap={1}>
+ <SelectInput
+ label="table.field.code.spin"
+ source="spin"
+ choices={[
+ { id: 0, name: 'page.code.enums.spin.na' },
+ { id: 1, name: 'page.code.enums.spin.cw' },
+ { id: 2, name: 'page.code.enums.spin.ccw' },
+ ]}
+ validate={required()}
+ />
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
@@ -148,7 +160,7 @@
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
<Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
<SaveButton />
- <ImportButton importTemp={IMPORT_TEMP_URL} useCodeImport={useCodeImport} onceBatch={10} />
+ <ImportButton type="xlsx" importTemp={IMPORT_TEMP_URL} useImport={useCodeImport} onceBatch={10} />
</Toolbar>
</DialogActions>
</Form>
--
Gitblit v1.9.1