Skip to content

J
jinfa-platform
Commit 1e40806d authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

chore: 处理展示合同订单商品数据相关

parent 1a87eacf
Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 135 deletions
src/pages/afterService/components/ExchangeDeliverInfo/index.tsx
View file @ 1e40806d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15 * @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-09-22 15:24:13 * @LastEditTime: 2021-09-24 10:39:53
* @Description: 换货发货统计、换货发货明细 * @Description: 换货发货统计、换货发货明细
*/ */
import React, { useState } from 'react'; import React, { useState } from 'react';
...@@ -28,6 +28,11 @@ import { ...@@ -28,6 +28,11 @@ import {
EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT, EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT,
} from '@/constants/order';
import {
MAIL_INNER_STATUS_UNCONFIRMED_DELIVER, MAIL_INNER_STATUS_UNCONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_RECEIVING, MAIL_INNER_STATUS_CONFIRMED_RECEIVING,
MAIL_INNER_STATUS_CONFIRMED_DELIVER, MAIL_INNER_STATUS_CONFIRMED_DELIVER,
...@@ -93,6 +98,11 @@ interface ExchangeDeliverInfoProps extends MellowCardProps { ...@@ -93,6 +98,11 @@ interface ExchangeDeliverInfoProps extends MellowCardProps {
* 退货配送方式 * 退货配送方式
*/ */
deliveryType: number, deliveryType: number,
/**
* 订单类型
*/
orderType: number,
}; };
const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
...@@ -107,6 +117,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({ ...@@ -107,6 +117,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
isEdit = false, isEdit = false,
afterType, afterType,
deliveryType, deliveryType,
orderType,
...rest ...rest
}) => { }) => {
const [radioValue, setRadioValue] = useState<('1' | '2')>('2'); const [radioValue, setRadioValue] = useState<('1' | '2')>('2');
...@@ -114,32 +125,75 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({ ...@@ -114,32 +125,75 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
const [submitLoading, setSubmitLoading] = useState(false); const [submitLoading, setSubmitLoading] = useState(false);
const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null); const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null);
const isMateriel = (
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
const commonColumns: EditableColumns[] = [
...(
!isMateriel
? [
{
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
}
]
: [
{
title: '物料编号',
dataIndex: 'productId',
},
{
title: '物料名称、规格',
dataIndex: 'productName',
render: (text, record) => `${text}${record.type ? '/' + record.type : ''}`,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{
title: orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId',
render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
},
]
),
];
const summaryColumns: EditableColumns[] = [ const summaryColumns: EditableColumns[] = [
{ {
title: '订单号', title: '订单号',
dataIndex: 'orderNo', dataIndex: 'orderNo',
}, },
{ ...commonColumns,
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{ {
title: '换货数量', title: '换货数量',
dataIndex: 'replaceCount', dataIndex: 'replaceCount',
...@@ -178,27 +232,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({ ...@@ -178,27 +232,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
title: '订单号', title: '订单号',
dataIndex: 'orderNo', dataIndex: 'orderNo',
}, },
{ ...commonColumns,
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{ {
title: '换货数量', title: '换货数量',
dataIndex: 'count', dataIndex: 'count',
......
src/pages/afterService/components/ExchangeReceivedInfo/index.tsx
View file @ 1e40806d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15 * @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-09-22 15:23:49 * @LastEditTime: 2021-09-24 10:28:23
* @Description: 换货退货收货统计、换货退货发货明细 * @Description: 换货退货收货统计、换货退货发货明细
*/ */
import React, { useState } from 'react'; import React, { useState } from 'react';
...@@ -30,6 +30,11 @@ import { ...@@ -30,6 +30,11 @@ import {
EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT, EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT,
} from '@/constants/order';
import {
MAIL_INNER_STATUS_UNCONFIRMED_DELIVER, MAIL_INNER_STATUS_UNCONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_DELIVER, MAIL_INNER_STATUS_CONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_RECEIVING, MAIL_INNER_STATUS_CONFIRMED_RECEIVING,
...@@ -95,6 +100,11 @@ interface ExchangeReceivedInfoProps extends MellowCardProps { ...@@ -95,6 +100,11 @@ interface ExchangeReceivedInfoProps extends MellowCardProps {
* 退货配送方式 * 退货配送方式
*/ */
deliveryType: number, deliveryType: number,
/**
* 订单类型
*/
orderType: number,
}; };
const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
...@@ -109,6 +119,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({ ...@@ -109,6 +119,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
isEdit = false, isEdit = false,
afterType, afterType,
deliveryType, deliveryType,
orderType,
...rest ...rest
}) => { }) => {
const [radioValue, setRadioValue] = useState<('1' | '2')>('2'); const [radioValue, setRadioValue] = useState<('1' | '2')>('2');
...@@ -116,32 +127,75 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({ ...@@ -116,32 +127,75 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
const [submitLoading, setSubmitLoading] = useState(false); const [submitLoading, setSubmitLoading] = useState(false);
const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null); const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null);
const isMateriel = (
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
const commonColumns: EditableColumns[] = [
...(
!isMateriel
? [
{
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
}
]
: [
{
title: '物料编号',
dataIndex: 'productId',
},
{
title: '物料名称、规格',
dataIndex: 'productName',
render: (text, record) => `${text}${record.type ? '/' + record.type : ''}`,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{
title: orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId',
render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
},
]
),
];
const summaryColumns: EditableColumns[] = [ const summaryColumns: EditableColumns[] = [
{ {
title: '订单号', title: '订单号',
dataIndex: 'orderNo', dataIndex: 'orderNo',
}, },
{ ...commonColumns,
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{ {
title: '换货数量', title: '换货数量',
dataIndex: 'replaceCount', dataIndex: 'replaceCount',
...@@ -180,27 +234,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({ ...@@ -180,27 +234,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
title: '订单号', title: '订单号',
dataIndex: 'orderNo', dataIndex: 'orderNo',
}, },
{ ...commonColumns,
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{ {
title: '换货数量', title: '换货数量',
dataIndex: 'count', dataIndex: 'count',
......
src/pages/afterService/components/ReturnAnalysis/index.tsx
View file @ 1e40806d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15 * @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-27 09:44:08 * @LastEditTime: 2021-09-24 10:27:17
* @Description: 退货收货统计、退货发货明细 * @Description: 退货收货统计、退货发货明细
*/ */
import React, { useState } from 'react'; import React, { useState } from 'react';
...@@ -30,6 +30,11 @@ import { ...@@ -30,6 +30,11 @@ import {
RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT, RETURN_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
} from '@/constants/afterService'; } from '@/constants/afterService';
import { import {
ORDER_TYPE_INQUIRY_CONTRACT,
ORDER_TYPE_BIDDING_CONTRACT,
ORDER_TYPE_TENDER_CONTRACT,
} from '@/constants/order';
import {
MAIL_INNER_STATUS_UNCONFIRMED_DELIVER, MAIL_INNER_STATUS_UNCONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_DELIVER, MAIL_INNER_STATUS_CONFIRMED_DELIVER,
MAIL_INNER_STATUS_CONFIRMED_RECEIVING, MAIL_INNER_STATUS_CONFIRMED_RECEIVING,
...@@ -95,6 +100,11 @@ interface ReturnInfoProps extends MellowCardProps { ...@@ -95,6 +100,11 @@ interface ReturnInfoProps extends MellowCardProps {
* 退货配送方式 * 退货配送方式
*/ */
deliveryType: number, deliveryType: number,
/**
* 订单类型
*/
orderType: number,
}; };
const ReturnInfo: React.FC<ReturnInfoProps> = ({ const ReturnInfo: React.FC<ReturnInfoProps> = ({
...@@ -109,6 +119,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({ ...@@ -109,6 +119,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
isEdit = false, isEdit = false,
afterType, afterType,
deliveryType, deliveryType,
orderType,
...rest ...rest
}) => { }) => {
const [radioValue, setRadioValue] = useState<('1' | '2')>('2'); const [radioValue, setRadioValue] = useState<('1' | '2')>('2');
...@@ -116,32 +127,75 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({ ...@@ -116,32 +127,75 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
const [submitLoading, setSubmitLoading] = useState(false); const [submitLoading, setSubmitLoading] = useState(false);
const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null); const [currentDetailed, setCurrentDetailed] = useState<Detailed | null>(null);
const isMateriel = (
orderType === ORDER_TYPE_INQUIRY_CONTRACT
|| orderType === ORDER_TYPE_BIDDING_CONTRACT
|| orderType === ORDER_TYPE_TENDER_CONTRACT
);
const commonColumns: EditableColumns[] = [
...(
!isMateriel
? [
{
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
}
]
: [
{
title: '物料编号',
dataIndex: 'productId',
},
{
title: '物料名称、规格',
dataIndex: 'productName',
render: (text, record) => `${text}${record.type ? '/' + record.type : ''}`,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{
title: orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId',
render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
},
]
),
];
const summaryColumns: EditableColumns[] = [ const summaryColumns: EditableColumns[] = [
{ {
title: '订单号', title: '订单号',
dataIndex: 'orderNo', dataIndex: 'orderNo',
}, },
{ ...commonColumns,
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{ {
title: '退货数量', title: '退货数量',
dataIndex: 'returnCount', dataIndex: 'returnCount',
...@@ -180,27 +234,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({ ...@@ -180,27 +234,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
title: '订单号', title: '订单号',
dataIndex: 'orderNo', dataIndex: 'orderNo',
}, },
{ ...commonColumns,
title: '商品ID',
dataIndex: 'productId',
},
{
title: '商品名称',
dataIndex: 'productName',
ellipsis: true,
},
{
title: '品类',
dataIndex: 'category',
},
{
title: '品牌',
dataIndex: 'brand',
},
{
title: '单位',
dataIndex: 'unit',
},
{ {
title: '退货数量', title: '退货数量',
dataIndex: 'count', dataIndex: 'count',
......
src/pages/afterService/exchangeApplication/components/DetailInfo/index.tsx
View file @ 1e40806d
...@@ -159,7 +159,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -159,7 +159,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{ {
title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌', title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId', dataIndex: 'associatedProductId',
render: (text, record) => `${text}/${record.associatedProductName}/${record.associatedType || '无'}/${record.associatedCategory}/${record.associatedBrand}`, render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
}, },
] ]
), ),
...@@ -533,6 +533,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -533,6 +533,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
isEdit={isEditRefundDeliver} isEdit={isEditRefundDeliver}
afterType={2} afterType={2}
deliveryType={detailInfo?.returnGoodsAddress?.deliveryType} deliveryType={detailInfo?.returnGoodsAddress?.deliveryType}
orderType={detailInfo?.orderType}
id="returnDeliveryGoodsList" id="returnDeliveryGoodsList"
/> />
</Suspense> </Suspense>
...@@ -557,6 +558,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -557,6 +558,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
isEdit={isEditExchangeDeliver} isEdit={isEditExchangeDeliver}
afterType={2} afterType={2}
deliveryType={detailInfo?.replaceGoodsAddress?.deliveryType} deliveryType={detailInfo?.replaceGoodsAddress?.deliveryType}
orderType={detailInfo?.orderType}
id="replaceDeliveryGoodsList" id="replaceDeliveryGoodsList"
/> />
</Suspense> </Suspense>
......
src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx
View file @ 1e40806d
...@@ -217,7 +217,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -217,7 +217,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{ {
title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌', title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId', dataIndex: 'associatedProductId',
render: (text, record) => `${text}/${record.associatedProductName}/${record.associatedType || '无'}/${record.associatedCategory}/${record.associatedBrand}`, render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
}, },
] ]
), ),
...@@ -578,6 +578,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -578,6 +578,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
isEdit={isEditRefundDeliver} isEdit={isEditRefundDeliver}
afterType={2} afterType={2}
deliveryType={detailInfo?.returnGoodsAddress?.deliveryType} deliveryType={detailInfo?.returnGoodsAddress?.deliveryType}
orderType={detailInfo?.orderType}
id="returnDeliveryGoodsList" id="returnDeliveryGoodsList"
/> />
</Suspense> </Suspense>
...@@ -602,6 +603,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -602,6 +603,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
isEdit={isEditExchangeDeliver} isEdit={isEditExchangeDeliver}
afterType={2} afterType={2}
deliveryType={detailInfo?.replaceGoodsAddress?.deliveryType} deliveryType={detailInfo?.replaceGoodsAddress?.deliveryType}
orderType={detailInfo?.orderType}
id="replaceDeliveryGoodsList" id="replaceDeliveryGoodsList"
/> />
</Suspense> </Suspense>
......
src/pages/afterService/repairApplication/components/DetailInfo/index.tsx
View file @ 1e40806d
...@@ -133,7 +133,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -133,7 +133,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{ {
title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌', title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId', dataIndex: 'associatedProductId',
render: (text, record) => `${text}/${record.associatedProductName}/${record.associatedType || '无'}/${record.associatedCategory}/${record.associatedBrand}`, render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
}, },
] ]
), ),
......
src/pages/afterService/repairManage/components/DetailInfo/index.tsx
View file @ 1e40806d
...@@ -134,7 +134,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -134,7 +134,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{ {
title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌', title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId', dataIndex: 'associatedProductId',
render: (text, record) => `${text}/${record.associatedProductName}/${record.associatedType || '无'}/${record.associatedCategory}/${record.associatedBrand}`, render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
}, },
] ]
), ),
......
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @ 1e40806d
...@@ -193,7 +193,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -193,7 +193,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{ {
title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌', title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId', dataIndex: 'associatedProductId',
render: (text, record) => `${text}/${record.associatedProductName}/${record.associatedType || '无'}/${record.associatedCategory}/${record.associatedBrand}`, render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
}, },
] ]
), ),
...@@ -613,6 +613,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -613,6 +613,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
isEdit={isEditRefundDeliver} isEdit={isEditRefundDeliver}
afterType={3} afterType={3}
deliveryType={detailInfo?.returnGoodsAddress?.deliveryType} deliveryType={detailInfo?.returnGoodsAddress?.deliveryType}
orderType={detailInfo?.orderType}
id="returnDeliveryGoodsList" id="returnDeliveryGoodsList"
/> />
</Suspense> </Suspense>
......
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @ 1e40806d
...@@ -219,7 +219,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -219,7 +219,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
{ {
title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌', title: detailInfo?.orderType !== ORDER_TYPE_TENDER_CONTRACT ? '关联报价商品ID、名称、规格、品类、品牌' : '关联投标商品ID、名称、规格、品类、品牌',
dataIndex: 'associatedProductId', dataIndex: 'associatedProductId',
render: (text, record) => `${text}/${record.associatedProductName}/${record.associatedType || '无'}/${record.associatedCategory}/${record.associatedBrand}`, render: (text, record) => `${text || ''}/${record.associatedProductName || ''}/${record.associatedType || ''}/${record.associatedCategory || ''}/${record.associatedBrand || ''}`,
}, },
] ]
), ),
...@@ -650,6 +650,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -650,6 +650,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
isEdit={isEditRefundDeliver} isEdit={isEditRefundDeliver}
afterType={3} afterType={3}
deliveryType={detailInfo?.returnGoodsAddress?.deliveryType} deliveryType={detailInfo?.returnGoodsAddress?.deliveryType}
orderType={detailInfo?.orderType}
id="returnDeliveryGoodsList" id="returnDeliveryGoodsList"
/> />
</Suspense> </Suspense>
......
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