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
黄庭坚
jinfa-platform
Commits
1aac5d97
Commit
1aac5d97
authored
Jan 26, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理新增采购招标合同物料id没有取goodsId的问题
parent
890e9e54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
channelSchema.tsx
src/pages/commodity/products/schema/channelSchema.tsx
+10
-8
FormList.tsx
src/pages/contract/manage/add/components/FormList.tsx
+1
-1
No files found.
src/pages/commodity/products/schema/channelSchema.tsx
View file @
1aac5d97
...
...
@@ -38,7 +38,7 @@ export const channelSchema: ISchema = {
'x-component'
:
'flex-layout'
,
'x-component-props'
:
{
rowStyle
:
{
flexWrap
:
'
no
wrap'
,
flexWrap
:
'wrap'
,
},
colStyle
:
{
marginLeft
:
20
,
...
...
@@ -48,21 +48,22 @@ export const channelSchema: ISchema = {
productId
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.productSchema.productId'
})
placeholder
:
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.productSchema.productId'
}),
style
:
{
width
:
174
},
}
},
memberName
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.channelSchema.memberName'
}),
style
:
{
width
:
1
00
},
style
:
{
width
:
1
74
},
},
},
memberRoleName
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.channelSchema.memberRoleName'
}),
style
:
{
width
:
1
00
},
style
:
{
width
:
1
74
},
},
},
brandId
:
{
...
...
@@ -75,7 +76,7 @@ export const channelSchema: ISchema = {
defaultActiveFirstOption
:
false
,
filterOption
:
false
,
notFoundContent
:
null
,
style
:
{
width
:
1
00
},
style
:
{
width
:
1
74
},
searchValue
:
null
,
dataoption
:
[],
},
...
...
@@ -87,7 +88,7 @@ export const channelSchema: ISchema = {
placeholder
:
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.channelSchema.customerCategoryId'
}),
showSearch
:
true
,
notFoundContent
:
null
,
style
:
{
width
:
'174px'
},
style
:
{
width
:
174
},
dataoption
:
[],
fieldNames
:
{
label
:
'title'
,
value
:
'id'
,
children
:
'children'
},
},
...
...
@@ -106,7 +107,7 @@ export const channelSchema: ISchema = {
],
'x-component-props'
:
{
placeholder
:
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.channelSchema.source.placeholder'
}),
style
:
{
width
:
1
00
},
style
:
{
width
:
1
74
},
},
},
statusList
:
{
...
...
@@ -127,7 +128,7 @@ export const channelSchema: ISchema = {
],
'x-component-props'
:
{
placeholder
:
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.channelSchema.statusList.placeholder'
}),
style
:
{
width
:
1
00
},
style
:
{
width
:
1
74
},
},
},
// priceTypeList: {
...
...
@@ -156,6 +157,7 @@ export const channelSchema: ISchema = {
'x-component'
:
'NumberRange'
,
'x-component-props'
:
{
placeholder
:
[
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.channelSchema.min'
}),
getIntl
().
formatMessage
({
id
:
'commodity.products.schema.channelSchema.max'
})],
style
:
{
width
:
'230px'
},
},
},
submit
:
{
...
...
src/pages/contract/manage/add/components/FormList.tsx
View file @
1aac5d97
...
...
@@ -125,7 +125,7 @@ const FormList = (props: any) => {
if
(
res
.
code
===
1000
)
{
let
data
=
res
.
data
.
data
.
map
((
item
,
index
)
=>
{
return
{
materielId
:
_filterArr
(
sourceType
,
item
,
[
''
,
'goodsId'
,
'
i
d'
,
''
]),
materielId
:
_filterArr
(
sourceType
,
item
,
[
''
,
'goodsId'
,
'
goodsI
d'
,
''
]),
code
:
_filter
(
sourceType
,
item
,
[
''
,
'number'
,
'code'
,
'number'
]),
// 物料编号
name
:
_filter
(
sourceType
,
item
,
[
''
,
'name'
,
'name'
,
'name'
]),
//物料名称
type
:
_filter
(
sourceType
,
item
,
[
''
,
'model'
,
'type'
,
'model'
]),
//物料规格
...
...
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