Commit e4a5ee31 authored by 李腾's avatar 李腾

fix: 仅退款,且用户端选择“已收到货”,【物流拦截】按钮隐藏不展示

parent c62a0a3a
...@@ -442,7 +442,7 @@ export const getColumns = props => { ...@@ -442,7 +442,7 @@ export const getColumns = props => {
key="link7" key="link7"
onClick={() => openLogistics(record)} onClick={() => openLogistics(record)}
{...btnProps} {...btnProps}
disabled={serviceType !== 1 || (serviceType === 1 && intercept) || isReceived === 1} disabled={serviceType !== 1 || (serviceType === 1 && intercept)}
> >
物流拦截 物流拦截
</Button> </Button>
...@@ -483,8 +483,12 @@ export const getColumns = props => { ...@@ -483,8 +483,12 @@ export const getColumns = props => {
</Button> </Button>
); );
/** @name applyTpye=2 */ // 仅退款状态 && 用户已收到货 不展示物流拦截按钮
if (serviceType === 1 && isReceived === 1) {
logisticsInterceptionBtn = '';
}
// 无权限 不展示审核、驳回、物流拦截
if (!canEditable) { if (!canEditable) {
auditBtn = ''; auditBtn = '';
refuseBtn = ''; refuseBtn = '';
......
...@@ -40,7 +40,7 @@ const AfterSale = props => { ...@@ -40,7 +40,7 @@ const AfterSale = props => {
const { permissions } = props; const { permissions } = props;
const canEditable = permissions[AFTER_SALE_ORDER.EDITABLE]; const canEditable = permissions[AFTER_SALE_ORDER.EDITABLE];
const location = useLocation(); const location = useLocation();
const pageQueryOrderNo = location.query?.orderNo || ''; const [pageQueryOrderNo, setPageQueryOrderNo] = useState(location.query?.orderNo || '');
const actionRef = useRef(); const actionRef = useRef();
const formRef = useRef(); const formRef = useRef();
...@@ -318,7 +318,7 @@ const AfterSale = props => { ...@@ -318,7 +318,7 @@ const AfterSale = props => {
const requestParams = { const requestParams = {
page, page,
size, size,
orderNo: pageQueryOrderNo, orderNo: pageQueryOrderNo, // 首次请求需要直接使用 此方式,因为params中首次请求不存在orderNo
...params, ...params,
startDate, startDate,
endDate, endDate,
...@@ -331,6 +331,8 @@ const AfterSale = props => { ...@@ -331,6 +331,8 @@ const AfterSale = props => {
endDate, endDate,
}); });
const res = await searchList(requestParams); const res = await searchList(requestParams);
// 初始化获取订单编号后删除临时存储的订单编号
setPageQueryOrderNo('');
const { records = [], total } = res.data; const { records = [], total } = res.data;
if (countRes.code === '0000') { if (countRes.code === '0000') {
......
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