From b778c28b598eecd0687f0612f9236c6e957de89f Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 16:59:34 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 142 ++++++++++++++++++++++++++++++++++------------
1 files changed, 104 insertions(+), 38 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 5d1eeb6..0d858d2 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -3,7 +3,9 @@
import {
useTranslate,
useRecordContext,
- useNotify
+ useNotify,
+ useRefresh,
+ useListContext,
} from 'react-admin';
import PanelTypography from "../components/PanelTypography";
import * as Common from '@/utils/common'
@@ -11,7 +13,9 @@
import request from '@/utils/request';
import debounce from 'lodash/debounce';
import { DataGrid } from '@mui/x-data-grid';
-const AsnOrderPanel = () => {
+import PrintModal from './PrintModal';
+import { width } from "@mui/system";
+const AsnOrderPanel = ({ setBillReload }) => {
const record = useRecordContext();
if (!record) return null;
const translate = useTranslate();
@@ -22,7 +26,13 @@
useEffect(() => {
debouncedHttp({ maktx });
+ setBillReload(http)
}, [asnId, maktx]);
+
+ useEffect(() => {
+ setBillReload(http)
+ }, []);
+
const http = async (parmas) => {
@@ -34,23 +44,10 @@
}
}
+
const debouncedHttp = useMemo(() => debounce(http, 300), []);
- const StyledTableRow = styled(TableRow)(({ theme }) => ({
- "& .MuiButtonBase-root.": {
- padding: "0px 0px",
- },
- }));
- const StyledTableCell = styled(TableCell)(({ theme }) => ({
- "& .MuiButtonBase-root": {
- padding: "0px 0px",
- },
- overflow: "hidden",
- textOverflow: "ellipsis",
- whiteSpace: "nowrap",
- maxWidth: 600,
- }));
const columns = [
{
@@ -59,7 +56,8 @@
},
{
field: 'asnCode',
- headerName: translate('table.field.asnOrderItem.asnCode')
+ headerName: translate('table.field.asnOrderItem.asnCode'),
+ width: 150,
},
{
field: 'poDetlId',
@@ -70,25 +68,27 @@
headerName: translate('table.field.asnOrderItem.poDetlCode')
},
{
- field: 'matnrId',
- headerName: translate('table.field.asnOrderItem.matnrId')
+ field: 'matnrCode',
+ headerName: translate('table.field.asnOrderItem.matnrCode'),
+ width: 150,
},
{
field: 'maktx',
- headerName: translate('table.field.asnOrderItem.maktx')
+ headerName: translate('table.field.asnOrderItem.maktx'),
+ width: 200,
},
{
field: 'anfme',
- headerName: translate('table.field.asnOrderItem.anfme')
+ headerName: translate('table.field.asnOrderItem.purQty')
},
{
field: 'stockUnit',
headerName: translate('table.field.asnOrderItem.stockUnit')
},
- {
- field: 'purQty',
- headerName: translate('table.field.asnOrderItem.purQty')
- },
+ // {
+ // field: 'purQty',
+ // headerName: translate('table.field.asnOrderItem.purQty')
+ // },
{
field: 'purUnit',
headerName: translate('table.field.asnOrderItem.purUnit')
@@ -96,6 +96,10 @@
{
field: 'qty',
headerName: translate('table.field.asnOrderItem.qty')
+ },
+ {
+ field: 'splrBatch',
+ headerName: translate('table.field.asnOrderItem.splrBatch')
},
{
field: 'splrCode',
@@ -106,13 +110,28 @@
headerName: translate('table.field.asnOrderItem.splrName')
},
{
- field: 'barcode',
- headerName: translate('table.field.asnOrderItem.barcode')
+ field: 'trackCode',
+ headerName: translate('table.field.asnOrderItem.barcode'),
+ width: 150
+ },
+ {
+ field: 'prodTime',
+ headerName: translate('table.field.asnOrderItem.prodTime')
},
{
field: 'packName',
headerName: translate('table.field.asnOrderItem.packName')
- }]
+ },
+ {
+ field: 'action',
+ headerName: '鎿嶄綔',
+ width: 70,
+ lockPosition: 'left',
+ renderCell: (params) => (
+ <PrintButton rows={[params.row.id]} />
+ ),
+
+ },]
const [selectedRows, setSelectedRows] = useState([]);
@@ -124,13 +143,6 @@
setMaktx(value)
}
- const wakbarcode = () => {
-
- }
-
- const wakprint = () => {
-
- }
return (
@@ -140,11 +152,10 @@
}}>
<div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: '4px', alignItems: 'center' }}>
- <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" variant="outlined" sx={{ width: '300px' }} />
+ <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" variant="outlined" sx={{ width: '300px' }} size="small" />
<div style={{ display: 'flex', gap: '10px' }}>
- <Button variant="contained" onClick={wakbarcode}>鐢熸垚鏉＄爜</Button>
- <Button variant="contained" onClick={wakprint}>鎵撳嵃</Button>
+ <PrintsButton rows={selectedRows} />
</div>
</div>
@@ -153,6 +164,7 @@
size="small"
rows={rows}
columns={columns}
+ disableRowSelectionOnClick
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
selectionModel={selectedRows}
@@ -166,3 +178,57 @@
};
export default AsnOrderPanel;
+
+const PrintsButton = ({ rows }) => {
+ const record = useRecordContext();
+ const { resource, selectedIds } = useListContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const translate = useTranslate();
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ const modalChange = () => {
+ if (rows?.length === 0) {
+ notify('璇烽�夋嫨鐗╂枡');
+ return;
+ } else {
+ setCreateDialog(true)
+ }
+
+ }
+
+ return (
+ <>
+ <Button size="small" variant="contained" color="secondary" onClick={modalChange}>{translate("toolbar.batchPrint")}</Button>
+
+ <PrintModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ rows={rows}
+ />
+ </>
+ )
+}
+
+const PrintButton = ({ rows }) => {
+ const record = useRecordContext();
+
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+ const [createDialog, setCreateDialog] = useState(false);
+ const translate = useTranslate();
+
+ return (
+ <>
+ <Button size="small" variant="contained" color="secondary" onClick={() => setCreateDialog(true)}>{translate("toolbar.print")}</Button>
+
+ <PrintModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ rows={rows}
+ />
+ </>
+ )
+}
--
Gitblit v1.9.1