From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +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 | 159 +++++++++++++++++++++++++++++++----------------------
1 files changed, 93 insertions(+), 66 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index 1dab7ad..598b133 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -61,14 +61,13 @@
const AsnOrderModal = (props) => {
const { open, setOpen, asnId, billReload } = props;
+ const business = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type') && dict.group == '2') || [];
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
const [disabled, setDisabled] = useState(false)
-
const [createDialog, setCreateDialog] = useState(false);
-
const tableRef = useRef();
useEffect(() => {
@@ -104,6 +103,7 @@
...prevData,
[name]: value
}));
+ console.log(formData);
};
const resetData = () => {
@@ -226,14 +226,14 @@
</DialogTitle>
<DialogContent sx={{ mt: 2 }}>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
- <Form>
+ <Form defaultValues={formData}>
<Grid container spacing={2}>
<Grid item md={3}>
<DictSelect
label={translate("table.field.asnOrder.type")}
value={formData.type}
onChange={(e) => handleChange(e.target.value, 'type')}
- dictTypeCode="sys_order_type"
+ dictTypeCode="sys_in_stock_type"
required
/>
</Grid>
@@ -241,6 +241,7 @@
<DictSelect
label={translate("table.field.asnOrder.wkType")}
value={formData.wkType}
+ group='2'
onChange={(e) => handleChange(e.target.value, 'wkType')}
dictTypeCode="sys_business_type"
required
@@ -283,7 +284,7 @@
<Stack direction="row" spacing={2}>
<Button variant="contained" onClick={() => setCreateDialog(true)}>鏂板鐗╂枡</Button>
{/* {asnId !== '' && <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDelete} />} */}
- <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDeleteItem} />
+ <ConfirmButton label={'ra.action.delete'} variant="outlined" color="error" onConfirm={handleDeleteItem} />
</Stack>
</Box>
<Box sx={{ mt: 2 }}>
@@ -317,88 +318,114 @@
useEffect(() => {
getOptions();
}, []);
- const getOptions = async () => {
- const parmas = {
- "type": "supplier"
+ const getOptions = async () => {
+ const parmas = {
+ "type": "supplier"
}
const {
data: { code, data, msg },
- } = await request.post("companys/page",parmas);
+ } = await request.post("companys/page", parmas);
if (code === 200) {
setFormData(data.records)
- console.log(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>
- );
- };
+ value={params.value}
+ onChange={(e) => {
+ params.api.setEditCellValue({
+ id: params.id,
+ field: params.field,
+ value: e.target.value,
+ })
+ // 鎵惧埌閫変腑鐨勪緵搴斿晢璁板綍
+ const selectedSupplier = formData.find(supplier => supplier.name === e.target.value);
- const SelectInputSplrCodeEditCell = (params) => {
+ // 濡傛灉鎵惧埌瀵瑰簲鐨勪緵搴斿晢璁板綍锛屽悓鏃舵洿鏂皊plrCode瀛楁
+ if (selectedSupplier) {
+ params.api.setEditCellValue({
+ id: params.id,
+ field: 'splrCode',
+ value: selectedSupplier.id,
+ });
+ }
+
+ }
+
+ }
+ fullWidth
+
+ >
+ {formData.map(e => {
+ return (
+ <MenuItem value={e.name} children={e.name} key={e.id} />
+ );
+
+ })}
+
+ </Select>
+ );
+};
+
+const SelectInputSplrCodeEditCell = (params) => {
const [formData, setFormData] = useState([{}])
useEffect(() => {
getOptions();
}, []);
- const getOptions = async () => {
- const parmas = {
- "type": "supplier"
+ const getOptions = async () => {
+ const parmas = {
+ "type": "supplier"
}
const {
data: { code, data, msg },
- } = await request.post("companys/page",parmas);
+ } = await request.post("companys/page", parmas);
if (code === 200) {
setFormData(data.records)
- console.log(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>
+ value={params.value}
+ onChange={(e) => {
+ params.api.setEditCellValue({
+ id: params.id,
+ field: params.field,
+ value: e.target.value,
+ })
+ const selectedSupplier = formData.find(supplier => supplier.id === e.target.value);
+
+ // 濡傛灉鎵惧埌瀵瑰簲鐨勪緵搴斿晢璁板綍锛屽悓鏃舵洿鏂皊plrCode瀛楁
+ if (selectedSupplier) {
+ params.api.setEditCellValue({
+ id: params.id,
+ field: 'splrName',
+ value: selectedSupplier.name,
+ });
+ }
+ }
+
+ }
+ fullWidth
+
+ >
+ {formData.map(e => {
+ return (
+ <MenuItem value={e.id} children={e.name} key={e.id} />
+ );
+
+ })}
+
+ </Select>
);
- };
+};
@@ -423,7 +450,7 @@
},
{
field: 'anfme',
- headerName: translate('table.field.asnOrderItem.anfme')+"*",
+ headerName: translate('table.field.asnOrderItem.anfme') + "*",
type: 'number',
minWidth: 100,
flex: 1,
@@ -433,18 +460,18 @@
},
{
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",
+ headerClassName: "custom",
},
{
field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName')+"*",
+ headerName: translate('table.field.asnOrderItem.splrName') + "*",
minWidth: 100,
flex: 1,
editable: true,
@@ -468,7 +495,7 @@
// },
{
field: 'poCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode')+"*",
+ headerName: translate('table.field.asnOrderItem.poDetlCode') + "*",
minWidth: 100,
flex: 1,
editable: true,
--
Gitblit v1.9.1