From 932f023c078a56f57c3ebe83302b56347e072aca Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 11:18:40 +0800
Subject: [PATCH] fix:动态字段修改
---
rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 38 +++++++++---------
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 29 +++++++++++++-
rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx | 2
rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx | 2
rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx | 2
5 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
index 095bde5..39e22a4 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
@@ -111,29 +111,29 @@
const inspection = () => { };
const print = () => {
- const imageUrls = ['https://www.baidu.com/img/flexible/logo/pc/result@2.png',]
- const iframe = document.createElement('iframe');
- iframe.style.display = 'none';
- document.body.appendChild(iframe);
+ // const imageUrls = ['https://www.baidu.com/img/flexible/logo/pc/result@2.png',]
+ // const iframe = document.createElement('iframe');
+ // iframe.style.display = 'none';
+ // document.body.appendChild(iframe);
- const iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
- iframeDoc.open();
- iframeDoc.write('<html><head><title>Print Images</title></head><body>');
+ // const iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
+ // iframeDoc.open();
+ // iframeDoc.write('<html><head><title>Print Images</title></head><body>');
- // 灏嗗浘鐗囨彃鍏ュ埌 iframe 涓�
- imageUrls.forEach((imageUrl) => {
- iframeDoc.write(`<img src="${imageUrl}" style="margin: 10px;">`);
- });
+ // // 灏嗗浘鐗囨彃鍏ュ埌 iframe 涓�
+ // imageUrls.forEach((imageUrl) => {
+ // iframeDoc.write(`<img src="${imageUrl}" style="margin: 10px;">`);
+ // });
- iframeDoc.write('</body></html>');
- iframeDoc.close();
+ // iframeDoc.write('</body></html>');
+ // iframeDoc.close();
- // 绛夊緟鍥剧墖鍔犺浇瀹屾垚鍚庤Е鍙戞墦鍗�
- iframe.contentWindow.onload = () => {
- iframe.contentWindow.print();
- // 鎵撳嵃瀹屾垚鍚庣Щ闄� iframe
- document.body.removeChild(iframe);
- };
+ // // 绛夊緟鍥剧墖鍔犺浇瀹屾垚鍚庤Е鍙戞墦鍗�
+ // iframe.contentWindow.onload = () => {
+ // iframe.contentWindow.print();
+ // // 鎵撳嵃瀹屾垚鍚庣Щ闄� iframe
+ // document.body.removeChild(iframe);
+ // };
};
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
index 0d5ff70..a203630 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
@@ -285,7 +285,7 @@
<Grid key={item.id} item xs={6} display="flex" gap={1}>
<TextInput
label={item.fieldsAlise}
- source={`extendFields.[${item.fields}]`}
+ source={item.fields}
validate={required()}
/>
</Grid>
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index 003de96..c0d582a 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
@@ -268,7 +268,7 @@
<Grid key={item.id} item xs={6} display="flex" gap={1}>
<TextInput
label={item.fieldsAlise}
- source={`extendFields.[${item.fields}]`}
+ source={item.fields}
validate={required()}
/>
</Grid>
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 2a7d658..438bd7e 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -211,7 +211,7 @@
const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
const opt = <WrapperField key="opt" cellClassName="fixed" className="fixed" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <EnableButton />
+ <PrintButton />
</WrapperField>
setColumns([...arr, ...fields, opt]);
@@ -247,7 +247,7 @@
<BatchStatusButton />
<BatchLevelButton />
<BindButton />
- <PrintButton />
+ <BatchPrintButton />
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>}
rowClick={(id, resource, record) => false}
@@ -461,7 +461,7 @@
)
}
-const PrintButton = () => {
+const BatchPrintButton = () => {
const record = useRecordContext();
const { resource, selectedIds } = useListContext();
const notify = useNotify();
@@ -484,6 +484,29 @@
)
}
+const PrintButton = () => {
+ const record = useRecordContext();
+
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button color="secondary" onClick={() => setCreateDialog(true)} label={"toolbar.print"}>
+ <PrintIcon />
+ </Button>
+
+ <PrintModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ rows={[record]}
+ />
+ </>
+ )
+}
+
const BindButton = () => {
const record = useRecordContext();
const notify = useNotify();
diff --git a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
index f618577..feaa543 100644
--- a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
@@ -241,7 +241,7 @@
overflow: 'hidden',
fontSize: 'small',
tableLayout: 'fixed',
- width: '280px',
+ width: '520px',
borderCollapse: 'collapse',
borderSpacing: 0,
margin: '0 auto',
--
Gitblit v1.9.1