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
linweijiong
jinfa-platform
Commits
8720c334
Commit
8720c334
authored
Feb 22, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复交易规则翻译BUG
parent
fa6b1050
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
17 deletions
+16
-17
processRuleSetting.ts
src/locales/en-US/system/processRuleSetting.ts
+2
-3
index.tsx
...ges/transaction/purchaserEvaluation/unevaluated/index.tsx
+14
-14
No files found.
src/locales/en-US/system/processRuleSetting.ts
View file @
8720c334
...
...
@@ -21,7 +21,7 @@ export default {
'processRuleSetting.caozuo'
:
'Operation'
,
'processRuleSetting.shanchu'
:
'Delete'
,
'processRuleSetting.xiaoshi'
:
'Hour'
,
'processRuleSetting.zhifupici
:
'
:
'Payment batch:'
,
'processRuleSetting.zhifupici
:
'
:
'Payment batch:'
,
'processRuleSetting.xuanzeshangpin'
:
'Select product'
,
'processRuleSetting.chaxun'
:
'Query'
,
'processRuleSetting.qingxuanzepinpai'
:
'Please select a brand'
,
...
...
@@ -86,4 +86,4 @@ export default {
'processRuleSetting.bianjicaigouliu'
:
'Edit procurement process rules'
,
'processRuleSetting.xinzengcaigouliu'
:
'New procurement process rules'
,
'processRuleSetting.liuchengguizeID'
:
'Process Rule ID'
,
}
\ No newline at end of file
}
src/pages/transaction/purchaserEvaluation/unevaluated/index.tsx
View file @
8720c334
...
...
@@ -23,7 +23,7 @@ const Unevaluated: React.FC = () => {
const
defaultColumns
:
ColumnType
<
any
>
[]
=
[
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.dingdanhao'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.dingdanhao'
}),
dataIndex
:
'orderNo'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
...
...
@@ -35,49 +35,49 @@ const Unevaluated: React.FC = () => {
),
},
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.dingdanzhaiyao'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.dingdanzhaiyao'
}),
dataIndex
:
'digest'
,
align
:
'center'
,
ellipsis
:
true
,
},
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.gongyinghuiyuan'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.gongyinghuiyuan'
}),
dataIndex
:
'memberName'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
<>
{
text
}
</>,
},
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.xiadanshijian'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.xiadanshijian'
}),
dataIndex
:
'createTime'
,
align
:
'center'
,
},
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.dingdanzonge'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.dingdanzonge'
}),
dataIndex
:
'totalAmount'
,
align
:
'center'
,
render
:
(
text
)
=>
`
¥
${
text
}
`
,
render
:
(
text
)
=>
`
${
intl
.
formatMessage
({
id
:
'common.money'
})}
${
text
}
`
,
},
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.dingdanleixing'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.dingdanleixing'
}),
dataIndex
:
'orderTypeName'
,
align
:
'center'
,
},
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.waibuzhuangtai'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.waibuzhuangtai'
}),
dataIndex
:
'outerStatusName'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<
StatusTag
type=
"success"
title=
{
intl
.
formatMessage
({
id
:
'purchaserEvaluation.yiwancheng'
})
}
/>
<
StatusTag
type=
"success"
title=
{
intl
.
formatMessage
({
id
:
'purchaserEvaluation.yiwancheng'
})
}
/>
),
},
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.neibuzhuangtai'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.neibuzhuangtai'
}),
dataIndex
:
'innerStatusName'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
<
Badge
color=
"#41CC9E"
text=
{
intl
.
formatMessage
({
id
:
'purchaserEvaluation.yiwancheng'
})
}
/>,
render
:
(
text
,
record
)
=>
<
Badge
color=
"#41CC9E"
text=
{
intl
.
formatMessage
({
id
:
'purchaserEvaluation.yiwancheng'
})
}
/>,
},
{
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.caozuo'
}),
title
:
intl
.
formatMessage
({
id
:
'purchaserEvaluation.caozuo'
}),
dataIndex
:
'option'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
...
...
@@ -87,7 +87,7 @@ const Unevaluated: React.FC = () => {
<
Button
type=
"link"
>
{
intl
.
formatMessage
({
id
:
'purchaserEvaluation.pingjia'
})
}
{
intl
.
formatMessage
({
id
:
'purchaserEvaluation.pingjia'
})
}
</
Button
>
)
}
</
Link
>
...
...
@@ -99,7 +99,7 @@ const Unevaluated: React.FC = () => {
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
fetchListData
=
(
params
:
any
)
=>
{
let
{
createTimeStart
,
createTimeEnd
,
...
rest
}
=
params
;
let
{
createTimeStart
,
createTimeEnd
,
...
rest
}
=
params
;
createTimeStart
=
createTimeStart
?
moment
(
+
createTimeStart
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
undefined
;
createTimeEnd
=
createTimeEnd
?
moment
(
+
createTimeEnd
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
undefined
;
...
...
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