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