Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
e8c39664
Commit
e8c39664
authored
Apr 12, 2022
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改物料审核流程规则 选择部分物料回显问题
parent
ff072944
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
16 deletions
+27
-16
add.tsx
...ges/commodity/material/materialAuditProcessConfig/add.tsx
+14
-3
index.tsx
...ialAuditProcessConfig/components/selectMaterial/index.tsx
+13
-13
No files found.
src/pages/commodity/material/materialAuditProcessConfig/add.tsx
View file @
e8c39664
...
...
@@ -92,7 +92,18 @@ const Add = () => {
let
materialGroups
=
[]
if
(
data
.
suitableMaterialType
===
MATERIAL_ITEM
)
{
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
)
{
...
...
@@ -129,11 +140,11 @@ const Add = () => {
}
}),
}
}
else
if
(
values
.
suitableMaterialType
===
2
)
{
}
else
if
(
values
.
suitableMaterialType
===
3
)
{
tempData
=
{
materials
:
values
.
materials
?.
map
((
_item
)
=>
{
return
{
materialId
:
_item
,
materialId
:
_item
.
id
,
}
})
}
...
...
src/pages/commodity/material/materialAuditProcessConfig/components/selectMaterial/index.tsx
View file @
e8c39664
...
...
@@ -58,19 +58,19 @@ const SelectMaterial: React.FC<Iprops> & { isFieldComponent: boolean} = (props:
{
title
:
'规格型号'
,
dataIndex
:
'type'
,
render
:
(
text
,
record
)
=>
{
const
{
materialAttributeList
}
=
record
;
const
string
=
materialAttributeList
?.
reduce
((
prev
,
current
)
=>
{
const
{
customerAttributeValueList
}
=
current
;
const
temp
=
customerAttributeValueList
?.
map
((
_item
)
=>
{
return
_item
.
value
}).
join
(
'/'
);
return
prev
+
"/"
+
temp
},
""
).
slice
(
1
);
return
(
<
div
>
{
string
}
</
div
>
)
}
//
render: (text, record) => {
//
const { materialAttributeList } = record;
//
const string = materialAttributeList?.reduce((prev, current) => {
//
const { customerAttributeValueList } = current;
//
const temp = customerAttributeValueList?.map((_item) => {
//
return _item.value
//
}).join('/');
//
return prev + "/" + temp
//
}, "").slice(1);
//
return (
//
<div>{string}</div>
//
)
//
}
},
{
title
:
'品类'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment