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
9fd45a6a
Commit
9fd45a6a
authored
Feb 25, 2022
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
59c5ea31
fd8930eb
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
7 deletions
+10
-7
responseCode.ts
src/locales/en-US/responseCode.ts
+2
-1
responseCode.ts
src/locales/ko-KR/responseCode.ts
+2
-1
responseCode.ts
src/locales/zh-CN/responseCode.ts
+1
-0
index.tsx
...ent/callForBids/readyCheckedConfirmFirst/detail/index.tsx
+1
-1
index.tsx
...nt/callForBids/readyCheckedConfirmSecond/detail/index.tsx
+1
-1
index.tsx
...llForBids/readyConfirmBid/components/bidConfirm/index.tsx
+2
-2
useSelfTable.tsx
...ement/callForBids/secondCheckedBid/model/useSelfTable.tsx
+1
-1
No files found.
src/locales/en-US/responseCode.ts
View file @
9fd45a6a
...
...
@@ -1137,6 +1137,7 @@ export default {
"60026"
:
"Quote deadline must be less than delivery date"
,
"47016"
:
"page type already exists"
,
"49114"
:
"Sorting cannot be repeated"
,
"49117"
:
'Sorting under the same recommendation label cannot be repeated'
"49117"
:
'Sorting under the same recommendation label cannot be repeated'
,
"21055"
:
"The payment request amount of the document in the current payment request is greater than the remaining payment amount of the document"
,
}
src/locales/ko-KR/responseCode.ts
View file @
9fd45a6a
...
...
@@ -1136,5 +1136,6 @@ export default {
"60026"
:
"견적 마감일은 배송 날짜보다 이전이어야 합니다."
,
"47016"
:
"페이지 유형이 이미 존재합니다"
,
"49114"
:
"정렬은 중복될 수 없습니다."
,
"49117"
:
'같은 추천 탭 아래 정렬 중복 불가'
"49117"
:
'같은 추천 탭 아래 정렬 중복 불가'
,
"21055"
:
"현재 청구서에 증빙서류가 존재하는 청구금액은 증빙서류의 남은 지불금액보다 크다"
,
}
src/locales/zh-CN/responseCode.ts
View file @
9fd45a6a
...
...
@@ -1138,4 +1138,5 @@ export default {
"47016"
:
"页面类型已存在"
,
"49114"
:
"排序不能重复"
,
"49117"
:
"同一推荐标签下排序不能重复"
,
"21055"
:
"当前请款单中存在单据的请款金额大于单据剩余支付金额"
,
}
src/pages/procurement/callForBids/readyCheckedConfirmFirst/detail/index.tsx
View file @
9fd45a6a
...
...
@@ -64,7 +64,7 @@ const ReadyCheckedConfirmFirstDetail: React.FC = () => {
anchorList=
{
anchorTitleList
}
extraRight=
{
<
Button
type=
'primary'
onClick=
{
onSubmit
}
>
审核定标
{
intl
.
formatMessage
({
id
:
'table.purchase.shenhedingbiao'
})
}
</
Button
>
}
/>
...
...
src/pages/procurement/callForBids/readyCheckedConfirmSecond/detail/index.tsx
View file @
9fd45a6a
...
...
@@ -65,7 +65,7 @@ const ReadyCheckedConfirmSecondDetail: React.FC = () => {
anchorList=
{
anchorTitleList
}
extraRight=
{
<
Button
type=
'primary'
onClick=
{
onSubmit
}
>
审核定标
{
intl
.
formatMessage
({
id
:
'table.purchase.shenhedingbiao'
})
}
</
Button
>
}
/>
...
...
src/pages/procurement/callForBids/readyConfirmBid/components/bidConfirm/index.tsx
View file @
9fd45a6a
...
...
@@ -209,7 +209,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
<
Row
>
<
Col
span=
{
8
}
><
p
className=
{
style
[
'card-list_title'
]
}
>
{
intl
.
formatMessage
({
id
:
'detail.purchase.label34'
})
}
:
</
p
></
Col
>
<
Col
>
<
p
>
¥
{
(
tableDataSource
.
reduce
((
a
,
b
)
=>
a
+
b
[
item
.
dataIndex
][
'price'
]
*
b
.
count
,
0
)).
toFixed
(
2
)
}
(
{
intl
.
formatMessage
({
id
:
'detail.purchase.isTax'
})
}
)
</
p
>
<
p
>
{
intl
.
formatMessage
({
id
:
'common.money'
})
}
{
(
tableDataSource
.
reduce
((
a
,
b
)
=>
a
+
b
[
item
.
dataIndex
][
'price'
]
*
b
.
count
,
0
)).
toFixed
(
2
)
}
(
{
intl
.
formatMessage
({
id
:
'detail.purchase.isTax'
})
}
)
</
p
>
</
Col
>
</
Row
>
</
div
>
...
...
@@ -243,7 +243,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
<
div
className=
{
style
[
'card-list'
]
}
>
<
Row
>
<
Col
span=
{
8
}
><
p
className=
{
style
[
'card-list_title'
]
}
>
{
intl
.
formatMessage
({
id
:
'table.purchase.shoubiaozonge'
})
}
:
</
p
></
Col
>
<
Col
><
p
>
¥
{
(
tableDataSource
.
reduce
((
a
,
b
)
=>
a
+
(
b
[
item
.
dataIndex
][
'isAward'
]
?
(
b
[
item
.
dataIndex
][
'price'
]
*
b
.
count
*
b
[
item
.
dataIndex
][
'awardRate'
]
/
100
)
:
0
),
0
)).
toFixed
(
2
)
}
(
{
intl
.
formatMessage
({
id
:
'detail.purchase.isTax'
})
}
)
</
p
></
Col
>
<
Col
><
p
>
{
intl
.
formatMessage
({
id
:
'common.money'
})
}
{
(
tableDataSource
.
reduce
((
a
,
b
)
=>
a
+
(
b
[
item
.
dataIndex
][
'isAward'
]
?
(
b
[
item
.
dataIndex
][
'price'
]
*
b
.
count
*
b
[
item
.
dataIndex
][
'awardRate'
]
/
100
)
:
0
),
0
)).
toFixed
(
2
)
}
(
{
intl
.
formatMessage
({
id
:
'detail.purchase.isTax'
})
}
)
</
p
></
Col
>
</
Row
>
</
div
>
</
div
>
...
...
src/pages/procurement/callForBids/secondCheckedBid/model/useSelfTable.tsx
View file @
9fd45a6a
...
...
@@ -23,7 +23,7 @@ export const useSelfTable = () => {
align
:
'center'
,
dataIndex
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
)
}
>
审核
</
Button
>
render
:
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
)
}
>
{
intl
.
formatMessage
({
id
:
'table.purchase.shenhe'
,
defaultMessage
:
'审核'
})
}
</
Button
>
}
])
...
...
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