Skip to content

J
jinfa-platform
Commit 751cd5dc authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

对接售后退货处理能对接的接口

parent 0fe4455f
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 261 deletions
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @ 751cd5dc
......@@ -15,9 +15,9 @@ import { FormOutlined } from '@ant-design/icons';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { history } from 'umi';
import { PublicApi } from '@/services/api';
import { GetPayCreditApplyGetApplyDetailResponse } from '@/services/PayApi';
import { GetAsReturnGoodsGetDetailBySupplierResponse } from '@/services/AfterServiceApi';
import { CREDIT_INNER_STATUS, CREDIT_OUTER_STATUS, CREDIT_STATUS } from '@/constants';
import { normalizeFiledata, FileData } from '@/utils';
import { normalizeFiledata, FileData, findLastIndexFlowState } from '@/utils';
import AvatarWrap from '@/components/AvatarWrap';
import StatusTag from '@/components/StatusTag';
import EyePreview from '@/components/EyePreview';
......@@ -51,7 +51,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
target,
headExtra = null,
}) => {
const [detailInfo, setDetailInfo] = useState<GetPayCreditApplyGetApplyDetailResponse>(null);
const [detailInfo, setDetailInfo] = useState<GetAsReturnGoodsGetDetailBySupplierResponse>(null);
const [infoLoading, setInfoloading] = useState(false);
const [visibleOrderDetial, setVisibleReturnInfo] = useState<boolean>(false);
......@@ -164,27 +164,21 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
},
];
// 获取授信详情
// 获取退货申请详情
const getDetailInfo = () => {
if (!id) {
return;
}
// setInfoloading(true);
// PublicApi.getPayCreditApplyGetApplyDetail({
// applyId: id,
// }).then(res => {
// if (res.code === 1000) {
// setDetailInfo(res.data);
// setQuotaValues({
// applyQuota: res.data.apply.applyQuota,
// billDay: res.data.apply.billDay,
// repayPeriod: res.data.apply.repayPeriod,
// fileList: res.data.apply.fileList ? res.data.apply.fileList.map(item => normalizeFiledata(item.fileUrl)) : [],
// });
// }
// }).finally(() => {
// setInfoloading(false);
// });
setInfoloading(true);
PublicApi.getAsReturnGoodsGetDetailBySupplier({
returnId: id,
}).then(res => {
if (res.code === 1000) {
setDetailInfo(res.data);
}
}).finally(() => {
setInfoloading(false);
});
};
useEffect(() => {
......@@ -206,7 +200,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<AvatarWrap
info={{
aloneTxt: '单',
name: `申请单号：FPTY12}`,
name: `申请单号：${detailInfo?.applyNo}`,
}}
/>
}
......@@ -223,9 +217,9 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
padding: '0 32px',
}}
>
<Descriptions.Item label="申请单摘要：">进口头层黄牛皮荔枝纹</Descriptions.Item>
<Descriptions.Item label="供应会员">温州隆昌手袋有限公司</Descriptions.Item>
<Descriptions.Item label="单据时间">2020-09-09 12:58:25</Descriptions.Item>
<Descriptions.Item label="申请单摘要：">{detailInfo?.applyAbstract}</Descriptions.Item>
<Descriptions.Item label="采购会员">{detailInfo?.consumerName}</Descriptions.Item>
<Descriptions.Item label="单据时间">{detailInfo?.applyTime}</Descriptions.Item>
<Descriptions.Item label="外部状态">
<StatusTag type="success" title={'售后完成'} />
</Descriptions.Item>
......@@ -241,36 +235,28 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<Col span={24}>
<Suspense fallback={null}>
<AuditProcess
outerVerifySteps={[
{
step: 1,
stepName: '提交退货申请单',
roleName: '采购商',
status: 'finish',
},
{
step: 2,
stepName: '确认退货申请单',
roleName: '供应商',
status: 'wait',
},
]}
outerVerifyCurrent={1}
innerVerifySteps={[
{
step: 1,
stepName: '新增物流单',
roleName: '供应商',
status: 'finish',
},
{
step: 2,
stepName: '退货发货',
roleName: '采购商',
status: 'wait',
},
]}
innerVerifyCurrent={0}
outerVerifySteps={
detailInfo && detailInfo.outerTaskList ?
detailInfo.outerTaskList.map(item => ({
step: item.step,
stepName: item.taskName,
roleName: item.roleName,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
}
outerVerifyCurrent={findLastIndexFlowState(detailInfo?.outerTaskList)}
innerVerifySteps={
detailInfo && detailInfo.innerTaskList ?
detailInfo.innerTaskList.map(item => ({
step: item.step,
stepName: item.taskName,
roleName: item.roleName,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
}
innerVerifyCurrent={findLastIndexFlowState(detailInfo?.innerTaskList)}
/>
</Suspense>
</Col>
......
src/pages/afterService/returnManage/returnPr1/index.tsx
View file @ 751cd5dc
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 14:25:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-09 17:44:59
* @LastEditTime: 2020-11-11 15:37:48
* @Description: 退货申请单查询
*/
import React, { useState, useRef } from 'react';
......@@ -53,22 +53,22 @@ const ReturnPr1: React.FC = () => {
},
{
title: '申请单摘要',
dataIndex: 'parentMemberName',
dataIndex: 'applyAbstract',
align: 'center',
},
{
title: '采购会员',
dataIndex: 'supplier',
dataIndex: 'consumerName',
align: 'center',
},
{
title: '退款金额',
dataIndex: 'returnAmount',
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
dataIndex: 'created',
dataIndex: 'applyTime',
align: 'center',
},
{
......@@ -110,32 +110,21 @@ const ReturnPr1: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getPayCreditApplyPageCreditApply({
// startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// ...rest,
// })
// .then(res => {
// if (res.code === 1000) {
// resolve(res.data);
// }
// reject();
// })
// .catch(() => {
// reject();
// });
// });
return Promise.resolve({
data: [
{
id: 1,
applyNo: '123',
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageToBeVerifyStepOne({
startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
...rest,
})
.then(res => {
if (res.code === 1000) {
resolve(res.data);
}
reject();
})
.catch(() => {
reject();
});
});
};
......
src/pages/afterService/returnManage/returnPr1/schema/index.ts
View file @ 751cd5dc
......@@ -35,28 +35,26 @@ export const listSearchSchema: ISchema = {
columns: 6,
},
properties: {
abstract: {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
allowClear: true,
},
},
'[startTime, endTime]': {
consumerName: {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: '采购会员',
allowClear: true,
},
},
supplier: {
'[startTime, endTime]': {
type: 'string',
default: undefined,
enum: [],
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '采购会员(全部)',
placeholder: '单据时间(全部)',
allowClear: true,
},
},
......
src/pages/afterService/returnManage/returnPr1/verify.tsx
View file @ 751cd5dc
......@@ -15,12 +15,25 @@ import DetailInfo from '../components/DetailInfo';
import VerifyModal from '../../components/VerifyModal';
const ReturnPr1Verify: React.FC = () => {
const { id, creditId } = usePageStatus();
const { id } = usePageStatus();
const [visible, setVisible] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false);
const handleSubmit = values => {
if (!id) {
return;
}
setConfirmLoading(true);
PublicApi.postAsReturnGoodsVerifyStepOne({
applyId: id,
...values,
}).then(res => {
if (res.code === 1000) {
history.goBack();
}
}).finally(() => {
setConfirmLoading(false);
});
};
return (
......
src/pages/afterService/returnManage/returnPr2/index.tsx
View file @ 751cd5dc
......@@ -53,22 +53,22 @@ const ReturnPr2: React.FC = () => {
},
{
title: '申请单摘要',
dataIndex: 'parentMemberName',
dataIndex: 'applyAbstract',
align: 'center',
},
{
title: '采购会员',
dataIndex: 'supplier',
dataIndex: 'consumerName',
align: 'center',
},
{
title: '退款金额',
dataIndex: 'returnAmount',
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
dataIndex: 'created',
dataIndex: 'applyTime',
align: 'center',
},
{
......@@ -110,32 +110,21 @@ const ReturnPr2: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getPayCreditApplyPageCreditApply({
// startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// ...rest,
// })
// .then(res => {
// if (res.code === 1000) {
// resolve(res.data);
// }
// reject();
// })
// .catch(() => {
// reject();
// });
// });
return Promise.resolve({
data: [
{
id: 1,
applyNo: '123',
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageToBeVerifyStepTwo({
startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
...rest,
})
.then(res => {
if (res.code === 1000) {
resolve(res.data);
}
reject();
})
.catch(() => {
reject();
});
});
};
......
src/pages/afterService/returnManage/returnPr2/schema/index.ts
View file @ 751cd5dc
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-29 10:03:06
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-09 17:19:00
* @LastEditTime: 2020-11-11 15:41:23
* @Description:
*/
import { ISchema } from '@formily/antd';
......@@ -35,28 +35,26 @@ export const listSearchSchema: ISchema = {
columns: 6,
},
properties: {
abstract: {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
allowClear: true,
},
},
'[startTime, endTime]': {
consumerName: {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: '采购会员',
allowClear: true,
},
},
supplier: {
'[startTime, endTime]': {
type: 'string',
default: undefined,
enum: [],
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '采购会员(全部)',
placeholder: '单据时间(全部)',
allowClear: true,
},
},
......
src/pages/afterService/returnManage/returnPr2/verify.tsx
View file @ 751cd5dc
......@@ -20,7 +20,20 @@ const ReturnPr2Verify: React.FC = () => {
const [confirmLoading, setConfirmLoading] = useState(false);
const handleSubmit = values => {
if (!id) {
return;
}
setConfirmLoading(true);
PublicApi.postAsReturnGoodsVerifyStepTwo({
applyId: id,
...values,
}).then(res => {
if (res.code === 1000) {
history.goBack();
}
}).finally(() => {
setConfirmLoading(false);
});
};
return (
......
src/pages/afterService/returnManage/returnPrConfirm/index.tsx
View file @ 751cd5dc
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 14:25:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-09 17:40:41
* @LastEditTime: 2020-11-11 15:46:52
* @Description: 退货申请单查询
*/
import React, { useState, useRef } from 'react';
......@@ -53,22 +53,22 @@ const ReturnPrConfirm: React.FC = () => {
},
{
title: '申请单摘要',
dataIndex: 'parentMemberName',
dataIndex: 'applyAbstract',
align: 'center',
},
{
title: '采购会员',
dataIndex: 'supplier',
dataIndex: 'consumerName',
align: 'center',
},
{
title: '退款金额',
dataIndex: 'returnAmount',
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
dataIndex: 'created',
dataIndex: 'applyTime',
align: 'center',
},
{
......@@ -110,32 +110,21 @@ const ReturnPrConfirm: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getPayCreditApplyPageCreditApply({
// startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// ...rest,
// })
// .then(res => {
// if (res.code === 1000) {
// resolve(res.data);
// }
// reject();
// })
// .catch(() => {
// reject();
// });
// });
return Promise.resolve({
data: [
{
id: 1,
applyNo: '123',
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageToBeConfirmVerify({
startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
...rest,
})
.then(res => {
if (res.code === 1000) {
resolve(res.data);
}
reject();
})
.catch(() => {
reject();
});
});
};
......
src/pages/afterService/returnManage/returnPrConfirm/schema/index.ts
View file @ 751cd5dc
......@@ -35,28 +35,26 @@ export const listSearchSchema: ISchema = {
columns: 6,
},
properties: {
abstract: {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
allowClear: true,
},
},
'[startTime, endTime]': {
consumerName: {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: '采购会员',
allowClear: true,
},
},
supplier: {
'[startTime, endTime]': {
type: 'string',
default: undefined,
enum: [],
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '采购会员(全部)',
placeholder: '单据时间(全部)',
allowClear: true,
},
},
......
src/pages/afterService/returnManage/returnPrConfirm/verify.tsx
View file @ 751cd5dc
......@@ -20,7 +20,20 @@ const ReturnPrConfirmVerify: React.FC = () => {
const [confirmLoading, setConfirmLoading] = useState(false);
const handleSubmit = values => {
if (!id) {
return;
}
setConfirmLoading(true);
PublicApi.postAsReturnGoodsConfirmVerify({
applyId: id,
...values,
}).then(res => {
if (res.code === 1000) {
history.goBack();
}
}).finally(() => {
setConfirmLoading(false);
});
};
return (
......@@ -34,7 +47,7 @@ const ReturnPrConfirmVerify: React.FC = () => {
icon={<FormOutlined />}
onClick={() => setVisible(true)}
>
单据审核
确认单据
</Button>
)}
/>
......
src/pages/afterService/returnManage/returnPrSubmit/index.tsx
View file @ 751cd5dc
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 14:25:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-09 17:16:57
* @LastEditTime: 2020-11-11 15:28:20
* @Description: 退货申请单查询
*/
import React, { useState, useRef } from 'react';
......@@ -53,22 +53,22 @@ const ReturnPrSubmit: React.FC = () => {
},
{
title: '申请单摘要',
dataIndex: 'parentMemberName',
dataIndex: 'applyAbstract',
align: 'center',
},
{
title: '采购会员',
dataIndex: 'supplier',
dataIndex: 'consumerName',
align: 'center',
},
{
title: '退款金额',
dataIndex: 'returnAmount',
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
dataIndex: 'created',
dataIndex: 'applyTime',
align: 'center',
},
{
......@@ -110,32 +110,21 @@ const ReturnPrSubmit: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getPayCreditApplyPageCreditApply({
// startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// ...rest,
// })
// .then(res => {
// if (res.code === 1000) {
// resolve(res.data);
// }
// reject();
// })
// .catch(() => {
// reject();
// });
// });
return Promise.resolve({
data: [
{
id: 1,
applyNo: '123',
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageToBeSubmitBySupplier({
startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
...rest,
})
.then(res => {
if (res.code === 1000) {
resolve(res.data);
}
reject();
})
.catch(() => {
reject();
});
});
};
......
src/pages/afterService/returnManage/returnPrSubmit/schema/index.ts
View file @ 751cd5dc
......@@ -35,28 +35,26 @@ export const listSearchSchema: ISchema = {
columns: 6,
},
properties: {
abstract: {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
allowClear: true,
},
},
'[startTime, endTime]': {
consumerName: {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: '采购会员',
allowClear: true,
},
},
supplier: {
'[startTime, endTime]': {
type: 'string',
default: undefined,
enum: [],
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '采购会员(全部)',
placeholder: '单据时间(全部)',
allowClear: true,
},
},
......
src/pages/afterService/returnManage/returnPrSubmit/verify.tsx
View file @ 751cd5dc
......@@ -15,12 +15,25 @@ import DetailInfo from '../components/DetailInfo';
import VerifyModal from '../../components/VerifyModal';
const ReturnPrSubmitVerify: React.FC = () => {
const { id, creditId } = usePageStatus();
const { id } = usePageStatus();
const [visible, setVisible] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false);
const handleSubmit = values => {
if (!id) {
return;
}
setConfirmLoading(true);
PublicApi.postAsReturnGoodsSubmitVerify({
applyId: id,
...values,
}).then(res => {
if (res.code === 1000) {
history.goBack();
}
}).finally(() => {
setConfirmLoading(false);
});
};
return (
......
src/pages/afterService/returnManage/returnQuery/index.tsx
View file @ 751cd5dc
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 14:25:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-09 15:45:13
* @LastEditTime: 2020-11-11 15:24:34
* @Description: 退货申请单查询
*/
import React, { useState, useRef } from 'react';
......@@ -52,22 +52,22 @@ const ReturnQuery: React.FC = () => {
},
{
title: '申请单摘要',
dataIndex: 'parentMemberName',
dataIndex: 'applyAbstract',
align: 'center',
},
{
title: '采购会员',
dataIndex: 'supplier',
dataIndex: 'consumerName',
align: 'center',
},
{
title: '退款金额',
dataIndex: 'returnAmount',
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
dataIndex: 'created',
dataIndex: 'applyTime',
align: 'center',
},
{
......@@ -94,32 +94,21 @@ const ReturnQuery: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getPayCreditApplyPageCreditApply({
// startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// ...rest,
// })
// .then(res => {
// if (res.code === 1000) {
// resolve(res.data);
// }
// reject();
// })
// .catch(() => {
// reject();
// });
// });
return Promise.resolve({
data: [
{
id: 1,
applyNo: '123',
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageBySupplier({
startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
...rest,
})
.then(res => {
if (res.code === 1000) {
resolve(res.data);
}
reject();
})
.catch(() => {
reject();
});
});
};
......
src/pages/afterService/returnManage/returnQuery/schema/index.ts
View file @ 751cd5dc
......@@ -35,28 +35,26 @@ export const listSearchSchema: ISchema = {
columns: 6,
},
properties: {
abstract: {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
allowClear: true,
},
},
'[startTime, endTime]': {
consumerName: {
type: 'string',
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: '采购会员',
allowClear: true,
},
},
supplier: {
'[startTime, endTime]': {
type: 'string',
default: undefined,
enum: [],
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '采购会员(全部)',
placeholder: '单据时间(全部)',
allowClear: true,
},
},
......
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