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
abb04fdb
Commit
abb04fdb
authored
Aug 09, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 对接 scm订单售后退货相关
parent
b33cd4c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
16 deletions
+13
-16
index.tsx
...pplication/returnPrSubmit/components/ReturnForm/index.tsx
+6
-9
index.ts
...tion/returnPrSubmit/components/ReturnForm/schema/index.ts
+7
-7
No files found.
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @
abb04fdb
...
...
@@ -243,7 +243,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getOrderCommonAfterSalePage
({
...
payload
,
orderNo
:
detailInfo
.
orderNo
,
vendorMemberId
:
supplierMemberValue
[
0
].
memberId
,
vendorRoleId
:
supplierMemberValue
[
0
].
roleId
,
orderType
:
orderTypeValue
,
...
...
@@ -625,14 +624,12 @@ const ReturnForm: React.FC<BillsFormProps> = ({
taxRate
:
item
.
taxRate
,
contractId
:
item
.
contractId
,
contractNo
:
item
.
contractNo
,
associated
:
!
isMateriel
?
''
:
`
${
item
.
productNo
}
/
${
item
.
name
}
/
${
item
.
category
}
/
${
item
.
brand
}
`
,
associatedProductId
:
item
.
materialId
||
''
,
associatedProductName
:
`
${
item
.
materialName
||
''
}${
item
.
materialType
?
'/'
+
item
.
materialType
:
''
}
`
,
materielName
:
item
.
materialName
||
''
,
associatedType
:
item
.
materialType
||
''
,
associatedCategory
:
item
.
materialCategory
||
''
,
associatedBrand
:
item
.
materialBrand
||
''
,
associatedUnit
:
item
.
materialUnit
||
''
,
associated
:
!
isMateriel
?
''
:
`
${
item
.
associatedProductId
}
/
${
item
.
quotedName
}
/
${
item
.
category
}
/
${
item
.
brand
}
`
,
associatedProductId
:
item
.
quotedProductNo
||
''
,
associatedProductName
:
`
${
item
.
quotedName
||
''
}
`
,
associatedCategory
:
item
.
quotedCategory
||
''
,
associatedBrand
:
item
.
quotedBrand
||
''
,
associatedUnit
:
item
.
unit
||
''
,
};
value
.
push
(
atom
);
});
...
...
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/schema/index.ts
View file @
abb04fdb
...
...
@@ -145,7 +145,7 @@ export const addSchema = (orderType: number): ISchema => {
title
:
'关联'
,
tip
:
'请选择对应单据'
,
modalProps
:
{
title
:
'选择会员'
,
title
:
'选择会员'
,
},
columns
:
supplierColumns
,
fetchTableData
:
getSupplier
,
...
...
@@ -163,7 +163,7 @@ export const addSchema = (orderType: number): ISchema => {
},
tableProps
:
{
rowKey
:
'id'
,
lableKey
:
'name'
,
lableKey
:
'name'
,
},
},
'x-mega-props'
:
{
...
...
@@ -306,27 +306,27 @@ export const addSchema = (orderType: number): ISchema => {
title
:
'订单号'
,
'x-component'
:
'OrderNo'
,
},
materielNo
:
{
associatedProductId
:
{
type
:
'string'
,
title
:
'物料编号'
,
'x-component'
:
'Text'
,
},
materielNameAndTyp
e
:
{
associatedProductNam
e
:
{
type
:
'string'
,
title
:
'物料名称、规格'
,
'x-component'
:
'Text'
,
},
materiel
Category
:
{
associated
Category
:
{
type
:
'string'
,
title
:
'品类'
,
'x-component'
:
'Text'
,
},
materiel
Brand
:
{
associated
Brand
:
{
type
:
'string'
,
title
:
'品牌'
,
'x-component'
:
'Text'
,
},
materiel
Unit
:
{
associated
Unit
:
{
type
:
'string'
,
title
:
'单位'
,
'x-component'
:
'Text'
,
...
...
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