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
1123efff
Commit
1123efff
authored
Mar 25, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 创建新增招标提交时,需判断当前采购会员是否创建采购门户
parent
df35ab4a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
4 deletions
+25
-4
purchase.ts
src/locales/en-US/purchase.ts
+1
-0
purchase.ts
src/locales/ko-KR/purchase.ts
+2
-1
purchase.ts
src/locales/zh-CN/purchase.ts
+1
-0
index.tsx
src/pages/procurement/callForBids/readyAddBid/index.tsx
+20
-2
index.tsx
src/pages/transaction/saleOrder/readyCheckoutOrder/index.tsx
+1
-1
No files found.
src/locales/en-US/purchase.ts
View file @
1123efff
...
@@ -815,6 +815,7 @@ export default {
...
@@ -815,6 +815,7 @@ export default {
'table.purchase.qingxianxuanzezhao'
:
'Please select bidding first'
,
'table.purchase.qingxianxuanzezhao'
:
'Please select bidding first'
,
'table.purchase.shenhe'
:
'review'
,
'table.purchase.shenhe'
:
'review'
,
'table.purchase.qingxuanzezhaobiao'
:
'Please select bidding'
,
'table.purchase.qingxuanzezhaobiao'
:
'Please select bidding'
,
'table.purchase.qingchuangjiancaigoumenhu'
:
'Members have not created purchasing portal, please create purchasing portal first'
,
'table.purchase.shifouyaoshanchu'
:
'Do you want to delete this order'
,
'table.purchase.shifouyaoshanchu'
:
'Do you want to delete this order'
,
'table.purchase.xiangmuyusuan'
:
'Project Budget'
,
'table.purchase.xiangmuyusuan'
:
'Project Budget'
,
'table.purchase.shiyongdizhi'
:
'Applicable address'
,
'table.purchase.shiyongdizhi'
:
'Applicable address'
,
...
...
src/locales/ko-KR/purchase.ts
View file @
1123efff
...
@@ -344,7 +344,7 @@ export default {
...
@@ -344,7 +344,7 @@ export default {
'detail.purchase.modalTitle27'
:
'생성할 재료 선택'
,
'detail.purchase.modalTitle27'
:
'생성할 재료 선택'
,
'detail.purchase.modalTitle28'
:
'추가할 재료 선택'
,
'detail.purchase.modalTitle28'
:
'추가할 재료 선택'
,
'detail.purchase.modalTitle29'
:
'재료 선택'
,
'detail.purchase.modalTitle29'
:
'재료 선택'
,
'detail.purchase.message1'
:
'입찰 시작 시간은 반드시 신청 마감 시간보다 길어야 한다'
,
'detail.purchase.message1'
:
'입찰 시작 시간은 반드시 신청 마감 시간보다 길어야 한다'
,
'detail.purchase.message2'
:
'입찰 시작 시간은 반드시 자질 예심 마감 시간보다 길어야 한다'
,
'detail.purchase.message2'
:
'입찰 시작 시간은 반드시 자질 예심 마감 시간보다 길어야 한다'
,
'detail.purchase.message3'
:
'입찰 개시 시간은 입찰 마감 시간보다 크고 입찰 개시 시간보다 작다'
,
'detail.purchase.message3'
:
'입찰 개시 시간은 입찰 마감 시간보다 크고 입찰 개시 시간보다 작다'
,
...
@@ -812,6 +812,7 @@ export default {
...
@@ -812,6 +812,7 @@ export default {
'table.purchase.qingxianxuanzezhao'
:
'먼저 입찰을 선택하세요'
,
'table.purchase.qingxianxuanzezhao'
:
'먼저 입찰을 선택하세요'
,
'table.purchase.shenhe'
:
'심사'
,
'table.purchase.shenhe'
:
'심사'
,
'table.purchase.qingxuanzezhaobiao'
:
'입찰을 선택하세요'
,
'table.purchase.qingxuanzezhaobiao'
:
'입찰을 선택하세요'
,
'table.purchase.qingchuangjiancaigoumenhu'
:
'회원이 구매 포털을 생성하지 않았습니다. 먼저 구매 포털을 생성하십시오'
,
'table.purchase.shifouyaoshanchu'
:
'주문을 삭제하시겠습니까?'
,
'table.purchase.shifouyaoshanchu'
:
'주문을 삭제하시겠습니까?'
,
'table.purchase.xiangmuyusuan'
:
'프로젝트 예산'
,
'table.purchase.xiangmuyusuan'
:
'프로젝트 예산'
,
'table.purchase.shiyongdizhi'
:
'해당 주소'
,
'table.purchase.shiyongdizhi'
:
'해당 주소'
,
...
...
src/locales/zh-CN/purchase.ts
View file @
1123efff
...
@@ -814,6 +814,7 @@ export default {
...
@@ -814,6 +814,7 @@ export default {
'table.purchase.qingxianxuanzezhao'
:
'请先选择招标'
,
'table.purchase.qingxianxuanzezhao'
:
'请先选择招标'
,
'table.purchase.shenhe'
:
'审核'
,
'table.purchase.shenhe'
:
'审核'
,
'table.purchase.qingxuanzezhaobiao'
:
'请选择招标'
,
'table.purchase.qingxuanzezhaobiao'
:
'请选择招标'
,
'table.purchase.qingchuangjiancaigoumenhu'
:
'会员还未创建采购门户,请先创建采购门户'
,
'table.purchase.shifouyaoshanchu'
:
'是否要删除该订单'
,
'table.purchase.shifouyaoshanchu'
:
'是否要删除该订单'
,
'table.purchase.xiangmuyusuan'
:
'项目预算'
,
'table.purchase.xiangmuyusuan'
:
'项目预算'
,
'table.purchase.shiyongdizhi'
:
'适用地址'
,
'table.purchase.shiyongdizhi'
:
'适用地址'
,
...
...
src/pages/procurement/callForBids/readyAddBid/index.tsx
View file @
1123efff
import
React
from
'react'
import
React
from
'react'
import
{
getIntl
,
history
}
from
'umi'
import
{
getIntl
,
history
}
from
'umi'
import
{
Card
,
Button
,
Space
,
message
}
from
'antd'
import
{
Card
,
Button
,
Space
,
message
,
Modal
}
from
'antd'
import
StandardTable
from
'@/components/StandardTable'
;
import
StandardTable
from
'@/components/StandardTable'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PlusCircleOutlined
}
from
'@ant-design/icons'
import
{
PlusCircleOutlined
}
from
'@ant-design/icons'
...
@@ -13,6 +13,8 @@ import { useHttpRequest } from '@/hooks/useHttpRequest'
...
@@ -13,6 +13,8 @@ import { useHttpRequest } from '@/hooks/useHttpRequest'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
import
'../../constants/index.less'
import
'../../constants/index.less'
import
{
postPurchaseInviteTenderApplyCheckInviteTender
,
postPurchaseInviteTenderDeleteInviteTender
,
postPurchaseInviteTenderGetAddInviteTenderList
}
from
'@/services/PurchaseV2Api'
import
{
postPurchaseInviteTenderApplyCheckInviteTender
,
postPurchaseInviteTenderDeleteInviteTender
,
postPurchaseInviteTenderGetAddInviteTenderList
}
from
'@/services/PurchaseV2Api'
import
{
postTemplateWebMemberPurchaseWebExitMemberPurchase
}
from
'@/services/TemplateV2Api'
import
{
getAuth
}
from
'@/utils/auth'
;
const
intl
=
getIntl
();
const
intl
=
getIntl
();
// 待新增招标
// 待新增招标
...
@@ -26,6 +28,7 @@ const fetchTableData = async (params) => {
...
@@ -26,6 +28,7 @@ const fetchTableData = async (params) => {
}
}
const
ReadyAddBid
:
React
.
FC
<
ReadyAddBidProps
>
=
(
props
)
=>
{
const
ReadyAddBid
:
React
.
FC
<
ReadyAddBidProps
>
=
(
props
)
=>
{
const
{
memberId
,
memberRoleId
}
=
getAuth
();
// 删除api
// 删除api
const
{
run
:
deleteRun
}
=
useHttpRequest
(
postPurchaseInviteTenderDeleteInviteTender
)
const
{
run
:
deleteRun
}
=
useHttpRequest
(
postPurchaseInviteTenderDeleteInviteTender
)
// 提交审核api
// 提交审核api
...
@@ -82,6 +85,21 @@ const ReadyAddBid:React.FC<ReadyAddBidProps> = (props) => {
...
@@ -82,6 +85,21 @@ const ReadyAddBid:React.FC<ReadyAddBidProps> = (props) => {
// }
// }
}
}
const
clickAdd
=
()
=>
{
postTemplateWebMemberPurchaseWebExitMemberPurchase
({
memberId
,
memberRoleId
},
{
ctlType
:
'none'
}).
then
(({
code
,
data
})
=>
{
if
(
code
===
1000
)
{
if
(
data
)
{
history
.
push
(
'/memberCenter/procurementAbility/callForBids/readyAddBid/add'
)
}
else
{
Modal
.
confirm
({
title
:
intl
.
formatMessage
({
id
:
'table.purchase.qingchuangjiancaigoumenhu'
}),
onOk
:
()
=>
history
.
push
(
'/memberCenter/procurementAbility/purchasDoor/purchasInfo'
)
})
}
}
})
}
return
<
PageHeaderWrapper
>
return
<
PageHeaderWrapper
>
<
Card
>
<
Card
>
<
StandardTable
<
StandardTable
...
@@ -119,7 +137,7 @@ const ReadyAddBid:React.FC<ReadyAddBidProps> = (props) => {
...
@@ -119,7 +137,7 @@ const ReadyAddBid:React.FC<ReadyAddBidProps> = (props) => {
<
Button
<
Button
icon=
{
<
PlusCircleOutlined
/>
}
icon=
{
<
PlusCircleOutlined
/>
}
type=
'primary'
type=
'primary'
onClick=
{
()
=>
history
.
push
(
'/memberCenter/procurementAbility/callForBids/readyAddBid/add'
)
}
onClick=
{
clickAdd
}
>
>
{
intl
.
formatMessage
({
id
:
'table.purchase.added'
})
}
{
intl
.
formatMessage
({
id
:
'table.purchase.added'
})
}
</
Button
>
</
Button
>
...
...
src/pages/transaction/saleOrder/readyCheckoutOrder/index.tsx
View file @
1123efff
...
@@ -8,7 +8,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
...
@@ -8,7 +8,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
import
{
getOrderVendorValidateVerifyPage
}
from
'@/services/OrderNewV2Api
/id12133
'
;
import
{
getOrderVendorValidateVerifyPage
}
from
'@/services/OrderNewV2Api'
;
import
'../index.less'
import
'../index.less'
// 待核销自提订单
// 待核销自提订单
...
...
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