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
68d86299
Commit
68d86299
authored
Jul 06, 2021
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-srm' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev-srm
parents
9ed43168
87c034a8
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
43 deletions
+31
-43
index.tsx
.../transaction/purchaseAbility/onlineBid/readyBid/index.tsx
+9
-12
index.tsx
...ansaction/purchaseAbility/onlineBid/readySignUp/index.tsx
+11
-14
signUp.tsx
...nsaction/purchaseAbility/onlineBid/readySignUp/signUp.tsx
+0
-1
index.tsx
...es/transaction/purchaseAbility/onlineBid/search/index.tsx
+11
-12
index.tsx
...ransaction/purchaseAbility/purchaseBid/readyBid/index.tsx
+0
-4
No files found.
src/pages/transaction/purchaseAbility/onlineBid/readyBid/index.tsx
View file @
68d86299
import
React
,
{
useRef
,
useState
}
from
'react'
;
import
React
,
{
useRef
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
Button
,
Badge
,
Typography
,
Space
}
from
'antd'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
...
...
@@ -20,8 +20,6 @@ const { Text } = Typography;
const
ReadyBid
=
()
=>
{
const
ref
=
useRef
<
any
>
({});
const
[
id
,
setId
]
=
useState
<
number
>
();
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
);
const
columns
:
ColumnType
<
any
>
[]
=
[{
title
:
'序号'
,
align
:
'center'
,
...
...
@@ -90,15 +88,13 @@ const ReadyBid = () => {
}];
return
(
<>
<
Table
schemaType=
"ONLINEBIDREADYBID_SCHEMA"
columns=
{
columns
}
effects=
"biddingNo"
fetch=
{
PublicApi
.
getPurchaseOnlineBiddingStayBiddingList
}
reload=
{
ref
}
/>
</>
<
Table
schemaType=
"ONLINEBIDREADYBID_SCHEMA"
columns=
{
columns
}
effects=
"biddingNo"
fetch=
{
PublicApi
.
getPurchaseOnlineBiddingStayBiddingList
}
reload=
{
ref
}
/>
)
}
export
default
ReadyBid
\ No newline at end of file
src/pages/transaction/purchaseAbility/onlineBid/readySignUp/index.tsx
View file @
68d86299
import
React
,
{
useRef
,
useState
}
from
'react'
;
import
React
,
{
useRef
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
Button
,
Badge
,
Typography
,
Space
}
from
'antd'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
...
...
@@ -20,15 +20,13 @@ const { Text } = Typography;
const
ReadySignUp
=
()
=>
{
const
ref
=
useRef
<
any
>
({});
const
[
id
,
setId
]
=
useState
<
number
>
();
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
);
const
columns
:
ColumnType
<
any
>
[]
=
[{
title
:
'序号'
,
align
:
'center'
,
dataIndex
:
'id'
,
key
:
'id'
,
render
:
(
t
,
r
,
i
)
=>
++
i
},
{
},
{
title
:
'竞价单号/摘要'
,
key
:
'biddingNo'
,
dataIndex
:
'biddingNo'
,
...
...
@@ -81,7 +79,7 @@ const ReadySignUp = () => {
align
:
'center'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
Button
// disabled={moment().isBetween(moment(record.startSignUp).format('YYYY-MM-DD HH:mm:ss'), moment(record.endSignUp).format('YYYY-MM-DD HH:mm:ss'))}
onClick=
{
()
=>
{
history
.
push
(
`/memberCenter/procurementAbility/onlineBid/readySignUp/signUp?id=${record.id}&number=${record.biddingNo}`
)
}
}
onClick=
{
()
=>
{
history
.
push
(
`/memberCenter/procurementAbility/onlineBid/readySignUp/signUp?id=${record.id}&number=${record.biddingNo}`
)
}
}
type=
'link'
>
{
record
.
button
===
3
?
'报名'
:
'重新报名'
}
...
...
@@ -89,15 +87,13 @@ const ReadySignUp = () => {
}];
return
(
<>
<
Table
schemaType=
"ONLINEBIDREADYSIGN_SCHEMA"
columns=
{
columns
}
effects=
"biddingNo"
fetch=
{
PublicApi
.
getPurchaseOnlineBiddingStayExamineBiddingSignup
}
reload=
{
ref
}
/>
</>
<
Table
schemaType=
"ONLINEBIDREADYSIGN_SCHEMA"
columns=
{
columns
}
effects=
"biddingNo"
fetch=
{
PublicApi
.
getPurchaseOnlineBiddingStayExamineBiddingSignup
}
reload=
{
ref
}
/>
)
}
export
default
ReadySignUp
\ No newline at end of file
src/pages/transaction/purchaseAbility/onlineBid/readySignUp/signUp.tsx
View file @
68d86299
...
...
@@ -25,7 +25,6 @@ const SignUpForm = () => {
const
{
id
,
preview
,
pageStatus
}
=
usePageStatus
()
...
...
src/pages/transaction/purchaseAbility/onlineBid/search/index.tsx
View file @
68d86299
...
...
@@ -25,7 +25,7 @@ const Search = () => {
dataIndex
:
'id'
,
key
:
'id'
,
render
:
(
t
,
r
,
i
)
=>
++
i
},
{
},
{
title
:
'竞价单号/摘要'
,
key
:
'biddingNo'
,
dataIndex
:
'biddingNo'
,
...
...
@@ -79,17 +79,15 @@ const Search = () => {
}];
return
(
<>
<
Table
schemaType=
"ONLINEBIDORDER_SCHEMA"
columns=
{
columns
}
effects=
"biddingNo"
fetch=
{
PublicApi
.
getPurchaseOnlineBiddingList
}
externalStatusFetch=
{
PublicApi
.
getPurchaseBiddingExternalStatus
}
interiorStatusFetch=
{
PublicApi
.
getPurchaseOnlineBiddingInteriorStatus
}
reload=
{
ref
}
/>
</>
<
Table
schemaType=
"ONLINEBIDORDER_SCHEMA"
columns=
{
columns
}
effects=
"biddingNo"
fetch=
{
PublicApi
.
getPurchaseOnlineBiddingList
}
externalStatusFetch=
{
PublicApi
.
getPurchaseBiddingExternalStatus
}
interiorStatusFetch=
{
PublicApi
.
getPurchaseOnlineBiddingInteriorStatus
}
reload=
{
ref
}
/>
)
}
export
default
Search
\ No newline at end of file
src/pages/transaction/purchaseAbility/purchaseBid/readyBid/index.tsx
View file @
68d86299
...
...
@@ -70,10 +70,6 @@ const ReadyBid = () => {
render
:
(
text
:
any
,
record
:
any
)
=>
<
Button
onClick=
{
()
=>
history
.
push
(
`/memberCenter/procurementAbility/purchaseBid/readyBid/management?id=${record.id}&number=${record.biddingNo}`
)
}
type=
'link'
>
竞价管理
</
Button
>
}];
const
isOpenManage
=
(
timeStamp
)
=>
{
return
new
Date
().
getTime
()
>
timeStamp
;
}
return
(
<
Table
reload=
{
ref
}
...
...
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