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
f88ee4ba
Commit
f88ee4ba
authored
May 20, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix: 修改授标结果
parent
c8416811
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
60 additions
and
29 deletions
+60
-29
index.tsx
...eAbility/components/detail/components/bidLayout/index.tsx
+19
-3
demandPlan.ts
...pages/transaction/purchaseAbility/constants/demandPlan.ts
+5
-4
index.ts
src/pages/transaction/purchaseAbility/constants/index.ts
+1
-0
basicInfo.tsx
...ility/demandPlan/demandPlanAdded/components/basicInfo.tsx
+1
-1
material.tsx
...bility/demandPlan/demandPlanAdded/components/material.tsx
+1
-1
index.tsx
...tion/purchaseAbility/demandPlan/demandPlanAdded/index.tsx
+14
-9
index.tsx
...pages/transaction/purchaseAbility/offter/detail/index.tsx
+5
-3
index.tsx
...purchaseAbility/purchasePlan/purchasePlanSubmit/index.tsx
+14
-8
No files found.
src/pages/transaction/purchaseAbility/components/detail/components/bidLayout/index.tsx
View file @
f88ee4ba
import
React
,
{
useContext
}
from
'react'
;
import
{
Context
}
from
'../context'
;
import
Card
from
'../../../card'
;
import
{
Button
,
Row
,
Col
,
Collapse
}
from
'antd'
;
import
{
ExclamationCircleFilled
}
from
'@ant-design/icons'
;
const
BidLayout
=
()
=>
{
const
context
=
useContext
(
Context
);
console
.
log
(
context
.
awardResults
)
const
title
=
context
.
isPrize
===
1
?
'中标通知'
:
'授标结果'
return
(
<
Card
id=
'bidLayout'
title=
'中标通知'
backgroundColor=
'#00B37A'
title=
{
title
}
backgroundColor=
{
context
.
isPrize
===
1
&&
'#00B37A'
}
extra=
{
!
context
.
isPrize
&&
<
Button
type=
'link'
>
查看感谢函
</
Button
>
}
>
<
div
style=
{
{
whiteSpace
:
'pre'
}
}
>
{
context
.
awardResults
}
</
div
>
{
context
.
isPrize
===
1
?
(
<
div
style=
{
{
whiteSpace
:
'pre'
}
}
>
{
context
.
awardResults
}
</
div
>
)
:
(
<
Row
>
<
Col
>
<
ExclamationCircleFilled
style=
{
{
fontSize
:
'20px'
,
color
:
'#91949a'
}
}
/>
</
Col
>
<
Col
>
<
p
style=
{
{
fontSize
:
'16px'
,
marginLeft
:
5
,
}
}
>
贵公司此次未中标!
</
p
>
<
p
style=
{
{
fontSize
:
'12px'
,
}
}
>
非常感谢贵公司的积极参与,希望下次合作成功!
</
p
>
</
Col
>
</
Row
>
)
}
</
Card
>
)
}
...
...
src/pages/transaction/purchaseAbility/constants/demandPlan.ts
View file @
f88ee4ba
export
const
DEMANDPLAN_INTERNALSTATE_TYPE
{
export
enum
DEMANDPLAN_INTERNALSTATE_TYPE
{
/** 待提交审核 */
WAITESUBMITAUDIT_TYPE
=
1
,
/** 审核不通过(一级) */
AUDITNOPASS1_TYPE
=
8
,
/** 审核不通过(二级) */
AUDITNOPASS2_TYPE
=
9
,
/** 采购退回 */
PURCHASEBACK_TYPE
=
10
,
}
src/pages/transaction/purchaseAbility/constants/index.ts
View file @
f88ee4ba
...
...
@@ -95,6 +95,7 @@ export const OFFTER_INTERNALSTATE_COLOR = {
7
:
'success'
,
8
:
'error'
,
9
:
'error'
,
10
:
'error'
,
}
export
enum
OFFTER_EXTERNALSTATE_TYPE
{
...
...
src/pages/transaction/purchaseAbility/demandPlan/demandPlanAdded/components/basicInfo.tsx
View file @
f88ee4ba
...
...
@@ -76,7 +76,7 @@ const BasicInfo: React.FC<BasicInfoprops> = (props: any) => {
<
Typography
.
Text
>
{
fetchdata
.
userName
}
</
Typography
.
Text
>
</
Form
.
Item
>
<
Form
.
Item
label=
"编制时间"
name=
"createTime"
>
<
Typography
.
Text
>
{
format
(
fetchdata
.
createTime
)
}
</
Typography
.
Text
>
<
Typography
.
Text
>
{
f
etchdata
.
createTime
&&
f
ormat
(
fetchdata
.
createTime
)
}
</
Typography
.
Text
>
</
Form
.
Item
>
<
Form
.
Item
label=
"内部状态"
name=
"innerStatus"
>
<
Typography
.
Text
>
{
fetchdata
.
innerStatusName
}
</
Typography
.
Text
>
...
...
src/pages/transaction/purchaseAbility/demandPlan/demandPlanAdded/components/material.tsx
View file @
f88ee4ba
...
...
@@ -102,7 +102,7 @@ const Material: React.FC<Materialprops> = (props: any) => {
<
Form
.
Item
style=
{
{
marginBottom
:
0
}
}
name=
{
`arriveTime${index}`
}
initialValue=
{
moment
(
text
)
}
initialValue=
{
text
&&
moment
(
text
)
}
>
<
DatePicker
style=
{
{
width
:
'100%'
}
}
...
...
src/pages/transaction/purchaseAbility/demandPlan/demandPlanAdded/index.tsx
View file @
f88ee4ba
...
...
@@ -9,6 +9,7 @@ import { Row, Col, Button, Badge, Space, Typography, Popconfirm } from 'antd';
import
{
OFFTER_INTERNALSTATE_COLOR
,
}
from
'../../constants'
;
import
{
DEMANDPLAN_INTERNALSTATE_TYPE
}
from
'../../constants/demandPlan'
;
import
{
PlayCircleOutlined
,
PlusOutlined
,
PoweroffOutlined
}
from
'@ant-design/icons'
;
const
{
Text
}
=
Typography
;
...
...
@@ -61,17 +62,21 @@ const DemandPlanAdded = () => {
dataIndex
:
'operate'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(
<>
<
Popconfirm
title=
"确定要提交吗?"
okText=
"是"
cancelText=
"否"
onConfirm=
{
()
=>
handleSubmit
(
record
.
id
)
}
>
<
Button
type=
'link'
>
提交
{
record
.
innerStatus
===
DEMANDPLAN_INTERNALSTATE_TYPE
.
WAITESUBMITAUDIT_TYPE
&&
(
<
Popconfirm
title=
"确定要提交吗?"
okText=
"是"
cancelText=
"否"
onConfirm=
{
()
=>
handleSubmit
(
record
.
id
)
}
>
<
Button
type=
'link'
>
提交
</
Button
>
</
Popconfirm
>
</
Popconfirm
>
)
}
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/procurementAbility/demandPlan/demandPlanAdded/edit?id=${record.id}`
)
}
>
修改
</
Button
>
<
Popconfirm
title=
"确定要删除吗?"
okText=
"是"
cancelText=
"否"
onConfirm=
{
()
=>
handleDelect
(
record
.
id
)
}
>
<
Button
type=
'link'
>
删除
</
Button
>
</
Popconfirm
>
{
record
.
innerStatus
===
DEMANDPLAN_INTERNALSTATE_TYPE
.
WAITESUBMITAUDIT_TYPE
&&
(
<
Popconfirm
title=
"确定要删除吗?"
okText=
"是"
cancelText=
"否"
onConfirm=
{
()
=>
handleDelect
(
record
.
id
)
}
>
<
Button
type=
'link'
>
删除
</
Button
>
</
Popconfirm
>
)
}
</>
)
}];
...
...
src/pages/transaction/purchaseAbility/offter/detail/index.tsx
View file @
f88ee4ba
...
...
@@ -173,9 +173,11 @@ const QuoteDetails = () => {
{
(
pathPci
===
'offter'
&&
dataSource
.
externalState
===
99
)
&&
(
<>
<
BidLayout
/>
<
BidResultLayout
fetch=
{
PublicApi
.
getPurchaseQuotedPriceProductlistListContract
}
/>
{
dataSource
.
isPrize
===
1
&&
(
<
BidResultLayout
fetch=
{
PublicApi
.
getPurchaseQuotedPriceProductlistListContract
}
/>
)
}
</>
)
}
<
BidInfoLayout
...
...
src/pages/transaction/purchaseAbility/purchasePlan/purchasePlanSubmit/index.tsx
View file @
f88ee4ba
import
React
from
'react'
;
import
{
history
}
from
'umi'
;
import
Table
from
'../../components/table'
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
moment
from
'moment'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
Button
,
Badge
,
Space
,
Typography
}
from
'antd'
;
import
{
Button
,
Badge
,
Space
,
Typography
,
Popconfirm
}
from
'antd'
;
import
{
OFFTER_INTERNALSTATE_COLOR
,
}
from
'../../constants'
;
import
{
DEMANDPLAN_INTERNALSTATE_TYPE
}
from
'../../constants/demandPlan'
;
import
{
PlayCircleOutlined
,
PoweroffOutlined
}
from
'@ant-design/icons'
;
const
{
Text
}
=
Typography
;
...
...
@@ -60,12 +60,18 @@ const PurchasePlanSubmit = () => {
dataIndex
:
'operate'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(
<>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/procurementAbility/offter/auditOffterOne/detail?id=${record.id}&number=${record.quotedPriceNo}`
)
}
>
审核
</
Button
>
{
record
.
innerStatus
===
DEMANDPLAN_INTERNALSTATE_TYPE
.
WAITESUBMITAUDIT_TYPE
&&
(
<
Popconfirm
title=
"确定要提交吗?"
okText=
"是"
cancelText=
"否"
>
<
Button
type=
'link'
>
提交
</
Button
>
</
Popconfirm
>
)
}
<
Popconfirm
title=
"确定要删除吗?"
okText=
"是"
cancelText=
"否"
>
<
Button
type=
'link'
>
删除
</
Button
>
</
Popconfirm
>
</>
)
}];
...
...
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