Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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-admin
Commits
aea3cd42
Commit
aea3cd42
authored
Jun 21, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-srm' of
http://10.0.0.22:3000/lingxi/lingxi-business-system
into dev-srm
parents
9d12ab4e
7c8da20e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
56 deletions
+41
-56
interface.d.ts
src/components/PolymericTable/interface.d.ts
+1
-1
index.tsx
src/pages/member/components/FlowRecords/index.tsx
+31
-30
index.tsx
src/pages/member/memberMaintain/detailed/index.tsx
+2
-10
frozen.tsx
src/pages/member/memberMaintain/frozen.tsx
+6
-14
index.tsx
...ges/member/memberPrSubmit/components/DetailInfo/index.tsx
+1
-1
No files found.
src/components/PolymericTable/interface.d.ts
View file @
aea3cd42
...
...
@@ -37,7 +37,7 @@ export interface EditableRowProps extends React.HTMLAttributes<HTMLElement> {
onFieldsChange
?:
(
changedFields
:
ChangedFieldsItem
[])
=>
void
,
}
interface
EditableColumns
extends
ColumnType
<
any
>
{
interface
EditableColumns
<
T
=
any
>
extends
ColumnType
<
T
>
{
dataIndex
?:
string
|
number
;
editable
?:
boolean
;
rules
?:
Array
<
any
>
;
...
...
src/pages/member/components/FlowRecords/index.tsx
View file @
aea3cd42
...
...
@@ -17,25 +17,24 @@ import styles from './index.less';
export
interface
InnerHistoryItem
{
createTime
?:
string
,
id
?:
number
;
operator
?:
string
;
org
?:
string
;
jobTitle
?:
string
;
operation
?:
string
;
operateTime
?:
string
;
innerStatus
?:
number
;
innerStatusName
?:
string
;
reason
?:
string
;
id
?:
number
,
innerStatus
?:
number
,
innerStatusName
?:
string
,
operation
?:
string
,
operatorJobTitle
?:
string
,
operatorName
?:
string
,
operatorOrgName
?:
string
,
remark
?:
string
,
};
export
interface
OuterHistoryItem
{
id
?:
number
;
roleName
?:
string
;
status
?:
number
;
statusName
?:
string
;
o
peration
?:
string
;
o
perateTime
?:
string
;
re
ason
?:
string
;
createTime
?:
string
,
id
?:
number
,
operation
?:
string
,
operatorRoleName
?:
string
,
o
uterStatus
?:
number
,
o
uterStatusName
?:
string
,
re
mark
?:
string
,
};
interface
FlowRecordsProps
{
...
...
@@ -45,7 +44,7 @@ interface FlowRecordsProps {
const
FlowRecords
:
React
.
FC
<
FlowRecordsProps
>
=
({
outerHistory
=
[],
innerHistory
=
[]
})
=>
{
const
outerColumns
:
EditableColumns
[]
=
[
const
outerColumns
:
EditableColumns
<
OuterHistoryItem
>
[]
=
[
{
title
:
'序号'
,
dataIndex
:
'index'
,
...
...
@@ -54,15 +53,15 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
},
{
title
:
'操作角色'
,
dataIndex
:
'
r
oleName'
,
dataIndex
:
'
operatorR
oleName'
,
align
:
'center'
,
},
{
title
:
'状态'
,
dataIndex
:
'
s
tatusName'
,
dataIndex
:
'
outerS
tatusName'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<
Badge
color=
{
MEMBER_OUTER_STATUS_BADGE_COLOR
[
record
.
status
]
||
'#909399'
}
text=
{
text
}
/>
<
Badge
color=
{
MEMBER_OUTER_STATUS_BADGE_COLOR
[
record
.
outerStatus
as
number
]
||
'#909399'
}
text=
{
text
}
/>
),
},
{
...
...
@@ -72,19 +71,19 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
},
{
title
:
'操作时间'
,
dataIndex
:
'
oper
ateTime'
,
dataIndex
:
'
cre
ateTime'
,
align
:
'center'
,
ellipsis
:
true
,
},
{
title
:
'审核意见'
,
dataIndex
:
're
ason
'
,
dataIndex
:
're
mark
'
,
align
:
'center'
,
ellipsis
:
true
,
},
];
const
innerColumns
:
EditableColumns
[]
=
[
const
innerColumns
:
EditableColumns
<
InnerHistoryItem
>
[]
=
[
{
title
:
'序号'
,
dataIndex
:
'index'
,
...
...
@@ -93,17 +92,17 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
},
{
title
:
'操作人'
,
dataIndex
:
'operator'
,
dataIndex
:
'operator
Name
'
,
align
:
'center'
,
},
{
title
:
'部门'
,
dataIndex
:
'o
rg
'
,
dataIndex
:
'o
peratorOrgName
'
,
align
:
'center'
,
},
{
title
:
'职位'
,
dataIndex
:
'
j
obTitle'
,
dataIndex
:
'
operatorJ
obTitle'
,
align
:
'center'
,
},
{
...
...
@@ -111,28 +110,30 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
dataIndex
:
'innerStatusName'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<
Badge
color=
{
MEMBER_INNER_STATUS_BADGE_COLOR
[
record
.
innerStatus
]
||
'#909399'
}
text=
{
text
}
/>
<
Badge
color=
{
MEMBER_INNER_STATUS_BADGE_COLOR
[
record
.
innerStatus
as
number
]
||
'#909399'
}
text=
{
text
}
/>
),
},
{
title
:
'操作'
,
dataIndex
:
'operat
ion
'
,
dataIndex
:
'operat
orName
'
,
align
:
'center'
,
},
{
title
:
'操作时间'
,
dataIndex
:
'
oper
ateTime'
,
dataIndex
:
'
cre
ateTime'
,
align
:
'center'
,
ellipsis
:
true
,
},
{
title
:
'审核意见'
,
dataIndex
:
're
ason
'
,
dataIndex
:
're
mark
'
,
align
:
'center'
,
ellipsis
:
true
,
},
];
console
.
log
(
'outerHistory'
,
outerHistory
)
return
(
<
MellowCard
>
<
Tabs
onChange=
{
()
=>
{
}
}
>
...
...
src/pages/member/memberMaintain/detailed/index.tsx
View file @
aea3cd42
...
...
@@ -12,10 +12,8 @@ import {
MEMBER_INNER_STATUS_BADGE_COLOR
,
MEMBER_OUTER_STATUS_TYPE
,
}
from
'../../constant'
;
import
{
normalizeInnerHistory
,
normalizeOuterHistory
}
from
'../../utils'
;
import
HeadInfo
from
'../../components/HeadInfo'
;
import
StatusTag
from
'../../components/StatusTag'
;
import
styles
from
'./index.less'
;
interface
QueryProps
{
match
:
{
...
...
@@ -46,14 +44,8 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
if
(
res
.
code
!==
1000
)
{
return
;
}
const
{
outerHistory
=
[],
innerHistory
=
[]
}
=
res
.
data
;
const
data
=
{
...
res
.
data
,
outerHistory
:
normalizeOuterHistory
(
outerHistory
),
innerHistory
:
normalizeInnerHistory
(
innerHistory
),
};
setBasicInfo
(
data
);
MemberStore
.
setmemberMaintainInfo
(
data
);
setBasicInfo
(
res
.
data
);
MemberStore
.
setmemberMaintainInfo
(
res
.
data
);
}).
finally
(()
=>
{
setInfoLoading
(
false
);
});
...
...
src/pages/member/memberMaintain/frozen.tsx
View file @
aea3cd42
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
PageHeader
,
Tag
,
Descriptions
,
Button
,
Modal
,
Badge
,
Spin
}
from
'antd'
;
import
{
PageHeader
,
Descriptions
,
Button
,
Modal
,
Badge
,
Spin
}
from
'antd'
;
import
{
SettingOutlined
,
StopOutlined
}
from
'@ant-design/icons'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
STATUS_COLOR_MAP
,
STATUS_COLOR_TXT
}
from
'../constant'
;
import
{
usePageStatus
}
from
'@/hooks/usePageStatus'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
GetMemberMaintenanceDetailBasicResponse
}
from
'@/services/MemberApi'
;
import
{
MEMBER_STATUS_NORMAL
,
MEMBER_STATUS_FROZEN
,
MEMBER_OUTER_STATUS
,
}
from
'@/constants'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
{
auditModalSchema
}
from
'./schema'
;
...
...
@@ -20,12 +18,10 @@ import {
MEMBER_INNER_STATUS_BADGE_COLOR
,
MEMBER_OUTER_STATUS_TYPE
,
}
from
'../constant'
;
import
{
normalizeInnerHistory
,
normalizeOuterHistory
}
from
'../utils'
;
import
HeadInfo
from
'../components/HeadInfo'
;
import
AuditProcess
from
'../components/AuditProcess'
;
import
BasicInfo
from
'../components/BasicInfo'
;
import
StatusTag
from
'../components/StatusTag'
;
import
styles
from
'./index.less'
;
const
formActions
=
createFormActions
();
...
...
@@ -47,11 +43,7 @@ const Frozen: React.FC<{}> = () => {
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
const
{
outerHistory
=
[],
innerHistory
=
[]
}
=
res
.
data
;
setBasicInfo
({
...
res
.
data
,
outerHistory
:
normalizeOuterHistory
(
outerHistory
),
innerHistory
:
normalizeInnerHistory
(
innerHistory
),
});
setBasicInfo
(
res
.
data
);
}
}).
finally
(()
=>
{
setInfoLoaading
(
false
);
...
...
@@ -130,13 +122,13 @@ const Frozen: React.FC<{}> = () => {
<
Descriptions
.
Item
label=
"会员类型"
>
{
basicInfo
?.
memberTypeName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员角色"
span=
{
2
}
>
{
basicInfo
?.
roleName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员状态"
>
<
StatusTag
type=
{
MEMBER_STATUS_TAG_MAP
[
basicInfo
?.
status
]
}
title=
{
basicInfo
?.
statusName
}
/>
<
StatusTag
type=
{
basicInfo
?.
status
?
MEMBER_STATUS_TAG_MAP
[
basicInfo
?.
status
]
:
'default'
}
title=
{
basicInfo
?.
statusName
}
/>
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"外部状态"
>
<
StatusTag
type=
{
MEMBER_OUTER_STATUS_TYPE
[
basicInfo
?.
outerStatus
]
}
title=
{
basicInfo
?.
outerStatusName
}
/>
<
StatusTag
type=
{
basicInfo
?.
outerStatus
?
MEMBER_OUTER_STATUS_TYPE
[
basicInfo
?.
outerStatus
]
:
'default'
}
title=
{
basicInfo
?.
outerStatusName
}
/>
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"内部状态"
>
<
Badge
color=
{
MEMBER_INNER_STATUS_BADGE_COLOR
[
basicInfo
?.
innerStatus
]
||
'#909399'
}
text=
{
basicInfo
?.
innerStatusName
}
/>
<
Badge
color=
{
basicInfo
?.
innerStatus
?
MEMBER_INNER_STATUS_BADGE_COLOR
[
basicInfo
?.
innerStatus
]
:
'#909399'
}
text=
{
basicInfo
?.
innerStatusName
}
/>
</
Descriptions
.
Item
>
</
Descriptions
>
</
PageHeader
>
...
...
@@ -190,7 +182,7 @@ const Frozen: React.FC<{}> = () => {
}
}
actions=
{
formActions
}
schema=
{
auditModalSchema
}
onSubmit=
{
value
=>
handleSubmit
(
value
,
basicInfo
.
status
)
}
onSubmit=
{
value
=>
handleSubmit
(
value
,
basicInfo
?
.
status
)
}
/>
</
Modal
>
</
PageHeaderWrapper
>
...
...
src/pages/member/memberPrSubmit/components/DetailInfo/index.tsx
View file @
aea3cd42
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-01-26 16:36:30
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-0
4-19 16:58:00
* @LastEditTime: 2021-0
6-21 10:19:07
* @Description: 待提交审核详情信息
*/
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
...
...
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