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
e1c2c6e1
Commit
e1c2c6e1
authored
Jun 16, 2021
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改会员部分bug
parent
dea5b597
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
28 deletions
+29
-28
index.tsx
src/pages/balance/components/Voucher/index.tsx
+1
-2
useFetchColumns.tsx
src/pages/balance/hooks/useFetchColumns.tsx
+5
-2
columns.tsx
.../member/memberQuery/rectificationQuery/common/columns.tsx
+2
-2
schema.tsx
src/pages/member/memberQuery/rectificationQuery/schema.tsx
+3
-3
add.tsx
...pages/member/memberRectification/rectificationAdd/add.tsx
+1
-1
schema.tsx
...r/memberRectification/tobeConfirmRectification/schema.tsx
+17
-18
No files found.
src/pages/balance/components/Voucher/index.tsx
View file @
e1c2c6e1
...
...
@@ -23,10 +23,9 @@ const Voucher: React.FC<Iprops> = (props) => {
return
(
<>
{
files
.
map
((
item
:
VoucherFileProps
,
key
:
number
)
=>
{
files
?
.
map
((
item
:
VoucherFileProps
,
key
:
number
)
=>
{
return
(
<
div
className=
{
styles
.
container
}
key=
{
key
}
>
{
/* <div></div>/ */
}
<
div
className=
{
styles
.
image
}
>
<
img
src=
{
image_icon
}
className=
{
styles
.
icon
}
/>
</
div
>
...
...
src/pages/balance/hooks/useFetchColumns.tsx
View file @
e1c2c6e1
...
...
@@ -220,8 +220,11 @@ function useFetchColumns(mode: 'payable' | 'receiveable') {
render
:
(
text
:
string
,
record
:
any
)
=>
{
if
(
mode
===
'payable'
)
{
// 待对账的时候可以手动结算
if
(
record
.
status
===
TO_BE_RECONCILED
&&
record
.
orderType
!==
CONTRACT_FUND_BILL
)
{
return
<
a
onClick=
{
()
=>
handleManualsettlement
(
record
.
id
)
}
>
手动结算
</
a
>
if
(
record
.
status
===
TO_BE_RECONCILED
)
{
if
(
record
.
orderType
!==
CONTRACT_FUND_BILL
)
{
return
<
a
onClick=
{
()
=>
handleManualsettlement
(
record
.
id
)
}
>
手动结算
</
a
>
}
return
null
}
if
(
record
.
status
===
TO_BE_PAY
)
{
return
<
a
onClick=
{
()
=>
handlePay
({
id
:
record
.
id
,
settlementId
:
record
.
memberId
,
roleId
:
record
.
roleId
})
}
>
付款
</
a
>
...
...
src/pages/member/memberQuery/rectificationQuery/common/columns.tsx
View file @
e1c2c6e1
...
...
@@ -4,7 +4,7 @@ import { Link } from 'umi'
export
const
commonColumns
=
[
{
title
:
'
考评
单号/主题'
,
title
:
'
整改
单号/主题'
,
dataIndex
:
'id'
,
render
:
(
text
,
record
)
=>
{
...
...
@@ -17,7 +17,7 @@ export const commonColumns = [
}
},
{
title
:
'会员名称'
,
title
:
'
上级
会员名称'
,
dataIndex
:
'upperMemberName'
,
},
{
...
...
src/pages/member/memberQuery/rectificationQuery/schema.tsx
View file @
e1c2c6e1
...
...
@@ -25,13 +25,13 @@ export const querySchema: ISchema = {
grid
:
true
,
full
:
true
,
autoRow
:
true
,
columns
:
3
,
columns
:
6
,
},
properties
:
{
subject
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'
考评
主题'
,
placeholder
:
'
整改
主题'
,
allowClear
:
true
,
style
:
{
width
:
160
,
...
...
@@ -41,7 +41,7 @@ export const querySchema: ISchema = {
'[rectifyDayStart,rectifyDayEnd]'
:
{
type
:
'daterange'
,
'x-component-props'
:
{
placeholder
:
[
'
考评开始时间'
,
'考评
完成时间'
],
placeholder
:
[
'
整改开始时间'
,
'整改
完成时间'
],
allowClear
:
true
,
style
:
{
width
:
240
,
...
...
src/pages/member/memberRectification/rectificationAdd/add.tsx
View file @
e1c2c6e1
...
...
@@ -122,7 +122,7 @@ const InspectionAdd = (props) => {
if
(
isEdit
)
{
return
"修改整改通知单"
}
return
"新增整改通知
到哪
"
return
"新增整改通知
单
"
}
return
(
...
...
src/pages/member/memberRectification/tobeConfirmRectification/schema.tsx
View file @
e1c2c6e1
...
...
@@ -51,9 +51,9 @@ export const querySchema: ISchema = {
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'搜索
通知
单号'
,
placeholder
:
'搜索
整改
单号'
,
align
:
'flex-left'
,
tip
:
'输入
通知
单号进行搜索'
,
tip
:
'输入
整改
单号进行搜索'
,
},
},
[
FORM_FILTER_PATH
]:
{
...
...
@@ -69,33 +69,32 @@ export const querySchema: ISchema = {
subject
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'
通知单摘要
'
,
placeholder
:
'
整改主题
'
,
allowClear
:
true
,
style
:
{
width
:
160
,
},
},
},
processName
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'加工企业名'
,
allowClear
:
true
,
},
},
outerStatus
:
{
type
:
'string'
,
default
:
undefined
,
enum
:
[],
'[rectifyDayStart,rectifyDayEnd]'
:
{
type
:
'daterange'
,
'x-component-props'
:
{
placeholder
:
'外部状态(全部)'
,
placeholder
:
[
'整改开始时间'
,
'整改完成时间'
]
,
allowClear
:
true
,
style
:
{
width
:
240
,
},
},
},
innerS
tatus
:
{
s
tatus
:
{
type
:
'string'
,
default
:
undefined
,
enum
:
[],
'x-component-props'
:
{
placeholder
:
'
内部状态(全部)
'
,
placeholder
:
'
外部状态
'
,
allowClear
:
true
,
style
:
{
width
:
160
,
},
},
},
submit
:
{
...
...
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