Commit bf84d088 authored by FE-安焕焕's avatar FE-安焕焕 👣

联调修改问题

parent 6d04aff7
...@@ -60,15 +60,12 @@ export default () => { ...@@ -60,15 +60,12 @@ export default () => {
closeModal(true); closeModal(true);
} }
}; };
const handleCom = async ({ companyCode, logisticsNo }) => { const handleCom = async ({ expressCompanyCode, deliveryNo }) => {
const tempObj = { const tempObj = {
expressCompanyCode: companyCode,
expressCompanyName: companyCode,
deliveryNo: logisticsNo,
detailList: [], detailList: [],
key: Date.now(), key: Date.now(),
}; };
const data = await trackInfo({ companyCode, logisticsNo }); const data = await trackInfo({ expressCompanyCode, deliveryNo });
if (!data) { if (!data) {
notification.info({ message: '暂无物流信息' }); notification.info({ message: '暂无物流信息' });
return; return;
...@@ -103,7 +100,7 @@ export default () => { ...@@ -103,7 +100,7 @@ export default () => {
width: 120, width: 120,
render: (appealFlag, r) => { render: (appealFlag, r) => {
if (appealFlag) { if (appealFlag) {
return <a onClick={() => viewAppeal(r)}>申诉</a>; return <a onClick={() => viewAppeal(r)}>申诉</a>;
} }
return <div> 未申诉</div>; return <div> 未申诉</div>;
}, },
...@@ -139,7 +136,13 @@ export default () => { ...@@ -139,7 +136,13 @@ export default () => {
> >
驳回 驳回
</Button>, </Button>,
<Button key="link3" onClick={() => viewDetail(r)} type="primary" className="mr10"> <Button
key="link3"
onClick={() => viewDetail(r)}
type="primary"
className="mr10"
disabled={!r.showDetail}
>
订单详情 订单详情
</Button>, </Button>,
<Button <Button
...@@ -159,7 +162,7 @@ export default () => { ...@@ -159,7 +162,7 @@ export default () => {
<ProTable <ProTable
columns={columns} columns={columns}
request={params => searchList(params, 2)} request={params => searchList(params, 2)}
rowKey="orderNo" rowKey="serviceNo"
pagination={{ pagination={{
pagesSize: 20, pagesSize: 20,
}} }}
......
...@@ -59,7 +59,6 @@ export default () => { ...@@ -59,7 +59,6 @@ export default () => {
title: '售后凭证', title: '售后凭证',
dataIndex: 'proofs', dataIndex: 'proofs',
hideInSearch: true, hideInSearch: true,
order: 4,
width: 100, width: 100,
render: proofs => <a onClick={() => viewProofs(proofs)}>查看凭证</a>, render: proofs => <a onClick={() => viewProofs(proofs)}>查看凭证</a>,
}, },
...@@ -82,7 +81,13 @@ export default () => { ...@@ -82,7 +81,13 @@ export default () => {
width: 250, width: 250,
fixed: 'right', fixed: 'right',
render: (_, r) => [ render: (_, r) => [
<Button key="link1" onClick={() => openAudit(r)} className="mr10" type="primary"> <Button
key="link1"
onClick={() => openAudit(r)}
className="mr10"
type="primary"
disabled={!r.showAudit}
>
审核 审核
</Button>, </Button>,
<Button key="link" onClick={() => viewDetail(r)} type="primary"> <Button key="link" onClick={() => viewDetail(r)} type="primary">
...@@ -96,7 +101,7 @@ export default () => { ...@@ -96,7 +101,7 @@ export default () => {
<ProTable <ProTable
columns={columns} columns={columns}
request={params => searchList(params, 1)} request={params => searchList(params, 1)}
rowKey="orderNo" rowKey="serviceNo"
pagination={{ pagination={{
pagesSize: 20, pagesSize: 20,
}} }}
......
import React from 'react'; import React, { useState } from 'react';
import { Modal } from 'antd'; import { Modal } from 'antd';
import style from '../styles.less'; import style from '../styles.less';
export default props => { export default props => {
const { visible, onCancel, data } = props; const { visible, onCancel, data } = props;
const [detailModal, setDetailModal] = useState(false);
const [detailSrc, setDetailSrc] = useState(null);
const handleCancel = () => { const handleCancel = () => {
onCancel(); onCancel();
}; };
const clickImg = src => {
setDetailSrc(src);
setDetailModal(true);
};
return ( return (
<Modal title="售后凭证" visible={visible} onCancel={handleCancel} footer={null}> <Modal title="售后凭证" visible={visible} onCancel={handleCancel} footer={null} width={600}>
<div className={style.proofsWrap}> <div className={style.proofsWrap}>
{data.map(item => ( {data.map(item => (
<img src={item} key={item} alt={item} className={style.proofs} /> <img
src={item}
key={item}
alt={item}
className={style.proofs}
width={250}
onClick={() => clickImg(item)}
/>
))} ))}
</div> </div>
<Modal
title="凭证详情"
visible={detailModal}
onCancel={() => setDetailModal(false)}
footer={null}
width={700}
>
<p className={style.detailWrap}>
<img src={detailSrc} alt={detailSrc} />
</p>
</Modal>
</Modal> </Modal>
); );
}; };
...@@ -36,7 +36,7 @@ export async function searchList(params, queryStatus) { ...@@ -36,7 +36,7 @@ export async function searchList(params, queryStatus) {
export async function jdInfo(params) { export async function jdInfo(params) {
const data = await request.get('/api/kdsp/op/afs/jd-info', { const data = await request.get('/api/kdsp/op/afs/jd-info', {
prefix: kdspApi, prefix: kdspApi,
params: stringify(params), params,
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
}, },
...@@ -64,7 +64,7 @@ export async function auditInfoApi(params) { ...@@ -64,7 +64,7 @@ export async function auditInfoApi(params) {
// 审核核检 // 审核核检
export async function shopCheck(params) { export async function shopCheck(params) {
return request.post('/api/kdsp/op/afs/shop/check', { return request.post('/api/kdsp/op/afs/shop/check', {
params: stringify(_.omitBy(params, v => !v)), params,
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
}, },
......
.proofs { .proofs {
padding: 10px; padding: 5px;
border: 1px solid #ddd;
border-radius: 10px;
} }
.proofsWrap { .proofsWrap {
display: flex;
justify-content: space-between;
min-height: 300px;
max-height: 600px;
overflow: auto;
}
.detailWrap {
min-height: 300px;
max-height: 600px; max-height: 600px;
overflow: auto; overflow: auto;
} }
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