From 43e98544b21f452b8dfa94834dc4b8906bd2dec4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 四月 2025 12:51:04 +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 | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
index 91aca74..ec50864 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 = () => {
@@ -332,8 +329,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