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
黄庭坚
jinfa-platform
Commits
228d9c81
Commit
228d9c81
authored
Jun 18, 2021
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改投诉建议bug
parent
1c109f3a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
14 deletions
+26
-14
add.tsx
src/pages/member/complaintsAndSuggests/add.tsx
+1
-1
index.tsx
src/pages/member/components/CustomizeQueryList/index.tsx
+1
-0
add.tsx
src/pages/member/memberQuery/suggest/add.tsx
+5
-4
useGetDetailCommon.tsx
...r/memberQuery/suggest/common/hooks/useGetDetailCommon.tsx
+3
-2
add.tsx
src/pages/member/memberQuery/suggest/common/schema/add.tsx
+1
-1
index.tsx
src/pages/member/memberQuery/suggest/common/schema/index.tsx
+3
-3
index.tsx
src/pages/member/memberQuery/suggest/index.tsx
+12
-3
No files found.
src/pages/member/complaintsAndSuggests/add.tsx
View file @
228d9c81
...
...
@@ -99,7 +99,7 @@ const SuggestAdd = () => {
const
formatedValue
=
useMemo
(()
=>
{
if
(
!
initialValue
)
{
return
;
return
{
type
:
1
}
;
}
const
{
name
,
byUserName
,
byUserPhone
,
...
rest
}
=
initialValue
;
return
{
...
...
src/pages/member/components/CustomizeQueryList/index.tsx
View file @
228d9c81
...
...
@@ -50,6 +50,7 @@ const CustomizeQueryList: React.FC<Iprops> = React.forwardRef((props: Iprops, re
const
onRresh
=
(
values
:
any
)
=>
{
const
data
=
formatData
?.(
values
)
||
values
;
console
.
log
(
"format"
,
data
);
tableRef
.
current
?.
reload
(
data
);
}
...
...
src/pages/member/memberQuery/suggest/add.tsx
View file @
228d9c81
...
...
@@ -83,7 +83,7 @@ const SuggestAdd = () => {
setMemberModalValue
([{
name
:
upperName
,
memberId
:
memberId
,
subR
oleId
:
roleId
r
oleId
:
roleId
}])
setUserModalValue
([
{
...
...
@@ -99,12 +99,12 @@ const SuggestAdd = () => {
const
formatedValue
=
useMemo
(()
=>
{
if
(
!
initialValue
)
{
return
;
return
{
type
:
1
}
;
}
const
{
n
ame
,
byUserName
,
byUserPhone
,
...
rest
}
=
initialValue
;
const
{
upperN
ame
,
byUserName
,
byUserPhone
,
...
rest
}
=
initialValue
;
return
{
...
rest
,
memberName
:
n
ame
,
memberName
:
upperN
ame
,
byUserEditName
:
byUserName
,
byUserEditPhone
:
byUserPhone
,
}
...
...
@@ -172,6 +172,7 @@ const SuggestAdd = () => {
userModalToggle
(
false
)
}
return
(
<
PageHeaderWrapper
onBack=
{
()
=>
history
.
goBack
()
}
...
...
src/pages/member/memberQuery/suggest/common/hooks/useGetDetailCommon.tsx
View file @
228d9c81
...
...
@@ -4,6 +4,7 @@ import { useMemo } from "react";
function
useGetDetailCommon
({
initialValue
})
{
const
basicInfo
=
useMemo
(()
=>
{
const
isUpperMember
=
typeof
initialValue
?.
upperName
!==
'undefined'
;
return
[
{
title
:
'事件主题'
,
...
...
@@ -22,8 +23,8 @@ function useGetDetailCommon({ initialValue }) {
value
:
initialValue
?.
eventDesc
},
{
title
:
"会员名称"
,
value
:
initialValue
?.
name
title
:
isUpperMember
?
'上级会员名称'
:
"会员名称"
,
value
:
i
sUpperMember
?
initialValue
?.
upperName
:
i
nitialValue
?.
name
},
{
title
:
"附件"
,
...
...
src/pages/member/memberQuery/suggest/common/schema/add.tsx
View file @
228d9c81
...
...
@@ -170,7 +170,7 @@ export const complaintAddSchema: ISchema = {
]
},
attachments
:
{
title
:
'
考察要求
附件'
,
title
:
'
事件
附件'
,
type
:
'object'
,
'x-component'
:
'FormilyUploadFiles'
,
}
...
...
src/pages/member/memberQuery/suggest/common/schema/index.tsx
View file @
228d9c81
...
...
@@ -29,7 +29,7 @@ export const complaintAndSuggestListSchema: ISchema = {
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'搜索'
,
placeholder
:
'搜索
会员名称
'
,
tip
:
'输入 会员名称 进行搜索'
,
},
},
...
...
@@ -58,10 +58,10 @@ export const complaintAndSuggestListSchema: ISchema = {
type
:
'daterange'
,
default
:
undefined
,
'x-component-props'
:
{
placeholder
:
'会员等级(全部)'
,
placeholder
:
[
'事件时间'
,
"事件时间"
]
,
allowClear
:
true
,
style
:
{
width
:
1
60
,
width
:
2
60
,
},
},
},
...
...
src/pages/member/memberQuery/suggest/index.tsx
View file @
228d9c81
...
...
@@ -11,6 +11,7 @@ import CustomizeQueryList from '../../components/CustomizeQueryList';
import
{
Link
}
from
'umi'
;
import
useColumns
from
'../../memberRectification/common/hooks/useColumns'
;
import
{
GetMemberComplaintSubPageRequest
,
GetMemberComplaintUpperPageRequest
}
from
'@/services/MemberV2Api'
;
import
moment
from
'moment'
;
interface
Iprops
{};
...
...
@@ -59,10 +60,7 @@ const List: React.FC<Iprops> = (props: Iprops) => {
}
const
handleSubmit
=
async
(
params
:
{
id
:
number
},
type
:
"submit"
|
"delete"
)
=>
{
const
newList
=
[...
currentIdIsInLoading
];
newList
.
push
(
params
.
id
);
const
service
=
type
===
'submit'
?
PublicApi
.
postMemberComplaintSubSubmit
:
PublicApi
.
postMemberComplaintSubDelete
;
setCurrentIdIsInLoading
(
newList
)
const
{
data
,
code
}
=
await
service
(
params
);
setCurrentIdIsInLoading
((
prev
)
=>
prev
.
filter
((
_item
)
=>
_item
!==
params
.
id
));
if
(
code
===
1000
)
{
...
...
@@ -70,11 +68,22 @@ const List: React.FC<Iprops> = (props: Iprops) => {
}
}
const
formatData
=
(
value
)
=>
{
const
{
eventTimeStart
,
eventTimeEnd
,
...
rest
}
=
value
;
const
newData
=
{
...
rest
,
eventTimeStart
:
eventTimeStart
&&
moment
(
eventTimeStart
,
'YYYY-MM-DD'
).
startOf
(
"day"
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
eventTimeEnd
:
eventTimeEnd
&&
moment
(
eventTimeEnd
,
'YYYY-MM-DD'
).
endOf
(
"day"
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}
return
newData
}
return
(
<
Card
>
<
CustomizeQueryList
ref=
{
ref
}
columns=
{
columns
}
formatData=
{
formatData
}
schema=
{
complaintAndSuggestListSchema
}
fetchListData=
{
handleFetch
}
expressionScope=
{
{
...
...
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