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
linweijiong
jinfa-platform
Commits
60c0aeb2
Commit
60c0aeb2
authored
Dec 10, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
23b4f5de
76227308
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
19 deletions
+28
-19
index.tsx
src/pages/afterService/components/GoodsDrawer/index.tsx
+8
-1
index.tsx
...cation/exchangePrSubmit/components/ExchangeForm/index.tsx
+3
-3
index.tsx
...pplication/repairPrSubmit/components/RepairForm/index.tsx
+1
-1
index.tsx
...pplication/returnPrSubmit/components/ReturnForm/index.tsx
+1
-0
index.ts
...tion/returnPrSubmit/components/ReturnForm/schema/index.ts
+1
-1
verify.tsx
...pages/afterService/returnManage/returnPrReturn/verify.tsx
+14
-13
No files found.
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @
60c0aeb2
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2020-11-04 15:09:09
* @Date: 2020-11-04 15:09:09
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-1
1-25 11:22:4
0
* @LastEditTime: 2020-1
2-10 17:56:2
0
* @Description: 维修商品抽屉组件
* @Description: 维修商品抽屉组件
*/
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
React
,
{
useState
,
useEffect
}
from
'react'
;
...
@@ -392,6 +392,13 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
...
@@ -392,6 +392,13 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
})
:
})
:
[]
[]
,
,
// 计算已支付金额,采购单价 * 支付比例 累加
payAmount
:
item
.
payInfoList
?
item
.
payInfoList
.
reduce
((
prev
,
now
)
=>
{
return
+
((
product
.
price
*
product
.
purchaseCount
*
(
now
.
payRatio
/
100
)).
toFixed
(
2
))
+
prev
;
},
0
)
:
0
});
});
}
}
});
});
...
...
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx
View file @
60c0aeb2
...
@@ -456,10 +456,10 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
...
@@ -456,10 +456,10 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
backIcon=
{
<
ReutrnEle
description=
"返回"
/>
}
backIcon=
{
<
ReutrnEle
description=
"返回"
/>
}
title=
{
title=
{
!
id
?
!
id
?
'新建
退
货申请单'
:
'新建
换
货申请单'
:
isEdit
?
isEdit
?
'编辑
退
货申请单'
:
'编辑
换
货申请单'
:
'查看
退
货申请单'
'查看
换
货申请单'
}
}
extra=
{
extra=
{
(
isEdit
||
!
id
)
(
isEdit
||
!
id
)
...
...
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/index.tsx
View file @
60c0aeb2
...
@@ -179,7 +179,7 @@ const RepairForm: React.FC<BillsFormProps> = ({
...
@@ -179,7 +179,7 @@ const RepairForm: React.FC<BillsFormProps> = ({
const
handleSubmit
=
values
=>
{
const
handleSubmit
=
values
=>
{
const
{
const
{
supplierMember
,
supplierMember
,
faultFileList
,
faultFileList
=
[]
,
repairGoodsList
,
repairGoodsList
,
repairAddress
,
repairAddress
,
...
rest
...
rest
...
...
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @
60c0aeb2
...
@@ -473,6 +473,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
...
@@ -473,6 +473,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
purchaseCount
:
item
.
purchaseCount
,
purchaseCount
:
item
.
purchaseCount
,
purchaseAmount
:
+
(
item
.
price
*
item
.
purchaseCount
).
toFixed
(
2
),
purchaseAmount
:
+
(
item
.
price
*
item
.
purchaseCount
).
toFixed
(
2
),
returnedCount
:
item
.
returnCount
||
item
.
purchaseCount
||
0
,
// 已退货数量
returnedCount
:
item
.
returnCount
||
item
.
purchaseCount
||
0
,
// 已退货数量
payAmount
:
item
.
payAmount
,
returnCount
:
''
,
returnCount
:
''
,
returnAmount
:
''
,
returnAmount
:
''
,
extraData
:
{
extraData
:
{
...
...
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/schema/index.ts
View file @
60c0aeb2
...
@@ -270,7 +270,7 @@ export const addBillSchema: ISchema = {
...
@@ -270,7 +270,7 @@ export const addBillSchema: ISchema = {
title
:
'采购金额'
,
title
:
'采购金额'
,
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
},
},
costPrice4
:
{
payAmount
:
{
type
:
'string'
,
type
:
'string'
,
title
:
'已支付金额'
,
title
:
'已支付金额'
,
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
...
...
src/pages/afterService/returnManage/returnPrReturn/verify.tsx
View file @
60c0aeb2
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2020-11-04 17:22:07
* @Date: 2020-11-04 17:22:07
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-
09 15:30:56
* @LastEditTime: 2020-12-
10 18:28:29
* @Description:
* @Description:
*/
*/
import
React
,
{
useState
}
from
'react'
;
import
React
,
{
useState
}
from
'react'
;
...
@@ -14,24 +14,24 @@ import { usePageStatus } from '@/hooks/usePageStatus';
...
@@ -14,24 +14,24 @@ import { usePageStatus } from '@/hooks/usePageStatus';
import
DetailInfo
from
'../components/DetailInfo'
;
import
DetailInfo
from
'../components/DetailInfo'
;
const
ReturnPrReturnVerify
:
React
.
FC
=
()
=>
{
const
ReturnPrReturnVerify
:
React
.
FC
=
()
=>
{
const
{
id
,
creditId
}
=
usePageStatus
();
const
{
id
}
=
usePageStatus
();
const
[
visible
,
setVisible
]
=
useState
(
false
);
const
[
visible
,
setVisible
]
=
useState
(
false
);
const
[
submitLoading
,
setSubmitLoading
]
=
useState
(
false
);
const
[
submitLoading
,
setSubmitLoading
]
=
useState
(
false
);
const
handleSubmit
=
values
=>
{
const
handleSubmit
=
()
=>
{
if
(
!
id
)
{
if
(
!
id
)
{
return
;
return
;
}
}
//
setSubmitLoading(true);
setSubmitLoading
(
true
);
// PublicApi.postAsReturnGoodsConfirmAll
Refund({
PublicApi
.
postAsReturnGoodsComplete
Refund
({
//
dataId: id,
dataId
:
id
,
//
}).then(res => {
}).
then
(
res
=>
{
//
if (res.code === 1000) {
if
(
res
.
code
===
1000
)
{
//
history.goBack();
history
.
goBack
();
//
}
}
//
}).finally(() => {
}).
finally
(()
=>
{
//
setSubmitLoading(false);
setSubmitLoading
(
false
);
//
});
});
};
};
return
(
return
(
...
@@ -44,6 +44,7 @@ const ReturnPrReturnVerify: React.FC = () => {
...
@@ -44,6 +44,7 @@ const ReturnPrReturnVerify: React.FC = () => {
type=
"primary"
type=
"primary"
icon=
{
<
FormOutlined
/>
}
icon=
{
<
FormOutlined
/>
}
loading=
{
submitLoading
}
loading=
{
submitLoading
}
onClick=
{
handleSubmit
}
>
>
确认本单已完成所有退款
确认本单已完成所有退款
</
Button
>
</
Button
>
...
...
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