From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复
---
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index 94a86e0..6c2dc38 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -57,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;
@@ -103,6 +104,7 @@
...prevData,
[name]: value
}));
+ console.log(formData);
};
const resetData = () => {
@@ -180,7 +182,7 @@
setFormData(res.data.data)
} else {
notify(res.data.msg);
- }
+ }
}
const requestGetBody = async () => {
@@ -202,7 +204,7 @@
}
return (
- <>
+ <>
<Dialog
open={open}
onClose={handleClose}
@@ -211,7 +213,7 @@
fullWidth
disableRestoreFocus
maxWidth="lg" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
- >
+ >
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
top: 0,
@@ -225,7 +227,7 @@
</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
@@ -317,7 +319,8 @@
getOptions();
}, []);
const getOptions = async () => {
- const parmas = {
+ const parmas = {
+ "type": "supplier"
}
const {
data: { code, data, msg },
@@ -333,19 +336,33 @@
return (
<Select
value={params.value}
- onChange={(e) =>
- params.api.setEditCellValue({
- id: params.id,
- field: params.field,
- value: e.target.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);
+
+ // 濡傛灉鎵惧埌瀵瑰簲鐨勪緵搴斿晢璁板綍锛屽悓鏃舵洿鏂皊plrCode瀛楁
+ if (selectedSupplier) {
+ params.api.setEditCellValue({
+ id: params.id,
+ field: 'splrCode',
+ value: selectedSupplier.id,
+ });
+ }
+
+ }
+
}
fullWidth
- autoFocus
+
>
{formData.map(e => {
return(
- <MenuItem value={e.name} children={e.name} />
+ <MenuItem value={e.name} children={e.name} key={e.id} />
);
})}
@@ -360,7 +377,8 @@
getOptions();
}, []);
const getOptions = async () => {
- const parmas = {
+ const parmas = {
+ "type": "supplier"
}
const {
data: { code, data, msg },
@@ -376,19 +394,31 @@
return (
<Select
value={params.value}
- onChange={(e) =>
- params.api.setEditCellValue({
- id: params.id,
- field: params.field,
- value: e.target.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
- autoFocus
+
>
{formData.map(e => {
return(
- <MenuItem value={e.id} children={e.name} />
+ <MenuItem value={e.id} children={e.name} key={e.id} />
);
})}
@@ -420,33 +450,35 @@
},
{
field: 'anfme',
- headerName: translate('table.field.asnOrderItem.anfme'),
+ 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',
@@ -463,10 +495,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