Commit e8c39664 authored by Bill's avatar Bill

fix: 修改物料审核流程规则 选择部分物料回显问题

parent ff072944
...@@ -92,7 +92,18 @@ const Add = () => { ...@@ -92,7 +92,18 @@ const Add = () => {
let materialGroups = [] let materialGroups = []
if (data.suitableMaterialType === MATERIAL_ITEM) { if (data.suitableMaterialType === MATERIAL_ITEM) {
const listData = await getProductMaterialProcessPageRelMaterial({ processId: id }) const listData = await getProductMaterialProcessPageRelMaterial({ processId: id })
materials = [...listData.data]; materials = [...listData.data].map((_item) => {
return {
name: _item.materialName,
code: _item?.materialCode || '',
materialGroup: {
name: _item.materialGroupName,
},
id: _item.materialId,
..._item,
}
});
} }
if (data.suitableMaterialType === GROUP) { if (data.suitableMaterialType === GROUP) {
...@@ -129,11 +140,11 @@ const Add = () => { ...@@ -129,11 +140,11 @@ const Add = () => {
} }
}), }),
} }
} else if (values.suitableMaterialType === 2) { } else if (values.suitableMaterialType === 3) {
tempData = { tempData = {
materials: values.materials?.map((_item) => { materials: values.materials?.map((_item) => {
return { return {
materialId: _item, materialId: _item.id,
} }
}) })
} }
......
...@@ -58,19 +58,19 @@ const SelectMaterial: React.FC<Iprops> & { isFieldComponent: boolean} = (props: ...@@ -58,19 +58,19 @@ const SelectMaterial: React.FC<Iprops> & { isFieldComponent: boolean} = (props:
{ {
title: '规格型号', title: '规格型号',
dataIndex: 'type', dataIndex: 'type',
render: (text, record) => { // render: (text, record) => {
const { materialAttributeList } = record; // const { materialAttributeList } = record;
const string = materialAttributeList?.reduce((prev, current) => { // const string = materialAttributeList?.reduce((prev, current) => {
const { customerAttributeValueList } = current; // const { customerAttributeValueList } = current;
const temp = customerAttributeValueList?.map((_item) => { // const temp = customerAttributeValueList?.map((_item) => {
return _item.value // return _item.value
}).join('/'); // }).join('/');
return prev + "/" + temp // return prev + "/" + temp
}, "").slice(1); // }, "").slice(1);
return ( // return (
<div>{string}</div> // <div>{string}</div>
) // )
} // }
}, },
{ {
title: '品类', title: '品类',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment