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
XieZhiXiong
jinfa-platform
Commits
6f56abbf
Commit
6f56abbf
authored
Feb 17, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理销售订单查询页货币符号翻译,处理采购订单查询页状态tag超出显示
parent
c7508d62
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
8 deletions
+18
-8
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+2
-2
index.tsx
src/pages/transaction/components/statusColors/index.tsx
+1
-1
index.tsx
...ansaction/purchaseOrder/components/statusColors/index.tsx
+11
-1
index.less
src/pages/transaction/saleOrder/index.less
+2
-2
index.tsx
src/pages/transaction/saleOrder/index.tsx
+2
-2
No files found.
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
6f56abbf
...
...
@@ -339,7 +339,7 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'transaction_components.yunfei'
}),
"x-props"
:
{
addonBefore
:
'¥'
addonBefore
:
intl
.
formatMessage
({
id
:
'common.money'
,
defaultMessage
:
'¥'
})
},
"x-rules"
:
[
{
...
...
@@ -851,7 +851,7 @@ const SaleOrderProductTable: React.FC<OrderProductTableProps> = (props) => {
title
:
intl
.
formatMessage
({
id
:
'transaction_components.danjia'
}),
type
:
'string'
,
"x-props"
:
{
addonBefore
:
'¥'
addonBefore
:
intl
.
formatMessage
({
id
:
'common.money'
,
defaultMessage
:
'¥'
})
},
'x-rules'
:
[
{
...
...
src/pages/transaction/components/statusColors/index.tsx
View file @
6f56abbf
...
...
@@ -89,7 +89,7 @@ const matchStatusColor = (status: number): string => {
const
StatusColors
:
React
.
FC
<
StatusColorsProps
>
=
(
props
)
=>
{
const
{
status
,
type
,
text
=
null
}
=
props
const
statusShowColor
=
matchStatusColor
(
status
)
// return (<Tag color={statusShowColor}
style={{whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'}}
>{text}</Tag>)
// return (<Tag color={statusShowColor}>{text}</Tag>)
return
(<
p
style=
{
{
width
:
100
,
whiteSpace
:
'nowrap'
,
...
...
src/pages/transaction/purchaseOrder/components/statusColors/index.tsx
View file @
6f56abbf
...
...
@@ -80,7 +80,17 @@ const StatusColors: React.FC<StatusColorsProps> = (props) => {
const
{
status
,
type
,
text
=
null
}
=
props
const
statusShowColor
=
matchStatusColor
(
status
)
// 优先显示 后端返回的状态文本
return
(<
Tag
color=
{
statusShowColor
}
>
{
text
}
</
Tag
>)
// return (<Tag color={statusShowColor}>{text}</Tag>)
return
(<
p
style=
{
{
width
:
100
,
whiteSpace
:
'nowrap'
,
overflow
:
'hidden'
,
textOverflow
:
'ellipsis'
,
// backgroundColor: '#ef6260',
padding
:
'0 7px'
,
// borderRadius: '2px',
// color: 'white'
}
}
title=
{
text
}
>
{
text
}
</
p
>)
}
StatusColors
.
defaultProps
=
{}
...
...
src/pages/transaction/saleOrder/index.less
View file @
6f56abbf
...
...
@@ -33,8 +33,8 @@
margin-right: 12px;
}
h2 {
height: 32px;
line-height: 44
px;
//
height: 32px;
// line-height: 32
px;
}
}
}
...
...
src/pages/transaction/saleOrder/index.tsx
View file @
6f56abbf
...
...
@@ -602,7 +602,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
</
div
>
<
p
><
span
className=
{
styles
.
listLabel
}
>
{
intl
.
formatMessage
({
id
:
'saleOrder.dingdanzhaiyao:'
,
defaultMessage
:
'订单摘要:'
})
}
</
span
><
span
>
{
currentPayRef
.
current
.
digest
}
</
span
></
p
>
<
p
><
span
className=
{
styles
.
listLabel
}
>
{
intl
.
formatMessage
({
id
:
'saleOrder.caigouhuiyuan:'
,
defaultMessage
:
'采购会员:'
})
}
</
span
><
span
>
{
currentPayRef
.
current
.
buyerMemberName
}
</
span
></
p
>
<
p
><
span
className=
{
styles
.
listLabel
}
>
{
intl
.
formatMessage
({
id
:
'saleOrder.dingdanzonge:'
,
defaultMessage
:
'订单总额:'
})
}
</
span
><
span
>
¥
{
currentPayRef
.
current
.
productAmount
}
</
span
></
p
>
<
p
><
span
className=
{
styles
.
listLabel
}
>
{
intl
.
formatMessage
({
id
:
'saleOrder.dingdanzonge:'
,
defaultMessage
:
'订单总额:'
})
}
</
span
><
span
>
{
intl
.
formatMessage
({
id
:
'common.money'
,
defaultMessage
:
'¥'
})
}
{
currentPayRef
.
current
.
productAmount
}
</
span
></
p
>
</
div
>
<
div
className=
{
styles
.
appPayRight
}
>
<
div
>
{
qrCode
?
<
img
id=
"qrcodeElement"
src=
{
qrCode
}
alt=
""
width=
{
130
}
height=
{
130
}
/>
:
<
Spin
/>
}
</
div
>
...
...
@@ -626,7 +626,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
</
div
>
<
p
><
span
className=
{
styles
.
listLabel
}
>
{
intl
.
formatMessage
({
id
:
'saleOrder.dingdanzhaiyao:'
,
defaultMessage
:
'订单摘要:'
})
}
</
span
><
span
>
{
currentPayRef
.
current
.
digest
}
</
span
></
p
>
<
p
><
span
className=
{
styles
.
listLabel
}
>
{
intl
.
formatMessage
({
id
:
'saleOrder.caigouhuiyuan:'
,
defaultMessage
:
'采购会员:'
})
}
</
span
><
span
>
{
currentPayRef
.
current
.
buyerMemberName
}
</
span
></
p
>
<
p
><
span
className=
{
styles
.
listLabel
}
>
{
intl
.
formatMessage
({
id
:
'saleOrder.dingdanzonge:'
,
defaultMessage
:
'订单总额:'
})
}
</
span
><
span
>
¥
{
currentPayRef
.
current
.
productAmount
}
</
span
></
p
>
<
p
><
span
className=
{
styles
.
listLabel
}
>
{
intl
.
formatMessage
({
id
:
'saleOrder.dingdanzonge:'
,
defaultMessage
:
'订单总额:'
})
}
</
span
><
span
>
{
intl
.
formatMessage
({
id
:
'common.money'
,
defaultMessage
:
'¥'
})
}
{
currentPayRef
.
current
.
productAmount
}
</
span
></
p
>
</
div
>
<
div
className=
{
styles
.
appPayRight
}
>
<
div
>
{
qrCode
?
<
img
id=
"qrcodeElement"
src=
{
qrCode
}
alt=
""
width=
{
130
}
height=
{
130
}
/>
:
<
Spin
/>
}
</
div
>
...
...
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