From f34089d1d321efe55c98e6f2638d924ae515effd Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 06 八月 2025 14:09:18 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/stockManage/locRevise/SelectLocsRevise.jsx | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/rsf-admin/src/page/stockManage/locRevise/SelectLocsRevise.jsx b/rsf-admin/src/page/stockManage/locRevise/SelectLocsRevise.jsx index d9b25a2..4052be8 100644 --- a/rsf-admin/src/page/stockManage/locRevise/SelectLocsRevise.jsx +++ b/rsf-admin/src/page/stockManage/locRevise/SelectLocsRevise.jsx @@ -16,9 +16,8 @@ } from '@mui/material'; import { EDIT_MODE, DEFAULT_START_PAGE, DEFAULT_ITEM_PAGE_SIZE, DEFAULT_PAGE_SIZE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting'; -import { useTranslate, useNotify, useRefresh, DatagridConfigurable} from 'react-admin'; +import { useTranslate, useNotify, useRefresh, DatagridConfigurable, useGetOne } from 'react-admin'; import DialogCloseButton from "../../components/DialogCloseButton"; -import TreeSelectInput from "@/page/components/TreeSelectInput"; import { Add, Edit, Delete, Save } from '@mui/icons-material'; import SaveIcon from '@mui/icons-material/Save'; import { DataGrid } from '@mui/x-data-grid'; @@ -31,21 +30,18 @@ '& .RaDatagrid-row': { cursor: 'auto' }, - '& .column-name': { - }, '& .opt': { width: 180 }, })); const SelectLocsRevise = (props) => { - const { open, setOpen, data, setData } = props; + const { open, setOpen, locRevise } = props; const handleClose = (event, reason) => { if (reason !== "backdropClick") { setOpen(false); } }; - const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_stock_revise_type')) || []; const [page, setPage] = useState({ page: DEFAULT_START_PAGE, pageSize: DEFAULT_PAGE_SIZE }); const [formData, setFormData] = useState({ useStatus: 'F', code: null }); @@ -65,20 +61,12 @@ })); }; - const reset = () => { - setFormData({ - code: '', - useStatus: 'F', - }) - } - const handleSubmit = () => { - const hasarr = data.map(el => +el.matnrId) - const selectedData = selectedRows.filter(item => !hasarr.includes(item)).map(id => (tableData.find(row => row.id === id))); + const selectedData = tableData.filter(item => selectedRows.includes(item.id)); const value = selectedData.map((el => { return { id: el.id, - code: el.code, + locCode: el.code, areaId: el.areaId, barcode: el.barcode || '', channel: el.channel || '', @@ -89,11 +77,24 @@ useStatus: el.useStatus, warehouseId: el.warehouseId, } - })) - setData([...data, ...value]); - setOpen(false); - reset(); + })); + + saveReviseLog(value); }; + + const saveReviseLog = async (values) => { + const parmas = { + reviseId: locRevise, + items: values, + } + const res = await request.post(`/reviseLog/items/save`, parmas); + if (res?.data?.code === 200) { + setOpen(false); + refresh() + } else { + notify(res.data.msg); + } + } const getData = async () => { setIsLoading(true) @@ -106,12 +107,10 @@ if (res?.data?.code === 200) { setTableData(res.data.data.records); setRowCount(res.data?.data?.total); - } else { notify(res.data.msg); } setIsLoading(false) - }; useEffect(() => { -- Gitblit v1.9.1