From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:02:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/transfer/ManualCreate.jsx | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/rsf-admin/src/page/orders/transfer/ManualCreate.jsx b/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
index f774644..2990e16 100644
--- a/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
+++ b/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
@@ -40,10 +40,10 @@
import WarehouseSelect from "../../components/WarehouseSelect.jsx";
import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
import ConfirmButton from "../../components/ConfirmButton";
+import { useFormContext, useWatch } from "react-hook-form";
import CreateBySelectMats from "./CreateBySelectMats.jsx";
import { Add, Edit, Delete } from '@mui/icons-material';
import DictSelect from "../../components/DictSelect";
-import { useFormContext, useWatch } from "react-hook-form";
import { minHeight, padding } from "@mui/system";
import SaveIcon from '@mui/icons-material/Save';
import request from '@/utils/request';
@@ -59,7 +59,7 @@
const [disabled, setDisabled] = useState(false);
const [selectedRows, setSelectedRows] = useState([]);
const [createDialog, setCreateDialog] = useState(false);
- const [formData, setFormData] = useState({});
+ const [formData, setFormData] = useState({ type: '1', orgAreaId: null, tarAreaId: null });
const [list, setList] = useState([]);
const handleClose = (event, reason) => {
@@ -139,6 +139,20 @@
}
}
+ const newAddClick = () => {
+ if (formData.orgAreaId == null || formData.orgAreaId == undefined) {
+ notify("鍘熷簱鍖轰笉鑳戒负绌猴紒锛�", { type: 'error' })
+ return
+ }
+ if (formData.tarAreaId == null || formData.tarAreaId == undefined) {
+ notify("鐩爣搴撳尯涓嶈兘涓虹┖锛侊紒", { type: 'error' })
+ return
+ }
+ console.log(formData);
+
+ setCreateDialog(true)
+ }
+
const handleChange = (value, name) => {
setFormData((prevData) => ({
@@ -159,7 +173,6 @@
variant="filled"
onChange={(e) => handleChange(e.target.value, 'type')}
dictTypeCode="sys_transfer_type"
- required
/>
</Grid>
<Grid item md={2}>
@@ -167,7 +180,6 @@
value={formData.orgAreaId}
variant="filled"
dictTypeCode="warehouse"
- required
onChange={(e) => handleChange(e.target.value, 'orgAreaId')}
label={translate("table.field.transfer.orgAreaName")} />
</Grid>
@@ -177,7 +189,6 @@
value={formData.tarAreaId}
dictTypeCode="warehouse"
variant="filled"
- required
onChange={(e) => handleChange(e.target.value, 'tarAreaId')}
/>
</Grid>
@@ -185,7 +196,7 @@
</SimpleForm>
<Box sx={{ mt: 2 }}>
<Stack direction="row" spacing={2} sx={{ justifyContent: "flex-end" }}>
- <Button variant="contained" onClick={() => setCreateDialog(true)} >
+ <Button variant="contained" onClick={newAddClick} >
{translate('common.action.newAddMats')}
</Button>
<ConfirmButton label={"toolbar.delete"} variant="outlined" color="error" onConfirm={handleDeleteItem} />
@@ -195,7 +206,7 @@
<TransferTableView
tabelData={tabelData}
setTableData={setTableData}
- asnId={orderId}
+ orderId={orderId}
selectedRows={selectedRows}
setSelectedRows={setSelectedRows}
tableRef={tableRef}>
@@ -207,9 +218,12 @@
</Button>
</Toolbar>
<CreateBySelectMats
+ data={tabelData}
+ queryForm={formData}
open={createDialog}
setOpen={setCreateDialog}
- data={tabelData}
+ selectedRows={selectedRows}
+ setSelectedRows={setSelectedRows}
setData={setTableData}
/>
</Box>
@@ -379,13 +393,6 @@
editable: true,
},
{
- field: 'poCode',
- headerName: translate('table.field.outStockItem.poDetlCode'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
field: 'stockUnit',
headerName: translate('table.field.outStockItem.stockUnit'),
minWidth: 100,
@@ -461,6 +468,11 @@
tableRef.current = useGridApiRef();
+ const tableIds = tabelData.map(map => map.id);
+ // setSelectedRows(tableIds);
+ // // console.log(selectedRows);
+
+
return (
<Box>
<DataGrid
@@ -468,12 +480,6 @@
rows={tabelData}
columns={columns}
disableRowSelectionOnClick
- getRowId={(row) => row.matnrId ? row.matnrId : row.id}
- disableColumnFilter
- disableColumnSelector
- disableColumnSorting
- disableMultipleColumnsSorting
- processRowUpdate={processRowUpdate}
initialState={{
pagination: {
paginationModel: {
@@ -484,8 +490,8 @@
pageSizeOptions={[15, 25, 50, 100]}
editMode="row"
checkboxSelection
+ rowSelectionModel={tableIds}
onRowSelectionModelChange={handleSelectionChange}
- selectionModel={selectedRows}
sx={{
height: 580,
'& .MuiDataGrid-cell input': {
@@ -493,15 +499,6 @@
},
}}
/>
- {/* <Box sx={{
- padding: 2,
- position: 'absolute',
- right: 1
- }}>
- <Button variant="contained" onClick={() => handleSubmit()} startIcon={<SaveIcon/>} >
- {translate('toolbar.confirm')}
- </Button>
- </Box> */}
</Box>
);
};
--
Gitblit v1.9.1