Commit 3e9c2df8 authored by XieZhiXiong's avatar XieZhiXiong

fix: 修复批次展示的问题

parent 61ece63f
......@@ -45,9 +45,11 @@ export interface ShopInfo {
}
export interface OrderMode {
value: number;
label: string;
id: number;
platformType: number;
platformWayName: string;
isPitchOn: number;
platformTypeName: string;
}
export interface Web {
......
......@@ -59,7 +59,6 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......@@ -117,7 +116,6 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......
......@@ -78,7 +78,6 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......@@ -136,7 +135,6 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......
......@@ -112,7 +112,6 @@ const DetailInfo: React.FC = () => {
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......
......@@ -137,7 +137,7 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
dataSource={outerHistory}
columns={outerColumns}
loading={false}
pagination={undefined}
pagination={null}
/>
</Tabs.TabPane>
<Tabs.TabPane tab="内部单据流转记录" key="2">
......@@ -145,7 +145,7 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
dataSource={innerHistory}
columns={innerColumns}
loading={false}
pagination={undefined}
pagination={null}
/>
</Tabs.TabPane>
</Tabs>
......
......@@ -354,7 +354,7 @@ const addEquity: React.FC<DetailInfoProps> = ({
dataSource={levelInfo?.rights}
columns={newColumns}
loading={false}
pagination={undefined}
pagination={null}
onRow={(record): EditableRowProps => ({
onFieldsChange: handleFieldsChange,
})}
......
......@@ -54,7 +54,6 @@ const DetailInfo: React.FC = () => {
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......
......@@ -115,7 +115,6 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-03 11:38:09
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-05 14:58:55
* @LastEditTime: 2021-08-11 16:52:13
* @Description: 商品列表
*/
import React from 'react';
......@@ -44,7 +44,7 @@ const ProductList: React.FC<HistoryListHistoryListProps> = ({
dataSource={dataSource}
columns={columns}
loading={loading}
pagination={undefined}
pagination={null}
/>
</MellowCard>
);
......
......@@ -2,25 +2,15 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-10 17:34:43
* @LastEditTime: 2021-08-11 17:43:06
* @Description: 退货收货统计、退货发货明细
*/
import React from 'react';
import { Tabs, Button, Row, Col, Descriptions, Badge, Radio, Modal } from 'antd';
import {
ClockCircleOutlined,
ExclamationCircleOutlined,
} from '@ant-design/icons';
import React, { useState } from 'react';
import { Tabs, Row, Col, Descriptions, Badge, Radio, Modal, RadioChangeEvent } from 'antd';
import { SummaryData, Detailed } from './interface';
import MellowCard from '@/components/MellowCard';
import { EditableColumns } from '@/components/PolymericTable/interface';
import PolymericTable from '@/components/PolymericTable';
import EyePreview from '@/components/EyePreview';
import {
MAIL_INNER_STATUS_UNCONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_RECEIVING,
} from '../../constants';
import styles from './index.less';
const { TabPane } = Tabs;
......@@ -63,6 +53,8 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
isPurchaser = false,
}) => {
const [currentBatch, setCurrentBatch] = useState(1);
const summaryColumns: EditableColumns[] = [
{
title: '订单号',
......@@ -76,7 +68,6 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......@@ -134,7 +125,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
title: '品类',
......@@ -173,8 +164,8 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
},
];
const handleBatchChange = value => {
const handleBatchChange = (e: RadioChangeEvent) => {
setCurrentBatch(e.target.value);
};
return (
......@@ -209,7 +200,12 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
/>
{detailed.map(item => (
<div key={item.batch}>
<div
key={item.batch}
style={{
display: item.batch === currentBatch ? 'block' : 'none',
}}
>
<div className={styles.detailedWrap}>
<Row align="middle">
<Col span={16}>
......
......@@ -140,7 +140,6 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
ellipsis: true,
},
{
......@@ -294,7 +293,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
dataSource={dataSource}
columns={columns}
loading={false}
pagination={undefined}
pagination={null}
expandable={{
expandIcon: ({ expanded, onExpand, record }) =>
expanded ? (
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 17:36:45
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-01-22 11:07:44
* @LastEditTime: 2021-08-11 17:45:41
* @Description: 查看退货数量与退款金额 抽屉
*/
import React from 'react';
......
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