Commit 84b13a31 authored by XieZhiXiong's avatar XieZhiXiong

fix: 修复跳转查看退货入库单id不对的问题

parent 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-24 10:28:23 * @LastEditTime: 2021-09-24 11:13:56
* @Description: 换货退货收货统计、换货退货发货明细 * @Description: 换货退货收货统计、换货退货发货明细
*/ */
import React, { useState } from 'react'; import React, { useState } from 'react';
...@@ -385,7 +385,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({ ...@@ -385,7 +385,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
<Descriptions.Item label="退货入库单号"> <Descriptions.Item label="退货入库单号">
{!isPurchaser ? ( {!isPurchaser ? (
<Link <Link
to={`/memberCenter/afterService/exchangeManage/exchangePrAddWarehousing/warehousingDetail?id=${item.storageId}`} to={`/memberCenter/afterService/exchangeManage/exchangePrAddWarehousing/warehousingDetail?id=${item.deliveryNoId}`}
> >
{item.storageNo} {item.storageNo}
</Link> </Link>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44 * @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-20 14:30:20 * @LastEditTime: 2021-09-24 11:06:32
* @Description: 待新增退货发货单 * @Description: 待新增退货发货单
*/ */
import React, { useState, useRef } from 'react'; import React, { useState, useRef } from 'react';
......
...@@ -79,7 +79,7 @@ const ExchangePrReceived: React.FC = () => { ...@@ -79,7 +79,7 @@ const ExchangePrReceived: React.FC = () => {
align: 'center', align: 'center',
render: (text, record) => ( render: (text, record) => (
<Link <Link
to={`/memberCenter/afterService/exchangeManage/exchangePrAddWarehousing/warehousingDetail?id=${record.returnDeliveryId}`} to={`/memberCenter/afterService/exchangeManage/exchangePrAddWarehousing/warehousingDetail?id=${record.deliveryId}`}
> >
{text} {text}
</Link> </Link>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2021-08-04 13:59:33 * @Date: 2021-08-04 13:59:33
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-09-22 14:55:11 * @LastEditTime: 2021-09-24 11:15:07
* @Description: * @Description:
*/ */
import { ISchema } from '@formily/antd'; import { ISchema } from '@formily/antd';
...@@ -348,6 +348,9 @@ const createSchema = (relatedType: RelatedType, billType: number, orderType: num ...@@ -348,6 +348,9 @@ const createSchema = (relatedType: RelatedType, billType: number, orderType: num
'x-component': 'Text', 'x-component': 'Text',
'x-component-props': { 'x-component-props': {
ellipsis: true, ellipsis: true,
style: {
width: 400,
},
}, },
}, },
// 商品品类 // 商品品类
......
...@@ -12,11 +12,11 @@ import styles from './index.less'; ...@@ -12,11 +12,11 @@ import styles from './index.less';
const EllipsisText = (props) => { const EllipsisText = (props) => {
const { value } = props; const { value } = props;
const { ellipsis } = (props.props['x-component-props'] || {}); const { ellipsis, ...rest } = (props.props['x-component-props'] || {});
return ( return (
<Tooltip title={ellipsis ? value : null}> <Tooltip title={ellipsis ? value : null}>
<div className={classNames({ [styles.ellipsis]: ellipsis })}>{value}</div> <div className={classNames({ [styles.ellipsis]: ellipsis })} {...rest}>{value}</div>
</Tooltip> </Tooltip>
) )
} }
......
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