wms-master.git - Gitblit

parent: 669072c5 | 补丁 | 提交 | ignore whitespace

verou

2025-03-26 932f023c078a56f57c3ebe83302b56347e072aca

fix:动态字段修改

5个文件已修改

	rsf-admin/src/page/asnOrder/AsnOrderList.jsx	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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);
    // };
  };



 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>

 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>

 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();

 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',

			@@ -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);
			// };
			};

			@@ -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>

			@@ -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>

			@@ -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();

			@@ -241,7 +241,7 @@
			overflow: 'hidden',
			fontSize: 'small',
			tableLayout: 'fixed',
			width: '280px',
			width: '520px',
			borderCollapse: 'collapse',
			borderSpacing: 0,
			margin: '0 auto',