From 59251b6445daef3729a205fc7054fcbdc55b060a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 11:16:05 +0800
Subject: [PATCH] #修复 1. 收货单新增物料时分组查询不生效 2. 综合订单分页数调整 3. 物料列表报错修复
---
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 1d57114..ba28903 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
import {
List,
DatagridConfigurable,
@@ -33,6 +33,7 @@
AutocompleteInput,
DeleteButton,
Button,
+ useRedirect,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -107,13 +108,12 @@
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
- const billReload = useRef();
- const navigate = useNavigate();
- const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
- const assign = (record) => {
- navigate(`/asnOrderItem?asnId=${record.id}`);
- };
+ const [select, setSelect] = useState(0);
+ const billReload = useRef();
+ const location = useLocation();
+ const redirect = useRedirect();
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
return (
<Box display="flex">
<List
@@ -143,7 +143,7 @@
sx={{ width: '100%' }}
preferenceKey='asnOrder'
bulkActionButtons={<> <InspectionsButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
- rowClick={() => 'edit'}
+ rowClick='edit'
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
>
@@ -191,7 +191,8 @@
const MyButton = ({ setCreateDialog, setmodalType }) => {
const record = useRecordContext();
- const handleEditClick = () => {
+ const handleEditClick = (btn) => {
+ btn.stopPropagation();
const id = record.id;
setmodalType(id);
setCreateDialog(true);
@@ -201,7 +202,7 @@
<Button
color="primary"
startIcon={<EditIcon />}
- onClick={() => handleEditClick()}
+ onClick={(btn) => handleEditClick(btn)}
sx={{ ml: 1 }}
label={'ra.action.edit'}
>
@@ -213,13 +214,13 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const inspection = () => {
+ const inspection = (btn) => {
+ btn.stopPropagation();
requestInspect([record])
};
const requestInspect = async (rows) => {
const { data: { code, data, msg } } = await request.post(`/asnOrder/inspect`, rows);
-
if (code === 200) {
notify(msg);
refresh()
@@ -240,7 +241,8 @@
const { selectedIds, onUnselectItems, data } = useListContext();
const notify = useNotify();
const refresh = useRefresh();
- const inspection = () => {
+ const inspection = (btn) => {
+ btn.stopPropagation();
if (selectedIds.length === 0) {
notify('璇烽�夋嫨閫氱煡鍗�');
return;
--
Gitblit v1.9.1