Commit 6f56abbf authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 处理销售订单查询页货币符号翻译,处理采购订单查询页状态tag超出显示

parent c7508d62
......@@ -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': [
{
......
......@@ -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',
......
......@@ -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 = {}
......
......@@ -33,8 +33,8 @@
margin-right: 12px;
}
h2 {
height: 32px;
line-height: 44px;
// height: 32px;
// line-height: 32px;
}
}
}
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment