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
e035996a
Commit
e035996a
authored
Dec 24, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改售后相关bug
parent
abaf37d3
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
44 additions
and
11 deletions
+44
-11
index.tsx
src/pages/afterService/components/GoodsDrawer/index.tsx
+6
-1
useBusinessEffects.ts
...mit/components/ExchangeForm/effects/useBusinessEffects.ts
+10
-1
index.tsx
...cation/exchangePrSubmit/components/ExchangeForm/index.tsx
+3
-2
useBusinessEffects.ts
...ubmit/components/RepairForm/effects/useBusinessEffects.ts
+9
-0
index.tsx
...pplication/repairPrSubmit/components/RepairForm/index.tsx
+1
-1
useBusinessEffects.ts
...ubmit/components/ReturnForm/effects/useBusinessEffects.ts
+9
-0
index.tsx
...pplication/returnPrSubmit/components/ReturnForm/index.tsx
+1
-1
index.tsx
...afterService/returnManage/components/DetailInfo/index.tsx
+1
-1
index.tsx
src/pages/afterService/returnManage/returnPrReturn/index.tsx
+2
-2
index.tsx
...ion/stockSellStorage/bills/components/BillsForm/index.tsx
+2
-2
No files found.
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @
e035996a
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 15:09:09
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-2
1 11:44:17
* @LastEditTime: 2020-12-2
4 10:32:10
* @Description: 维修商品抽屉组件
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
...
...
@@ -247,6 +247,11 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
});
});
if
(
!
payload
.
length
)
{
this
.
setState
({
loading
:
false
});
return
;
}
processEnumRes
=
await
PublicApi
.
postOrderGetProcessEnum
({
list
:
payload
,
},
{
...
...
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/effects/useBusinessEffects.ts
View file @
e035996a
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-03 18:30:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-
11 10:29:51
* @LastEditTime: 2020-12-
24 10:36:02
* @Description: 联动逻辑相关
*/
import
{
Modal
}
from
'antd'
;
...
...
@@ -74,4 +74,12 @@ export const useBusinessEffects = (context, actions) => {
}
);
});
// 供应会员联动 单据明细
onFieldInputChange$
(
'supplierMember'
).
subscribe
(
fieldState
=>
{
const
replaceGoodsListValue
=
getFieldValue
(
'replaceGoodsList'
);
if
(
replaceGoodsListValue
&&
replaceGoodsListValue
.
length
)
{
setFieldValue
(
'replaceGoodsList'
,
[]);
}
});
}
\ No newline at end of file
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx
View file @
e035996a
...
...
@@ -137,8 +137,9 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
},
{
title
:
'采购金额'
,
dataIndex
:
'
price'
,
dataIndex
:
'
amount'
,
align
:
'center'
,
render
:
(
_
,
record
)
=>
(
record
.
purchaseCount
*
record
.
price
).
toFixed
(
2
),
},
{
title
:
'已换货数量'
,
...
...
@@ -493,7 +494,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
>
<
Card
>
<
NiceForm
initialValues=
{
{
value=
{
{
...
detailInfo
,
replaceGoodsList
:
replaceGoodsList
.
data
,
}
}
...
...
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/effects/useBusinessEffects.ts
View file @
e035996a
...
...
@@ -51,4 +51,12 @@ export const useBusinessEffects = (context, actions) => {
}
);
});
// 供应会员联动 单据明细
onFieldInputChange$
(
'supplierMember'
).
subscribe
(
fieldState
=>
{
const
replaceGoodsListValue
=
getFieldValue
(
'repairGoodsList'
);
if
(
replaceGoodsListValue
&&
replaceGoodsListValue
.
length
)
{
setFieldValue
(
'repairGoodsList'
,
[]);
}
});
}
\ No newline at end of file
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/index.tsx
View file @
e035996a
...
...
@@ -339,7 +339,7 @@ const RepairForm: React.FC<BillsFormProps> = ({
>
<
Card
>
<
NiceForm
initialValues=
{
{
value=
{
{
...
detailInfo
,
repairGoodsList
:
repairGoodsList
.
data
,
}
}
...
...
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/effects/useBusinessEffects.ts
View file @
e035996a
...
...
@@ -48,4 +48,12 @@ export const useBusinessEffects = (context, actions) => {
break
};
});
// 供应会员联动 单据明细
onFieldInputChange$
(
'supplierMember'
).
subscribe
(
fieldState
=>
{
const
replaceGoodsListValue
=
getFieldValue
(
'returnGoodsList'
);
if
(
replaceGoodsListValue
&&
replaceGoodsListValue
.
length
)
{
setFieldValue
(
'returnGoodsList'
,
[]);
}
});
}
\ No newline at end of file
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @
e035996a
...
...
@@ -557,7 +557,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
>
<
Card
>
<
NiceForm
initialValues
=
{
{
value
=
{
{
...
detailInfo
,
returnGoodsList
:
returnGoodsList
.
data
,
}
}
...
...
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @
e035996a
...
...
@@ -110,7 +110,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
});
PublicApi
.
postAsReturnGoodsSetNeedReturnGoods
({
returnId
:
+
id
,
returnGoodsId
:
record
.
orderRecord
Id
,
returnGoodsId
:
record
.
returnGoods
Id
,
isNeed
:
record
.
isNeedReturn
===
1
?
0
:
1
,
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
src/pages/afterService/returnManage/returnPrReturn/index.tsx
View file @
e035996a
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 14:25:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-
08 17:32:59
* @LastEditTime: 2020-12-
24 10:04:24
* @Description: 退货申请单查询
*/
import
React
,
{
useState
,
useRef
}
from
'react'
;
...
...
@@ -99,7 +99,7 @@ const ReturnPrReturn: React.FC = () => {
type=
"link"
onClick=
{
()
=>
history
.
push
(
`/memberCenter/afterService/returnManage/returnPrReturn/verify?id=${record.returnId}`
)
}
>
提交审核
退款
</
Button
>
</>
),
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
View file @
e035996a
...
...
@@ -186,7 +186,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
);
setBillInfo
({
transactionTime
:
transactionTime
?
moment
(
transactionTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
)
,
transactionTime
:
transactionTime
?
moment
(
transactionTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
''
,
orderNo
:
relevanceInvoicesId
?
[
...
...
@@ -1656,7 +1656,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
>
<
Card
>
<
NiceForm
initialValues
=
{
billInfo
}
value
=
{
billInfo
}
expressionScope=
{
{
TableAddButton
,
renderListTableRemove
,
...
...
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