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
fa4bb8de
Commit
fa4bb8de
authored
May 19, 2021
by
卢均锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 采购竞价单补充字段
parent
eb93e257
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
87 additions
and
40 deletions
+87
-40
index.tsx
...nts/detail/components/bidCommonLayout/filesItem/index.tsx
+9
-4
index.less
...y/components/detail/components/bidCommonLayout/index.less
+1
-0
index.tsx
...ty/components/detail/components/bidCommonLayout/index.tsx
+2
-2
index.tsx
...components/detail/components/recordComontLayout/index.tsx
+2
-2
purchaseBid.ts
src/pages/purchaseAbility/constants/purchaseBid.ts
+68
-28
index.tsx
src/pages/purchaseAbility/purchaseBid/detail/index.tsx
+3
-2
index.tsx
...pages/purchaseAbility/purchaseBid/examineSearch/index.tsx
+1
-1
index.tsx
src/pages/purchaseAbility/purchaseBid/search/index.tsx
+1
-1
No files found.
src/pages/purchaseAbility/components/detail/components/bidCommonLayout/filesItem/index.tsx
View file @
fa4bb8de
...
...
@@ -2,7 +2,11 @@ import React from 'react';
import
{
Typography
}
from
'antd'
;
import
{
LinkOutlined
}
from
'@ant-design/icons'
;
const
FilesItem
=
(
props
:
any
)
=>
{
interface
FilesItemProps
{
files
?:
any
}
const
FilesItem
:
React
.
FC
<
FilesItemProps
>
=
(
props
:
any
)
=>
{
const
{
files
}
=
props
;
if
(
files
&&
files
.
length
>
0
)
{
return
(
...
...
@@ -17,10 +21,10 @@ const FilesItem = (props: any) => {
)
})
)
}
else
{
return
'
无
'
}
else
{
return
'
-
'
}
}
export
default
FilesItem
\ No newline at end of file
src/pages/purchaseAbility/components/detail/components/bidCommonLayout/index.less
View file @
fa4bb8de
...
...
@@ -2,6 +2,7 @@
background-color: #FAFBFC;
padding: 6px;
display: flex;
margin-bottom: 16px;
.box{
flex: 1;
display: flex;
...
...
src/pages/purchaseAbility/components/detail/components/bidCommonLayout/index.tsx
View file @
fa4bb8de
...
...
@@ -60,7 +60,7 @@ const BidCommonLayout: React.FC<BidCommonLayoutProps> = (props: any) => {
<
div
className=
{
selfStyles
.
pieItem
}
key=
{
key
}
>
<
PieItem
/>
<
div
className=
{
selfStyles
.
box
}
>
<
div
className=
{
selfStyles
.
title
}
>
中标金额(含税)
:
</
div
>
<
div
className=
{
selfStyles
.
title
}
>
{
child
.
label
}
:
</
div
>
<
div
className=
{
selfStyles
.
price
}
>
¥114,000.00
</
div
>
</
div
>
</
div
>
...
...
@@ -100,7 +100,7 @@ const BidCommonLayout: React.FC<BidCommonLayoutProps> = (props: any) => {
</
div
>
<
div
className=
{
selfStyles
.
baseItem
}
>
<
h5
className=
{
selfStyles
.
label
}
>
附件:
</
h5
>
<
h5
className=
{
selfStyles
.
content
}
><
FilesItem
/></
h5
>
<
h5
className=
{
selfStyles
.
content
}
><
FilesItem
files=
{
effect
.
returnUrls
}
/></
h5
>
</
div
>
</
Col
>
</
Row
>
...
...
src/pages/purchaseAbility/components/detail/components/recordComontLayout/index.tsx
View file @
fa4bb8de
...
...
@@ -45,7 +45,7 @@ const RecordLayout: React.FC<ProgressProps> = (props: any) => {
title
:
'状态'
,
key
:
'state'
,
dataIndex
:
'state'
,
render
:
(
_text
:
any
,
_record
:
any
)
=>
<
Tag
color=
{
externalColors
[
_text
]
}
>
{
_record
.
stateName
}
</
Tag
>
render
:
(
_text
:
any
,
_record
:
any
)
=>
<
Tag
color=
{
externalColors
(
_text
)
}
>
{
_record
.
stateName
}
</
Tag
>
},
{
title
:
'操作'
,
...
...
@@ -94,7 +94,7 @@ const RecordLayout: React.FC<ProgressProps> = (props: any) => {
title
:
'状态'
,
key
:
'state'
,
dataIndex
:
'state'
,
render
:
(
_text
:
any
,
_record
:
any
)
=>
<
Tag
color=
{
internalColors
[
_text
]
}
>
{
_record
.
stateName
}
</
Tag
>
render
:
(
_text
:
any
,
_record
:
any
)
=>
<
Tag
color=
{
internalColors
(
_text
)
}
>
{
_record
.
stateName
}
</
Tag
>
},
{
title
:
'操作'
,
...
...
src/pages/purchaseAbility/constants/purchaseBid.ts
View file @
fa4bb8de
/** 价单外部状态颜色 */
export
const
BID_EXTERNALSTATE_COLOR
=
{
'-1'
:
'error'
,
99
:
'success'
,
1
:
'default'
,
2
:
'warning'
,
3
:
'warning'
,
4
:
'warning'
,
5
:
'default'
,
6
:
'processing'
,
7
:
'error'
,
8
:
'error'
,
export
const
BID_EXTERNALSTATE_COLOR
=
(
text
)
=>
{
switch
(
Number
(
text
))
{
case
-
1
:
case
7
:
case
8
:
return
'error'
;
case
2
:
case
3
:
case
4
:
return
'warning'
;
case
6
:
return
'processing'
;
case
99
:
return
'success'
;
default
:
return
'default'
}
}
// export const BID_EXTERNALSTATE_COLOR = {
// '-1': 'error',
// 99: 'success',
// 1: 'default',
// 2: 'warning',
// 3: 'warning',
// 4: 'warning',
// 5: 'default',
// 6: 'processing',
// 7: 'error',
// 8: 'error',
// }
/** 报价内部状态颜色 */
export
const
BID_INTERNALSTATE_COLOR
=
{
'-1'
:
'error'
,
99
:
'success'
,
1
:
'default'
,
2
:
'warning'
,
3
:
'warning'
,
4
:
'processing'
,
8
:
'error'
,
9
:
'error'
,
10
:
'default'
,
11
:
'error'
,
12
:
'processing'
,
13
:
'warning'
,
14
:
'warning'
,
15
:
'warning'
,
}
\ No newline at end of file
export
const
BID_INTERNALSTATE_COLOR
=
(
text
)
=>
{
switch
(
Number
(
text
))
{
case
-
1
:
case
8
:
case
9
:
case
11
:
return
'error'
;
case
2
:
case
3
:
case
13
:
case
14
:
case
15
:
return
'warning'
;
case
4
:
case
12
:
return
'processing'
;
case
99
:
return
'success'
;
default
:
return
'default'
;
}
}
// export const BID_INTERNALSTATE_COLOR = {
// '-1': 'error',
// 99: 'success',
// 1: 'default',
// 2: 'warning',
// 3: 'warning',
// 4: 'processing',
// 8: 'error',
// 9: 'error',
// 10: 'default',
// 11: 'error',
// 12: 'processing',
// 13: 'warning',
// 14: 'warning',
// 15: 'warning',
// }
\ No newline at end of file
src/pages/purchaseAbility/purchaseBid/detail/index.tsx
View file @
fa4bb8de
...
...
@@ -102,7 +102,7 @@ const SearchDetail = () => {
col
:
[
{
label
:
'竞价编号'
,
extra
:
data
.
biddingNo
,
type
:
'text'
},
{
label
:
'竞价摘要'
,
extra
:
data
.
details
,
type
:
'text'
},
{
label
:
'外部状态'
,
extra
:
<
Tag
color=
{
BID_EXTERNALSTATE_COLOR
[
data
.
externalState
]
}
>
{
data
.
externalStateName
}
</
Tag
>,
type
:
'text'
},
{
label
:
'外部状态'
,
extra
:
<
Tag
color=
{
BID_EXTERNALSTATE_COLOR
(
data
.
externalState
)
}
>
{
data
.
externalStateName
}
</
Tag
>,
type
:
'text'
},
// { label: '内部状态', extra: <Badge status={BID_INTERNALSTATE_COLOR[data.interiorState]} text={data.interiorStateName} />, type: 'text' },
]
},
...
...
@@ -206,7 +206,8 @@ const SearchDetail = () => {
setAwardResult
(
{
list
:
data
.
awardsFruits
||
[],
signUpIdea
:
data
.
signUpIdea
signUpIdea
:
data
.
signUpIdea
,
returnUrls
:
data
.
returnUrls
}
)
}
...
...
src/pages/purchaseAbility/purchaseBid/examineSearch/index.tsx
View file @
fa4bb8de
...
...
@@ -59,7 +59,7 @@ const ExamineSearch = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
Tag
color=
{
BID_EXTERNALSTATE_COLOR
[
text
]
}
>
{
record
.
externalStateName
}
</
Tag
>
render
:
(
text
:
any
,
record
:
any
)
=>
<
Tag
color=
{
BID_EXTERNALSTATE_COLOR
(
text
)
}
>
{
record
.
externalStateName
}
</
Tag
>
},
{
title
:
'操作'
,
key
:
'operate'
,
...
...
src/pages/purchaseAbility/purchaseBid/search/index.tsx
View file @
fa4bb8de
...
...
@@ -53,7 +53,7 @@ const Search = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
Tag
color=
{
BID_EXTERNALSTATE_COLOR
[
text
]
}
>
{
record
.
externalStateName
}
</
Tag
>
render
:
(
text
:
any
,
record
:
any
)
=>
<
Tag
color=
{
BID_EXTERNALSTATE_COLOR
(
text
)
}
>
{
record
.
externalStateName
}
</
Tag
>
}];
return
(
...
...
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