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
945a00cf
Commit
945a00cf
authored
Dec 22, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 新增单据 换货退货入库单 相关逻辑
parent
05669222
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
9 deletions
+45
-9
useBusinessEffects.ts
.../bills/components/BillsForm/effects/useBusinessEffects.ts
+9
-3
fetchBillList.ts
...ckSellStorage/bills/components/BillsForm/fetchBillList.ts
+30
-0
index.tsx
...ion/stockSellStorage/bills/components/BillsForm/index.tsx
+6
-6
No files found.
src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts
View file @
945a00cf
...
...
@@ -54,6 +54,7 @@ import {
getRefundDeliveryList
,
getRefundWarehousingList
,
getExchangeDeliveryList
,
getExchangeWarehousingList
,
}
from
'../fetchBillList'
;
const
{
...
...
@@ -156,9 +157,9 @@ const getParams = type => {
// 换货退货发货单
case
DOC_TYPE_EXCHANGE_RETURN_INVOICE
:
{
basicParams
.
modalProps
.
title
=
'选择售后单'
;
basicParams
.
columns
=
getAfterSaleColumns
(
fals
e
);
basicParams
.
columns
=
getAfterSaleColumns
(
tru
e
);
basicParams
.
fetchTableData
=
getExchangeDeliveryList
;
basicParams
.
formilyProps
.
ctx
.
schema
=
afterSaleBillSchema
(
fals
e
);
basicParams
.
formilyProps
.
ctx
.
schema
=
afterSaleBillSchema
(
tru
e
);
basicParams
.
tableProps
.
rowKey
=
'applyNo'
;
basicParams
.
tableProps
.
lableKey
=
'applyNo'
;
break
;
...
...
@@ -166,7 +167,12 @@ const getParams = type => {
// 换货退货入库单
case
DOC_TYPE_EXCHANGE_RETURN_RECEIPT
:
{
basicParams
.
modalProps
.
title
=
'选择售后单'
;
basicParams
.
columns
=
getAfterSaleColumns
(
false
);
basicParams
.
fetchTableData
=
getExchangeWarehousingList
;
basicParams
.
formilyProps
.
ctx
.
schema
=
afterSaleBillSchema
(
false
);
basicParams
.
tableProps
.
rowKey
=
'applyNo'
;
basicParams
.
tableProps
.
lableKey
=
'applyNo'
;
break
;
}
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/fetchBillList.ts
View file @
945a00cf
...
...
@@ -177,4 +177,33 @@ export const getExchangeDeliveryList = async (params: any) => {
};
}
return
[];
};
// 获取售后换货退货入库单单相关数据
export
const
getExchangeWarehousingList
=
async
(
params
:
any
)
=>
{
const
{
search
,
startTime
,
endTime
,
...
rest
}
=
params
;
const
res
=
await
PublicApi
.
getAsReplaceGoodsPageToBeAddReturnGoodsStorage
({
applyNo
:
search
,
startTime
:
startTime
?
moment
(
+
startTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
null
,
endTime
:
endTime
?
moment
(
+
endTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
null
,
...
rest
,
})
if
(
res
.
code
===
1000
)
{
return
{
data
:
res
.
data
.
data
.
map
(
item
=>
({
...
item
,
id
:
item
.
replaceId
,
memberName
:
item
.
supplierName
,
membersId
:
item
.
parentMemberId
,
membersRoleId
:
item
.
parentMemberRoleId
,
deliveryAddresId
:
item
.
returnGoodsAddress
.
receiveId
,
fullAddress
:
item
.
returnGoodsAddress
.
receiveAddress
||
''
,
receiverName
:
item
.
returnGoodsAddress
.
receiveUserName
||
''
,
phone
:
item
.
returnGoodsAddress
.
receiveUserTel
||
''
,
deliveryType
:
item
.
returnGoodsAddress
.
deliveryType
||
''
,
})),
total
:
res
.
data
.
totalCount
,
};
}
return
[];
};
\ No newline at end of file
src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
View file @
945a00cf
...
...
@@ -540,15 +540,15 @@ const BillsForm: React.FC<BillsFormProps> = ({
fullAddress
:
returnGoodsAddress
.
receiveAddress
||
''
,
receiverName
:
returnGoodsAddress
.
receiveUserName
||
''
,
phone
:
returnGoodsAddress
.
receiveUserTel
||
''
,
supplyMembersName
:
supplierName
,
supplyMembersId
:
parentMemberId
,
supplyMembersRoleId
:
parentMemberRoleId
,
}
]
:
[]
,
deliveryType
:
returnGoodsAddress
.
deliveryType
,
transport
:
DELIVERY_TYPE
[
returnGoodsAddress
.
deliveryType
],
supplyMembersName
:
supplierName
,
supplyMembersId
:
parentMemberId
,
supplyMembersRoleId
:
parentMemberRoleId
,
});
}).
finally
(()
=>
{
setInfoLoading
(
false
);
...
...
@@ -1297,9 +1297,9 @@ const BillsForm: React.FC<BillsFormProps> = ({
}),
relevanceInvoicesId
:
orderNo
[
0
].
id
,
relevanceInvoices
:
rest
.
relevanceInvoices
,
supplyMembersName
:
billInfo
.
supplyMembersName
,
supplyMembersId
:
billInfo
.
supplyMembersId
,
supplyMembersRoleId
:
billInfo
.
supplyMembersRoleId
,
supplyMembersName
:
orderNo
[
0
]
.
supplyMembersName
,
supplyMembersId
:
orderNo
[
0
]
.
supplyMembersId
,
supplyMembersRoleId
:
orderNo
[
0
]
.
supplyMembersRoleId
,
invoicesTypeId
,
})
.
then
(
res
=>
{
...
...
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