Commit d39a8f22 authored by XieZhiXiong's avatar XieZhiXiong

feat: 添加 remark备注显示相关

parent 07c7b9d1
......@@ -25,6 +25,7 @@ export default {
'purchaserEvaluation.caigoushangpin':'Purchase goods',
'purchaserEvaluation.chengjiaoshuliang':'Number of transactions',
'purchaserEvaluation.jiaoyishijian':'Trading Hours',
'purchaserEvaluation.beizhu': 'Remark',
'purchaserEvaluation.shifouxianshishangpinpingjia':'Whether to display product evaluation',
'purchaserEvaluation.xianshizebiaoshishangpinping':
'Display means that the product evaluation is displayed to the buyer on the product detail page; hidden means that the product evaluation is hidden from the buyer on the product detail page, and the buyer can still evaluate the order. ',
......
......@@ -25,6 +25,7 @@ export default {
'purchaserEvaluation.caigoushangpin': '상품을 구매하다',
'purchaserEvaluation.chengjiaoshuliang': '거래량',
'purchaserEvaluation.jiaoyishijian': '거래 시간',
'purchaserEvaluation.beizhu': '비고',
'purchaserEvaluation.shifouxianshishangpinpingjia': '상품 평가 표시 여부',
'purchaserEvaluation.xianshizebiaoshishangpinping':
'표시는 상품 평가가 상품 상세 페이지에서 구매자에게 전시되는 것을 나타낸다.숨기는 것은 상품 평가가 상품 상세 페이지에서 바이어에게 숨겨지고 바이어는 여전히 주문서에 대해 평가할 수 있음을 나타낸다.',
......
......@@ -25,6 +25,7 @@ export default {
'purchaserEvaluation.caigoushangpin': '采购商品',
'purchaserEvaluation.chengjiaoshuliang': '成交数量',
'purchaserEvaluation.jiaoyishijian': '交易时间',
'purchaserEvaluation.beizhu': '备注',
'purchaserEvaluation.shifouxianshishangpinpingjia': '是否显示商品评价',
'purchaserEvaluation.xianshizebiaoshishangpinping':
'显示则表示商品评价在商品详情页对买家进行展示;隐藏则表示商品评价在商品详情页对买家进行隐藏,买家依然可对订单进行评价。',
......
......@@ -189,6 +189,7 @@ const Analysis: React.FC<AnalysisProps> = ({
target: item.byMemberName,
orderId: item.orderId,
dealTime: item.dealTime,
orderNo: item.orderNo,
};
}),
totalCount,
......@@ -358,6 +359,7 @@ const Analysis: React.FC<AnalysisProps> = ({
paginationType="button"
searchable={false}
onCheck={handleJumpReceived}
remark
/>
</Shelves>
</TabPane>
......
......@@ -86,16 +86,19 @@ export interface RecordItem {
/**
* 是否已解释,被评价方回复 0-否 1-是
*/
replyStatus?: number,
replyStatus?: number
/**
* 交易时间
*/
dealTime: string;
dealTime: string
/**
* 状态 1显示 2隐藏
*/
status: number;
status?: number
/**
* 订单号
*/
orderNo?: string
};
export interface RecordRes {
......@@ -149,6 +152,11 @@ interface RecordListProps {
* 点击解释触发事件
*/
onExplain?: (record: RecordItem) => void;
/**
* 是否显示备注,默认 false
*/
remark?: boolean,
};
interface RecordListState {
......@@ -334,6 +342,7 @@ export default class RecordList extends React.Component<RecordListProps, RecordL
searchTip = intl.formatMessage({ id: 'purchaserEvaluation.pingjiafang' }, { default: '评价方' }),
explicable = false,
statusable = false,
remark = false,
} = this.props;
const { page, size, loading, receivedList, hasMore } = this.state;
......@@ -365,6 +374,11 @@ export default class RecordList extends React.Component<RecordListProps, RecordL
dataIndex: 'dealTime',
render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
},
remark ? {
title: intl.formatMessage({ id: 'purchaserEvaluation.beizhu' }, { default: '备注' }),
dataIndex: 'orderNo',
render: (text) => `${intl.formatMessage({ id: 'purchaserEvaluation.dingdanhao' }, { default: '订单号' })}${text}`,
} : null,
statusable ? {
title: (
<Tooltip title={intl.formatMessage({ id: 'purchaserEvaluation.xianshizebiaoshishangpinping' }, { default: '显示则表示商品评价在商品详情页对买家进行展示;隐藏则表示商品评价在商品详情页对买家进行隐藏,买家依然可对订单进行评价。' })}>
......
......@@ -198,6 +198,7 @@ const Analysis: React.FC<AnalysisProps> = ({
target: item.byMemberName,
orderId: item.orderId,
dealTime: item.dealTime as string,
orderNo: item.orderNo,
};
}),
totalCount,
......@@ -404,6 +405,7 @@ const Analysis: React.FC<AnalysisProps> = ({
paginationType="button"
searchable={false}
onCheck={handleJumpReceived}
remark
/>
</Shelves>
</TabPane>
......
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