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/asnOrder/AsnOrderList.jsx | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx index fbe9491..11ed2a0 100644 --- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx +++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx @@ -1,4 +1,3 @@ -import React, { useState, useRef, useEffect, useMemo, useCallback } from "react"; import { List, DatagridConfigurable, @@ -7,9 +6,6 @@ SelectColumnsButton, EditButton, FilterButton, - CreateButton, - ExportButton, - BulkDeleteButton, useDataProvider, WrapperField, useRecordContext, @@ -17,7 +13,6 @@ useNotify, useRefresh, useListContext, - FunctionField, TextField, NumberField, DateField, @@ -39,14 +34,15 @@ import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting'; import CreateNewFolderOutlinedIcon from '@mui/icons-material/CreateNewFolderOutlined'; +import React, { useState, useRef, useEffect, useMemo, useCallback } from "react"; import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined'; import DictionarySelect from "../../components/DictionarySelect"; import ConstructionIcon from "@mui/icons-material/Construction"; import BillStatusField from '../../components/BillStatusField'; +import MyExportButton from '../../components/MyExportButton'; import { Box, Typography, Card, Stack } from '@mui/material'; import MyCreateButton from "../../components/MyCreateButton"; import { useLocation, useNavigate } from 'react-router-dom'; -import MyExportButton from '../../components/MyExportButton'; import ConfirmButton from '../../components/ConfirmButton'; import ExitToAppIcon from '@mui/icons-material/ExitToApp'; import ImportButton from "../../components/ImportButton"; @@ -83,7 +79,6 @@ }, '& .opt': { width: 220, - }, })); @@ -93,28 +88,21 @@ <TextInput source="poCode" label="table.field.asnOrder.poCode" />, <NumberInput source="poId" label="table.field.asnOrder.poId" />, <TextInput source="type" label="table.field.asnOrder.type" />, - <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.asnOrder.wkType"> + <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type', group: "1" }} label="table.field.asnOrder.wkType" alwaysOn> <AutocompleteInput label="table.field.asnOrder.wkType" optionValue="value" /> </ReferenceInput>, <NumberInput source="anfme" label="table.field.asnOrder.anfme" />, <NumberInput source="qty" label="table.field.asnOrder.qty" />, <TextInput source="logisNo" label="table.field.asnOrder.logisNo" />, <DateInput source="arrTime" label="table.field.asnOrder.arrTime" />, - <SelectInput source="rleStatus" label="table.field.asnOrder.rleStatus" - choices={[ - { id: 0, name: ' 姝e父' }, - { id: 1, name: ' 宸查噴鏀�' }, - ]} - />, - <TextInput label="common.field.memo" source="memo" />, <DictionarySelect label='table.field.asnOrder.exceStatus' name="exceStatus" + group="1" dictTypeCode="sys_asn_exce_status" alwaysOn />, - ] const AsnOrderList = (props) => { -- Gitblit v1.9.1