From 12d2351042a59fff3d8a85ec754beff09d72d35c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 11 四月 2025 15:15:22 +0800 Subject: [PATCH] no message --- rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx index 91aca74..9a73de5 100644 --- a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx +++ b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx @@ -53,7 +53,7 @@ import TaskIcon from '@mui/icons-material/Task'; import CloseIcon from '@mui/icons-material/Close'; import request from '@/utils/request'; - +import DictionarySelect from "../components/DictionarySelect"; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -68,7 +68,7 @@ width: 320 }, '& .status': { - width: 90 + width: 100 }, })); @@ -91,15 +91,12 @@ />, <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 + <DictionarySelect + label='common.field.status' + name="exceStatus" + dictTypeCode="sys_asn_exce_status" />, + ] const AsnOrderList = () => { @@ -161,14 +158,9 @@ <TextField source="logisNo" label="table.field.asnOrder.logisNo" /> <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime /> <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} /> - - <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}> - <TextField source="nickname" /> - </ReferenceField> + <TextField source="updateBy$" label="common.field.updateBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime /> - <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}> - <TextField source="nickname" /> - </ReferenceField> + <TextField source="createBy$" label="common.field.createBy" /> <DateField source="createTime" label="common.field.createTime" showTime /> <BillStatusField cellClassName="status" source="exceStatus" label="common.field.status" /> <TextField source="memo" label="common.field.memo" sortable={false} /> @@ -332,8 +324,6 @@ } return ( - (<Button onClick={requestClose} label={"toolbar.close"} color="error"> - <CloseIcon /> - </Button>) + <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} /> ) } -- Gitblit v1.9.1