From 15ccee0acb232f937b98c0225b8884b99efbb87c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 08 四月 2025 17:04:37 +0800
Subject: [PATCH] fix:0408修改
---
rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 17 +++++++----------
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 1 +
rsf-admin/src/i18n/zh.js | 2 +-
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 12 +++++++++++-
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 97bac7c..8b0c4ab 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -557,7 +557,7 @@
asnCode: "涓诲崟缂栫爜",
platItemId: "erp鏍囪瘑",
poDetlId: "PO鍗曟爣璇�",
- poCode: "PO鍗曠紪鐮�",
+ poDetlCode: "PO鍗曠紪鐮�",
fieldsIndex: "瀛楁绱㈠紩",
matnrId: "鐗╂枡鏍囪瘑",
matnrCode: "鐗╂枡缂栫爜",
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 = () => {
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 90e2269..e8fa4ac 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -73,6 +73,7 @@
requestGetHead()
requestGetBody()
}
+ setDisabled(false)
}, [open])
const handleClose = (event, reason) => {
@@ -98,6 +99,14 @@
[name]: value
}));
};
+
+ const resetData = () => {
+ setFormData({
+ type: '',
+ wkType: '',
+ })
+ setTableData([])
+ }
const setFinally = () => {
const rows = tableRef.current.state.editRows;
@@ -126,6 +135,7 @@
setOpen(false);
refresh();
billReload?.current()
+ resetData()
} else {
notify(res.data.msg);
}
@@ -139,7 +149,7 @@
setOpen(false);
refresh();
billReload?.current()
-
+ resetData()
} else {
notify(res.data.msg);
}
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 4e7f060..00c0a89 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -157,6 +157,7 @@
<DataGrid
+ sx={{ width: 'calc(100vw - 280px)' }}
size="small"
rows={rows}
columns={columns}
--
Gitblit v1.9.1