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
087ff74c
Commit
087ff74c
authored
Dec 21, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复售后相关问题
parent
a63820dd
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
22 deletions
+34
-22
NormalTable.tsx
src/components/PolymericTable/NormalTable.tsx
+1
-2
index.tsx
src/pages/afterService/components/GoodsDrawer/index.tsx
+3
-3
index.tsx
src/pages/afterService/components/ReturnInfoDrawer/index.tsx
+2
-1
index.ts
...tion/returnPrSubmit/components/ReturnForm/schema/index.ts
+13
-1
index.tsx
src/pages/member/components/EquityInfo/index.tsx
+14
-12
useBusinessEffects.ts
.../bills/components/BillsForm/effects/useBusinessEffects.ts
+0
-2
ytt.config.ts
ytt.config.ts
+1
-1
No files found.
src/components/PolymericTable/NormalTable.tsx
View file @
087ff74c
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-08-20 16:15:59
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-
08-21 17:07:35
* @LastEditTime: 2020-
12-21 13:57:12
* @Description: 简单封装了分页事件的 Table
*/
import
React
from
'react'
;
...
...
@@ -54,7 +54,6 @@ export default class NormalTable extends React.PureComponent<StandardTableProps>
showSizeChanger
:
true
,
showQuickJumper
:
true
,
onChange
:
this
.
handlePaginationChange
,
onShowSizeChange
:
this
.
handlePaginationChange
,
size
:
'small'
,
showTotal
:
()
=>
`共
${
pagination
.
total
||
0
}
条`
,
...
pagination
,
...
...
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @
087ff74c
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 15:09:09
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-
17 15:25:03
* @LastEditTime: 2020-12-
21 11:44:17
* @Description: 维修商品抽屉组件
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
...
...
@@ -22,7 +22,7 @@ import { PublicApi } from '@/services/api';
const
formActions
=
createFormActions
();
const
PAGE_SIZE
=
5
;
const
PAGE_SIZE
=
10
;
interface
GoodsDrawerProps
{
// 选中值(子表格的值)
...
...
@@ -525,7 +525,7 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
const
first
=
data
.
length
?
data
[
0
]
:
null
;
if
(
!
first
)
{
return
;
return
[]
;
}
const
filtered
=
data
.
filter
(
item
=>
item
.
processEnum
===
first
.
processEnum
);
if
(
filtered
.
length
!==
data
.
length
)
{
...
...
src/pages/afterService/components/ReturnInfoDrawer/index.tsx
View file @
087ff74c
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 17:36:45
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-
09 16:38:48
* @LastEditTime: 2020-12-
21 11:13:21
* @Description: 查看退货数量与退款金额 抽屉
*/
import
React
from
'react'
;
...
...
@@ -164,6 +164,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
</
Button
>
</
div
>
}
destroyOnClose
>
<
NiceForm
initialValues=
{
orderInfo
}
...
...
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/schema/index.ts
View file @
087ff74c
...
...
@@ -226,7 +226,7 @@ export const addBillSchema: ISchema = {
'x-rules'
:
[
{
required
:
true
,
message
:
'请选择
维修
商品'
,
message
:
'请选择
退货
商品'
,
},
],
items
:
{
...
...
@@ -286,11 +286,23 @@ export const addBillSchema: ISchema = {
type
:
'string'
,
title
:
'退货数量'
,
'x-component'
:
'Text'
,
'x-rules'
:
[
{
required
:
true
,
message
:
'请输入退货数量'
,
},
],
},
refundAmount
:
{
type
:
'string'
,
title
:
'退款金额'
,
'x-component'
:
'Text'
,
'x-rules'
:
[
{
required
:
true
,
message
:
'请输入退款金额'
,
},
],
},
// 其他数据,不用于展示,只用于收集值
extraData
:
{
...
...
src/pages/member/components/EquityInfo/index.tsx
View file @
087ff74c
...
...
@@ -79,13 +79,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
const
[
receivedPage
,
setReceivedPage
]
=
useState
(
1
);
const
[
receivedSize
,
setReceivedSize
]
=
useState
(
PAGE_SIZE
);
const
[
receivedTotal
,
setReceivedTotal
]
=
useState
(
0
);
const
[
receivedList
,
setReceivedList
]
=
useState
([]);
const
[
receivedList
,
setReceivedList
]
=
useState
<
ReceivedData
[]
>
([]);
const
[
receivedListLoading
,
setReceivedListLoading
]
=
useState
(
false
);
const
[
usagePage
,
setUsagePage
]
=
useState
(
1
);
const
[
usageSize
,
setUsageSize
]
=
useState
(
PAGE_SIZE
);
const
[
usageTotal
,
setUsageTotal
]
=
useState
(
0
);
const
[
usageList
,
setUsageList
]
=
useState
([]);
const
[
usageList
,
setUsageList
]
=
useState
<
UsageData
[]
>
([]);
const
[
usageListLoading
,
setUsageListLoading
]
=
useState
(
false
);
const
receivedColumns
:
EditableColumns
[]
=
[
...
...
@@ -151,15 +151,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
},
];
const
getReceivedList
=
()
=>
{
const
getReceivedList
=
(
params
?
)
=>
{
if
(
fetchReceivedList
)
{
if
(
receivedListLoading
)
{
return
;
}
setReceivedListLoading
(
true
);
fetchReceivedList
({
current
:
receivedPage
,
pageSize
:
receivedSize
,
...
params
,
}).
then
(
res
=>
{
const
{
data
=
[],
totalCount
=
0
}
=
(
res
||
{});
setReceivedList
(
data
);
...
...
@@ -170,15 +168,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
}
};
const
getUsageList
=
()
=>
{
const
getUsageList
=
(
params
?
)
=>
{
if
(
fetchUsageList
)
{
if
(
usageListLoading
)
{
return
;
}
setUsageListLoading
(
true
);
fetchUsageList
({
current
:
usagePage
,
pageSize
:
usageSize
,
...
params
,
}).
then
(
res
=>
{
const
{
data
=
[],
totalCount
=
0
}
=
(
res
||
{});
setUsageList
(
data
);
...
...
@@ -211,13 +207,19 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
const
handleReceivedPaginationChange
=
(
page
:
number
,
size
:
number
)
=>
{
setReceivedPage
(
page
);
setReceivedSize
(
size
);
getReceivedList
();
getReceivedList
({
current
:
page
,
pageSize
:
size
,
});
};
const
handleUsagePaginationChange
=
(
page
:
number
,
size
:
number
)
=>
{
setUsagePage
(
page
);
setUsageSize
(
size
);
getReceivedList
();
getUsageList
({
current
:
page
,
pageSize
:
size
,
});
};
return
(
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts
View file @
087ff74c
...
...
@@ -497,8 +497,6 @@ export const useBusinessEffects = (context, actions) => {
if
(
fieldState
.
name
===
'invoicesTypeId'
)
{
const
invoicesTypeIdState
=
getFieldState
(
'invoicesTypeId'
);
console
.
log
(
'invoicesTypeIdState2'
,
invoicesTypeIdState
)
if
(
invoicesTypeIdState
.
value
)
{
const
current
=
invoicesTypeIdState
.
originAsyncData
.
find
(
item
=>
item
.
id
===
invoicesTypeIdState
.
value
);
...
...
ytt.config.ts
View file @
087ff74c
...
...
@@ -21,7 +21,7 @@ const getConfigMap = (tokens) => tokens.map(v => ({
enabled
:
false
,
},
outputFilePath
:
`src/services/
${
v
.
name
}
Api`
,
requestFunctionFilePath
:
'request.ts'
,
requestFunctionFilePath
:
'
@/utils/
request.ts'
,
dataKey
:
'data'
,
projects
:
[
{
...
...
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