From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 10 四月 2025 11:40:02 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx index 91aca74..561522a 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 = () => { -- Gitblit v1.9.1