From c801f1d76578cfe2db9da8888d8f8690e9b5dee0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 16 四月 2025 09:38:49 +0800
Subject: [PATCH] #修复：保存过"批次规则-批次规则标识"，再点开查看时数据没了
---
rsf-admin/src/page/waitPakin/SelectSiteModel.jsx | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
index ffd7164..26ed4ed 100644
--- a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
+++ b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
@@ -1,31 +1,10 @@
import { Dialog, DialogTitle, Box, DialogActions, DialogContent } from "@mui/material";
import React, { useState, useRef, useEffect, useMemo, useCallback, Form } from "react";
import { styled } from '@mui/material/styles';
-import { FilterButton, TopToolbar, Toolbar, useTranslate, SaveButton, List, SelectInput, NumberField, WrapperField, EditButton, DeleteButton, TextField, DateField, TextInput, BooleanField, NumberInput, ReferenceField, SearchInput, SelectColumnsButton, DatagridConfigurable, Button } from "react-admin";
+import { FilterButton, TopToolbar, Toolbar, useTranslate, SaveButton, List, useRecordSelection, SelectInput, NumberField, WrapperField, EditButton, DeleteButton, TextField, DateField, TextInput, BooleanField, NumberInput, ReferenceField, SearchInput, SelectColumnsButton, DatagridConfigurable, Button, useRefresh, useRecordContext, useNotify } from "react-admin";
import DialogCloseButton from "../components/DialogCloseButton";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
-
-const filters = [
- <SearchInput source="condition" alwaysOn />,
- <NumberInput source="type" label="table.field.deviceSite.type" />,
- <TextInput source="site" label="table.field.deviceSite.site" />,
- <TextInput source="name" label="table.field.deviceSite.name" />,
- <TextInput source="wcsCode" label="table.field.deviceSite.wcsCode" />,
- <TextInput source="label" label="table.field.deviceSite.label" />,
- <TextInput source="device" label="table.field.deviceSite.device" />,
- <TextInput source="deviceCode" label="table.field.deviceSite.deviceCode" />,
- <TextInput source="deviceSite" label="table.field.deviceSite.deviceSite" />,
- <TextInput label="common.field.memo" source="memo" />,
- <SelectInput
- label="common.field.status"
- source="status"
- choices={[
- { id: '1', name: 'common.enums.statusTrue' },
- { id: '0', name: 'common.enums.statusFalse' },
- ]}
- resettable
- />
-]
+import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -41,18 +20,21 @@
}));
const SelectSiteModel = (props) => {
- const { open, setOpen, record } = props;
+ const { open, setOpen, source } = props;
const translate = useTranslate();
const [drawerVal, setDrawerVal] = useState(false);
+ const refresh = useRefresh();
+ const notify = useNotify();
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
}
};
-
+ console.log(source);
return (
<Box>
<Dialog
+ sx={{width: '90%'}}
open={open}
onClose={handleClose}
fullWidth
@@ -75,11 +57,9 @@
}}
title={"menu.deviceSite"}
empty={false}
- filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
- <FilterButton />
<SelectColumnsButton preferenceKey='deviceSite' />
</TopToolbar>
)}
@@ -88,8 +68,18 @@
<StyledDatagrid
preferenceKey='deviceSite'
bulkActionButtons={false}
- rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo', 'updateBy$', 'createBy$', 'createTime', 'updateTime']}
+ rowClick='toggleSelection'
+ onToggleItem={async (id)=>{
+ setOpen(false);
+ const res = await request.post(`/waitPakin/merge`, {waitPakins: source, siteId: id});
+ if (res?.data?.code === 200) {
+ refresh();
+ notify(res.data.msg);
+ } else {
+ notify(res.data.msg);
+ }
+ }}
+ omit={['id','name', 'createTime','label', 'createBy', 'memo', 'updateBy$', 'createBy$', 'createTime', 'updateTime']}
>
<NumberField source="id" />
<TextField source="name" label="table.field.deviceSite.name" />
@@ -106,6 +96,11 @@
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
+ <WrapperField cellClassName="opt" label="common.field.opt">
+ <Button label="toolbar.selectSite" onClick={(event)=>{
+ setOpen(false)
+ }}/>
+ </WrapperField>
</StyledDatagrid>
</List>
</DialogContent>
--
Gitblit v1.9.1