From b30e2878e41607fb7fb8168e3b5b61948d7c359a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 四月 2025 16:25:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 108 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index 7302abe..97f66bd 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -39,7 +39,9 @@
TableCell,
Tooltip,
IconButton,
- styled
+ styled,
+ Select,
+ MenuItem
} from '@mui/material';
@@ -55,6 +57,7 @@
import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
import DictionarySelect from "../../components/DictionarySelect";
import DictSelect from "../../components/DictSelect";
+import "./asnOrder.css";
const AsnOrderModal = (props) => {
const { open, setOpen, asnId, billReload } = props;
@@ -282,9 +285,7 @@
{/* {asnId !== '' && <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDelete} />} */}
<ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDeleteItem} />
</Stack>
-
</Box>
-
<Box sx={{ mt: 2 }}>
<AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} asnId={asnId} selectedRows={selectedRows} setSelectedRows={setSelectedRows} tableRef={tableRef}></AsnOrderModalTable>
</Box>
@@ -311,6 +312,95 @@
export default AsnOrderModal;
+const SelectInputSplrNameEditCell = (params) => {
+ const [formData, setFormData] = useState([{}])
+ useEffect(() => {
+ getOptions();
+ }, []);
+ const getOptions = async () => {
+ const parmas = {
+ }
+ const {
+ data: { code, data, msg },
+ } = await request.post("companys/page",parmas);
+ if (code === 200) {
+ setFormData(data.records)
+ console.log(data.records)
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (
+ <Select
+ value={params.value}
+ onChange={(e) =>
+ params.api.setEditCellValue({
+ id: params.id,
+ field: params.field,
+ value: e.target.value,
+ })
+ }
+ fullWidth
+ autoFocus
+ >
+ {formData.map(e => {
+ return(
+ <MenuItem value={e.name} children={e.name} />
+ );
+
+ })}
+
+ </Select>
+ );
+ };
+
+ const SelectInputSplrCodeEditCell = (params) => {
+ const [formData, setFormData] = useState([{}])
+ useEffect(() => {
+ getOptions();
+ }, []);
+ const getOptions = async () => {
+ const parmas = {
+ }
+ const {
+ data: { code, data, msg },
+ } = await request.post("companys/page",parmas);
+ if (code === 200) {
+ setFormData(data.records)
+ console.log(data.records)
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (
+ <Select
+ value={params.value}
+ onChange={(e) =>
+ params.api.setEditCellValue({
+ id: params.id,
+ field: params.field,
+ value: e.target.value,
+ })
+ }
+ fullWidth
+ autoFocus
+ >
+ {formData.map(e => {
+ return(
+ <MenuItem value={e.id} children={e.name} />
+ );
+
+ })}
+
+ </Select>
+ );
+ };
+
+
+
+
const AsnOrderModalTable = ({ tabelData, setTableData, asnId, selectedRows, setSelectedRows, tableRef }) => {
const translate = useTranslate();
const notify = useNotify();
@@ -331,26 +421,35 @@
},
{
field: 'anfme',
- headerName: translate('table.field.asnOrderItem.purQty'),
+ headerName: translate('table.field.asnOrderItem.anfme')+"*",
type: 'number',
minWidth: 100,
flex: 1,
editable: true,
- valueFormatter: (val) => val < 0 ? 0 : val
+ valueFormatter: (val) => val < 0 ? 0 : val,
+ headerClassName: "custom",
},
{
field: 'splrCode',
- headerName: translate('table.field.asnOrderItem.splrCode'),
+ headerName: translate('table.field.asnOrderItem.splrCode')+"*",
minWidth: 100,
flex: 1,
editable: true,
+ renderEditCell: (params) => (
+ <SelectInputSplrCodeEditCell {...params} />
+ ),
+ headerClassName: "custom",
},
{
field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName'),
+ headerName: translate('table.field.asnOrderItem.splrName')+"*",
minWidth: 100,
flex: 1,
editable: true,
+ renderEditCell: (params) => (
+ <SelectInputSplrNameEditCell {...params} />
+ ),
+ headerClassName: "custom",
},
// {
// field: 'packName',
@@ -367,10 +466,11 @@
// },
{
field: 'poCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode'),
+ headerName: translate('table.field.asnOrderItem.poDetlCode')+"*",
minWidth: 100,
flex: 1,
editable: true,
+ headerClassName: "custom",
},
{
--
Gitblit v1.9.1