Commit 0551a59a authored by XieZhiXiong's avatar XieZhiXiong

完善业务逻辑

parent 3b303fb8
......@@ -271,7 +271,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const fetchOuterHistory = (params): Promise<OuterHistoryData> => {
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageOuterWorkflowRecord({
PublicApi.getAsReplaceGoodsPageOuterWorkflowRecord({
...params,
dataId: id,
})
......@@ -289,7 +289,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const fetchInnerHistory = (params): Promise<InnerHistoryData> => {
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageInnerWorkflowRecord({
PublicApi.getAsReplaceGoodsPageInnerWorkflowRecord({
...params,
dataId: id,
})
......
......@@ -34,7 +34,7 @@ import EyePreview from '@/components/EyePreview';
import AuditProcess from '@/components/AuditProcess';
import { EditableColumns } from '@/components/PolymericTable/interface';
import { Values as ReturnAddressValues } from '../../../components/ReturnAddressInfo';
import ReturnInfoDrawer from '../../../components/ReturnInfoDrawer';
import ReturnInfoDrawer, { OrderInfo } from '../../../components/ReturnInfoDrawer';
import {
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
......@@ -75,8 +75,26 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const [infoLoading, setInfoloading] = useState(false);
const [visibleOrderDetial, setVisibleReturnInfo] = useState<boolean>(false);
const [returnAddress, setReturnAddress] = useState<ReturnAddressValues>(null);
const [orderInfo, setOrderInfo] = useState<OrderInfo>(null);
const handleCheckOrderDetial = record => {
setOrderInfo({
orderNo: record.orderNo,
productName: record.productName,
category: record.category,
brand: record.brand,
unit: record.unit,
purchaseCount: record.purchaseCount,
purchasePrice: record.purchasePrice,
purchaseAmount: record.purchaseAmount,
returnCount: record.returnCount,
returnReason: record.returnReason,
payList: record.payList.map(item => ({
...item,
payWayTxt: item.payWayName,
channelTxt: item.channelName,
})),
});
setVisibleReturnInfo(true);
};
......@@ -454,6 +472,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<ReturnInfoDrawer
visible={visibleOrderDetial}
orderInfo={orderInfo}
onClose={() => setVisibleReturnInfo(false)}
/>
</PageHeaderWrapper>
......
......@@ -17,8 +17,8 @@ import { EditableColumns } from '@/components/PolymericTable/interface';
import { Pie } from '@/components/Charts';
import MellowCard from '@/components/MellowCard';
import Mood from '@/components/Mood';
import equity5 from '@/assets/imgs/equity-5.png';
import styles from './index.less';
import request from '@/utils/request';
const { TabPane } = Tabs;
......@@ -549,14 +549,17 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
<Col flex="1">
<div className={styles.tofo}>
<MellowCard fullHeight>
{integralItems.map(item => (
{integralItems.map((item, index) => (
<Card.Grid key={item.id} className={styles['tofo-item']}>
<ContentBox
title={item.creditTypeName}
desc={item.remark}
desc={`${item.remark}(${item.creditPoint})`}
content={item.creditPoint}
extra={
<img className={styles['tofo-item-logo']} src={equity5} />
<img
className={styles['tofo-item-logo']}
src={require(`@/assets/imgs/integral-${index + 1}.png`)}
/>
}
/>
</Card.Grid>
......
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