Skip to content

J
jinfa-platform
Commit 2265c151 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

对接售后换货中

parent f5786bf9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1001 additions and 1579 deletions
src/components/StatusTag/index.less
View file @ 2265c151
......@@ -31,4 +31,9 @@
color: #3F7ED2;
background: #F0F8FF;
}
&__nobility {
color: #6554C0;
background: #EAE6FF;
}
}
\ No newline at end of file
src/components/StatusTag/index.tsx
View file @ 2265c151
......@@ -10,7 +10,7 @@ import classNames from 'classnames';
import styles from './index.less';
interface StatusTagProps {
type: 'success' | 'warning' | 'default' | 'danger' | 'primary';
type: 'success' | 'warning' | 'default' | 'danger' | 'primary' | 'nobility';
title: React.ReactNode;
style?: {[key: string]: any},
};
......
src/constants/index.ts
View file @ 2265c151
......@@ -1088,6 +1088,35 @@ export const EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE = 24; //
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT = 25; // 待确认换货回单
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_FINISHED = 26; // 待确认售后完成
export const EXCHANGE_INNER_STATUS_FINISHED = 27; // 已确认售后完成
export const EXCHANGE_INNER_STATUS = {
[EXCHANGE_INNER_STATUS_UNCOMMITTED]: '待提交',
[EXCHANGE_INNER_STATUS_COMMITTED]: '已提交',
[EXCHANGE_INNER_STATUS_SUCCESS_1]: '一级审核通过',
[EXCHANGE_INNER_STATUS_SUCCESS_2]: '二级审核通过',
[EXCHANGE_INNER_STATUS_FAILED]: '审核不通过',
[EXCHANGE_INNER_STATUS_CONFIRM_SUCCESS]: '确认审核通过',
[EXCHANGE_INNER_STATUS_CONFIRM_FAILED]: '确认审核不通过',
[EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY]: '待新增退货发货单',
[EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY]: '待审核退货发货单',
[EXCHANGE_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: '采购商待新增物流单',
[EXCHANGE_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS]: '采购商待确认物流单',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY]: '待确认退货发货',
[EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_STORAGE]: '待新增退货入库单',
[EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_STORAGE]: '待审核退货入库单',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE]: '待确认退货收货',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: '待确认退货回单',
[EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_DELIVERY]: '待新增换货发货单',
[EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_DELIVERY]: '待审核换货发货单',
[EXCHANGE_INNER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS]: '供应商待新增物流单',
[EXCHANGE_INNER_STATUS_SUPPLIER_UNCONFIRMED_LOGISTICS]: '供应商待确认物流单',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_DELIVERY]: '待确认换货发货',
[EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_STORAGE]: '待新增换货入库单',
[EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_STORAGE]: '待审核换货入库单',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE]: '待确认换货收货',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT]: '待确认换货回单',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_FINISHED]: '待确认售后完成',
[EXCHANGE_INNER_STATUS_FINISHED]: '已确认售后完成',
};
// 售后换货外部状态
export const EXCHANGE_OUTER_STATUS_UNCOMMITTED = 1; // 待提交
......@@ -1104,7 +1133,27 @@ export const EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY = 11; //
export const EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS = 12; // 供应商待新增物流单
export const EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY = 13; // 待换货发货
export const EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE = 14; // 待新增换货入库单
export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIVE = 15; // 待换货收货
export const EXCHANGE_OUTER_STATUS_REPLACE_RECEIVE = 15; // 待换货收货
export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT = 16; // 待确认换货回单
export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED = 17; // 待确认售后完成
export const EXCHANGE_OUTER_STATUS_FINISHED = 18; // 售后完成
\ No newline at end of file
export const EXCHANGE_OUTER_STATUS_FINISHED = 18; // 售后完成
export const EXCHANGE_OUTER_STATUS = {
[EXCHANGE_OUTER_STATUS_UNCOMMITTED]: '待提交',
[EXCHANGE_OUTER_UNCONFIRMED]: '待确认申请单',
[EXCHANGE_OUTER_STATUS_FAILED]: '不接受申请',
[EXCHANGE_OUTER_STATUS_SUCCESS]: '接受申请',
[EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY]: '待新增退货发货单',
[EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: '采购商待新增物流单',
[EXCHANGE_OUTER_STATUS_RETURN_DELIVERY]: '待退货发货',
[EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE]: '待新增退货入库单',
[EXCHANGE_OUTER_STATUS_RETURN_RECEIVE]: '待退货收货',
[EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: '待确认退货回单',
[EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY]: '待新增换货发货单',
[EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS]: '供应商待新增物流单',
[EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY]: '待换货发货',
[EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE]: '待新增换货入库单',
[EXCHANGE_OUTER_STATUS_REPLACE_RECEIVE]: '待换货收货',
[EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT]: '待确认换货回单',
[EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED]: '待确认售后完成',
[EXCHANGE_OUTER_STATUS_FINISHED]: '售后完成',
};
\ No newline at end of file
src/pages/afterService/components/AddressFormItem/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 10:30:54
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-13 16:50:01
* @LastEditTime: 2020-11-19 15:36:34
* @Description: 地址 Form Item
*/
import React, { useEffect, useState } from 'react';
......@@ -14,7 +14,9 @@ import styles from './index.less';
interface AddressItem {
id: string;
// 收件人
receiverName: string;
receiverName?: string;
// 收件人
shipperName?: string;
// 电话
phone: string;
// 详细地址
......@@ -75,7 +77,7 @@ const AddressFormItem: React.FC<AddressFormItemProps> & { isFieldComponent: bool
key={item.id}
>
<div>
{`${item.receiverName} / ${item.phone}`}
{`${item.receiverName || item.shipperName} / ${item.phone}`}
</div>
<div className={styles['addressList-item-detail']}>
{item.fullAddress}
......
src/pages/afterService/constants.ts
View file @ 2265c151
......@@ -13,6 +13,53 @@ import {
REPAIR_INNER_STATUS_CONFIRM_SUCCESS,
REPAIR_INNER_STATUS_CONFIRM_FAILED,
REPAIR_INNER_STATUS_FINISHED,
EXCHANGE_OUTER_STATUS_UNCOMMITTED,
EXCHANGE_OUTER_UNCONFIRMED,
EXCHANGE_OUTER_STATUS_FAILED,
EXCHANGE_OUTER_STATUS_SUCCESS,
EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY,
EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS,
EXCHANGE_OUTER_STATUS_RETURN_DELIVERY,
EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE,
EXCHANGE_OUTER_STATUS_RETURN_RECEIVE,
EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY,
EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS,
EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY,
EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE,
EXCHANGE_OUTER_STATUS_REPLACE_RECEIVE,
EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT,
EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED,
EXCHANGE_OUTER_STATUS_FINISHED,
EXCHANGE_INNER_STATUS_UNCOMMITTED,
EXCHANGE_INNER_STATUS_COMMITTED,
EXCHANGE_INNER_STATUS_SUCCESS_1,
EXCHANGE_INNER_STATUS_SUCCESS_2,
EXCHANGE_INNER_STATUS_FAILED,
EXCHANGE_INNER_STATUS_CONFIRM_SUCCESS,
EXCHANGE_INNER_STATUS_CONFIRM_FAILED,
EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY,
EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY,
EXCHANGE_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS,
EXCHANGE_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS,
EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY,
EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_STORAGE,
EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_STORAGE,
EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE,
EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT,
EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_DELIVERY,
EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_DELIVERY,
EXCHANGE_INNER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS,
EXCHANGE_INNER_STATUS_SUPPLIER_UNCONFIRMED_LOGISTICS,
EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_DELIVERY,
EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_STORAGE,
EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_STORAGE,
EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE,
EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT,
EXCHANGE_INNER_STATUS_UNCONFIRMED_FINISHED,
EXCHANGE_INNER_STATUS_FINISHED,
} from '@/constants';
// 售后维修外部状态 StatusTag map
......@@ -34,4 +81,57 @@ export const REPAIR_INNER_STATUS_BADGE_MAP = {
[REPAIR_INNER_STATUS_CONFIRM_SUCCESS]: '#6C9CEB',
[REPAIR_INNER_STATUS_CONFIRM_FAILED]: '#EF6260',
[REPAIR_INNER_STATUS_FINISHED]: '#41CC9E',
};
// 售后换货外部状态 StatusTag map
export const EXCHANGE_OUTER_STATUS_TAG_MAP = {
[EXCHANGE_OUTER_STATUS_UNCOMMITTED]: 'default',
[EXCHANGE_OUTER_UNCONFIRMED]: 'primary',
[EXCHANGE_OUTER_STATUS_FAILED]: 'danger',
[EXCHANGE_OUTER_STATUS_SUCCESS]: 'primary',
[EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY]: 'danger',
[EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: 'warning',
[EXCHANGE_OUTER_STATUS_RETURN_DELIVERY]: 'danger',
[EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE]: 'danger',
[EXCHANGE_OUTER_STATUS_RETURN_RECEIVE]: 'danger',
[EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: 'danger',
[EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY]: 'nobility',
[EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS]: 'success',
[EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY]: 'nobility',
[EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE]: 'nobility',
[EXCHANGE_OUTER_STATUS_REPLACE_RECEIVE]: 'nobility',
[EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT]: 'primary',
[EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED]: 'primary',
[EXCHANGE_OUTER_STATUS_FINISHED]: 'success',
};
// 售后换货外部状态 Badge map
export const EXCHANGE_INNER_STATUS_BADGE_MAP = {
[EXCHANGE_INNER_STATUS_UNCOMMITTED]: '#669EDE',
[EXCHANGE_INNER_STATUS_COMMITTED]: '#41CC9E',
[EXCHANGE_INNER_STATUS_SUCCESS_1]: '#41CC9E',
[EXCHANGE_INNER_STATUS_SUCCESS_2]: '#41CC9E',
[EXCHANGE_INNER_STATUS_FAILED]: '#EF6260',
[EXCHANGE_INNER_STATUS_CONFIRM_SUCCESS]: '#41CC9E',
[EXCHANGE_INNER_STATUS_CONFIRM_FAILED]: '#EF6260',
[EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY]: '#E63F3B',
[EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY]: '#FF991F',
[EXCHANGE_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: '#E63F3B',
[EXCHANGE_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_STORAGE]: '#E63F3B',
[EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_STORAGE]: '#FF991F',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_DELIVERY]: '#E63F3B',
[EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_DELIVERY]: '#FF991F',
[EXCHANGE_INNER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS]: '#E63F3B',
[EXCHANGE_INNER_STATUS_SUPPLIER_UNCONFIRMED_LOGISTICS]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_DELIVERY]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_STORAGE]: '#E63F3B',
[EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_STORAGE]: '#FF991F',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_UNCONFIRMED_FINISHED]: '#6C9CEB',
[EXCHANGE_INNER_STATUS_FINISHED]: '#41CC9E',
};
\ No newline at end of file
src/pages/afterService/exchangeApplication/exchangePrAddDeliver/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 17:06:00
* @LastEditTime: 2020-11-19 18:15:56
* @Description: 待新增退货发货单
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const { confirm } = Modal;
......@@ -43,9 +41,11 @@ const ExchangePrAddDeliver: React.FC = () => {
confirm({
title: '确认审核操作',
icon: <ExclamationCircleOutlined />,
content: `是否确认审核退货发货单号为${'FH5421039'}的换货发货单？`,
content: `是否确认审核退货发货单号为${record.applyNo}的退货发货单？`,
onOk() {
// do something
return PublicApi.postAsReplaceGoodsVerifyReturnDeliveryGoods({
dataId: record.replaceId,
});
},
});
};
......@@ -95,19 +95,15 @@ const ExchangePrAddDeliver: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -123,7 +119,7 @@ const ExchangePrAddDeliver: React.FC = () => {
</Button>
<Button
type="link"
onClick={() => handleVerify(record.id)}
onClick={() => handleVerify(record)}
>
审核
</Button>
......@@ -136,71 +132,24 @@ const ExchangePrAddDeliver: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeAddReturnDeliveryGoods({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -222,10 +171,6 @@ const ExchangePrAddDeliver: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeApplication/exchangePrAddLogistics/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-18 11:22:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 17:16:46
* @LastEditTime: 2020-11-19 18:16:33
* @Description: 待新增换货发货单
*/
import React, { useState, useRef } from 'react';
......@@ -18,17 +18,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -44,7 +42,7 @@ const ExchangePrAddLogistics: React.FC = () => {
render: (text, record) => (
<>
<EyePreview
url={`/memberCenter/afterService/exchangeApplication/exchangePrAddLogistics/detail?id=${record.id}`}
url={`/memberCenter/afterService/exchangeApplication/exchangePrAddLogistics/detail?id=${record.replaceId}`}
>
{text}
</EyePreview>
......@@ -81,19 +79,15 @@ const ExchangePrAddLogistics: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -121,72 +115,25 @@ const ExchangePrAddLogistics: React.FC = () => {
const [columns, setColumns] = useState<any[]>(defaultColumns);
const fetchListData = (params: any) => {
// const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getAsReturnGoodsPageToBeAddLogisticsByConsumer({
// 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
const { startTime, endTime, ...rest } = params;
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeAddLogisticsByConsumer({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -208,10 +155,6 @@ const ExchangePrAddLogistics: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeApplication/exchangePrAddWarehousing/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 17:48:29
* @LastEditTime: 2020-11-19 18:18:34
* @Description: 待新增换货发货单
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const { confirm } = Modal;
......@@ -43,9 +41,11 @@ const ExchangePrAddWarehousing: React.FC = () => {
confirm({
title: '确认审核操作',
icon: <ExclamationCircleOutlined />,
content: `是否确认审核换货入库单号为${'FH5421039'}的退货入库单？`,
content: `是否确认审核换货入库单号为${record.applyNo}的换货入库单？`,
onOk() {
// do something
return PublicApi.postAsReplaceGoodsVerifyReplaceGoodsStorage({
dataId: record.replaceId,
});
},
});
};
......@@ -95,19 +95,15 @@ const ExchangePrAddWarehousing: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -123,7 +119,7 @@ const ExchangePrAddWarehousing: React.FC = () => {
</Button>
<Button
type="link"
onClick={() => handleVerify(record.id)}
onClick={() => handleVerify(record)}
>
审核
</Button>
......@@ -136,71 +132,24 @@ const ExchangePrAddWarehousing: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeAddReplaceGoodsStorage({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -222,10 +171,6 @@ const ExchangePrAddWarehousing: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeApplication/exchangePrConfirmBack/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 17:44:54
* @LastEditTime: 2020-11-19 18:17:29
* @Description: 待确认退货回单
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -82,19 +80,15 @@ const ExchangePrConfirmBack: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -117,71 +111,24 @@ const ExchangePrConfirmBack: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeConfirmReturnGoodsReceipt({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -203,10 +150,6 @@ const ExchangePrConfirmBack: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeApplication/exchangePrDeliver/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 17:28:17
* @LastEditTime: 2020-11-19 18:17:01
* @Description: 待退货发货
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -82,19 +80,15 @@ const ExchangePrDeliver: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -106,7 +100,7 @@ const ExchangePrDeliver: React.FC = () => {
type="link"
onClick={() => history.push(`/memberCenter/afterService/exchangeApplication/exchangePrDeliver/verify?id=${record.replaceId}`)}
>
换货发货
退货发货
</Button>
</>
),
......@@ -117,71 +111,24 @@ const ExchangePrDeliver: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeReturnDeliveryGoods({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -203,10 +150,6 @@ const ExchangePrDeliver: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeApplication/exchangePrFinished/index.tsx
View file @ 2265c151
......@@ -19,16 +19,14 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
REPAIR_OUTER_STATUS_TAG_MAP,
REPAIR_INNER_STATUS_BADGE_MAP,
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
......@@ -45,7 +43,7 @@ const ExchangePrFinished: React.FC = () => {
render: (text, record) => (
<>
<EyePreview
url={`/memberCenter/afterService/exchangeApplication/exchangePrFinished/detail?id=${record.applyId}`}
url={`/memberCenter/afterService/exchangeApplication/exchangePrFinished/detail?id=${record.replaceId}`}
>
{text}
</EyePreview>
......@@ -71,19 +69,15 @@ const ExchangePrFinished: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type={REPAIR_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={REPAIR_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -93,7 +87,7 @@ const ExchangePrFinished: React.FC = () => {
<>
<Button
type="link"
onClick={() => history.push(`/memberCenter/afterService/exchangeApplication/exchangePrFinished/verify?id=${record.applyId}`)}
onClick={() => history.push(`/memberCenter/afterService/exchangeApplication/exchangePrFinished/verify?id=${record.replaceId}`)}
>
确认售后完成
</Button>
......@@ -106,71 +100,24 @@ const ExchangePrFinished: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeComplete({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getAsRepairGoodsPageItems();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -192,10 +139,6 @@ const ExchangePrFinished: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeApplication/exchangePrReceived/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 10:53:56
* @LastEditTime: 2020-11-19 18:19:21
* @Description: 待换货收货
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const { confirm } = Modal;
......@@ -84,19 +82,15 @@ const ExchangePrReceived: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -119,71 +113,24 @@ const ExchangePrReceived: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeReplaceReceiveGoods({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -205,10 +152,6 @@ const ExchangePrReceived: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/effects/index.ts
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-03 18:19:51
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-03 18:32:29
* @LastEditTime: 2020-11-19 15:18:29
* @Description:
*/
import { useBusinessEffects } from './useBusinessEffects';
......@@ -24,7 +24,25 @@ const fetchInvoicesType = (): Promise<any[]> => {
};
export const createEffects = (context, actions) => {
const { setFieldState } = actions;
useBusinessEffects(context, actions);
// useAsyncSelect('invoicesTypeId', fetchInvoicesType, ['name', 'id']);
// 获取收件地址
PublicApi.getLogisticsSelectListReceiverAddress().then(res => {
if (res.code === 1000) {
setFieldState('deliveryAddress', state => {
state.props['x-component-props'].dataSource = res.data;
});
}
});
// 获取发货地址
PublicApi.getLogisticsSelectListShipperAddress().then(res => {
if (res.code === 1000) {
setFieldState('*(shippingAddress,pickupAddress)', state => {
state.props['x-component-props'].dataSource = res.data;
});
}
});
};
\ No newline at end of file
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/effects/useBusinessEffects.ts
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-03 18:30:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-17 16:13:43
* @LastEditTime: 2020-11-19 15:47:21
* @Description: 联动逻辑相关
*/
import { Modal } from 'antd';
......@@ -43,11 +43,51 @@ export const useBusinessEffects = (context, actions) => {
onFieldValueChange$('deliveryType').subscribe(fieldState => {
const { name, value } = fieldState;
// 如果选中 自提
if (value === 2) {
linkage.show('shippingAddress');
} else {
linkage.hide('shippingAddress');
}
switch (value) {
// 物流
case 1: {
linkage.show('shippingAddress');
linkage.hide('pickupAddress');
break;
};
// 自提
case 2: {
linkage.hide('shippingAddress');
linkage.show('pickupAddress');
break;
};
// 无需物流
case 3: {
linkage.hide('*(shippingAddress,pickupAddress)');
break;
};
default:
break
};
});
// 校验换货数量
onFieldInputChange$('replaceGoodsList.*.replaceCount').subscribe(fieldState => {
const { name, value } = fieldState;
// 已换货数量
const replacedCountValue = getFieldState(
FormPath.transform(name, /\d/, $1 => {
return `repairGoodsList.${$1}.replacedCount`
}),
state => state.value,
);
setFieldState(
FormPath.transform(name, /\d/, $1 => {
return `repairGoodsList.${$1}.replaceCount`
}),
state => {
if (+value > replacedCountValue) {
state.errors = '填写值已超过最大可换货数量，请重新填写';
} else {
state.errors = '';
}
}
);
});
}
\ No newline at end of file
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/schema/index.ts
View file @ 2265c151
......@@ -273,11 +273,42 @@ export const addBillSchema: ISchema = {
replaceCount: {
type: 'string',
title: '换货数量',
'x-component': 'Text',
'x-component-props': {
allowClear: true,
style: {
maxWidth: 150,
},
},
'x-rules': [
{
required: true,
message: '请填写换货数量',
},
{
pattern: PATTERN_MAPS.weight,
message: '请填写正数，最多保留3位小数',
},
],
},
replaceReason: {
type: 'string',
title: '换货原因',
'x-component-props': {
allowClear: true,
style: {
maxWidth: 150,
},
},
'x-rules': [
{
required: true,
message: '请填写换货原因',
},
{
limitByte: true, // 自定义校验规则
maxByte: 60,
}
],
},
// 不用于展示，只用于收集值
id: {
......@@ -289,6 +320,11 @@ export const addBillSchema: ISchema = {
type: 'string',
display: false,
},
// 已换货数量
replacedCount: {
type: 'string',
visible: false,
},
},
}
},
......@@ -357,21 +393,35 @@ export const addBillSchema: ISchema = {
default: 1,
enum: DELIVERY_TYPE_ENUM,
},
// 退货收货地址
// 退货发货地址
shippingAddress: {
title: '退货收货地址',
title: '退货发货地址',
type: 'string',
'x-component': 'AddressFormItem',
'x-component-props': {
dataSource: [
{
id: 1,
receiverName: '收件人1',
phone: '18128131762',
fullAddress: '不告诉你1',
},
],
dataSource: [],
},
'x-rules': [
{
required: true,
message: '请选择退货发货地址',
},
],
},
// 退货自提地址
pickupAddress: {
title: '退货自提地址',
type: 'string',
'x-component': 'AddressFormItem',
'x-component-props': {
dataSource: [],
},
'x-rules': [
{
required: true,
message: '请选择退货自提地址',
},
],
},
// 换货收货地址
deliveryAddress: {
......@@ -379,15 +429,14 @@ export const addBillSchema: ISchema = {
type: 'string',
'x-component': 'AddressFormItem',
'x-component-props': {
dataSource: [
{
id: 1,
receiverName: '收件人1',
phone: '18128131762',
fullAddress: '不告诉你1',
},
],
dataSource: [],
},
'x-rules': [
{
required: true,
message: '请选择换货收货地址',
},
],
},
},
},
......
src/pages/afterService/exchangeApplication/exchangePrSubmit/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 10:13:18
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 16:43:45
* @LastEditTime: 2020-11-19 17:21:11
* @Description: 待提交换货申请单
*/
import React, { useState, useRef } from 'react';
......@@ -13,6 +13,7 @@ import {
Button,
Popconfirm,
Space,
message,
} from 'antd';
import { history } from 'umi';
import {
......@@ -26,17 +27,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -44,8 +43,36 @@ const formActions = createFormActions();
const ExchangePrSubmit: React.FC = () => {
const ref = useRef<any>({});
const handleDelete = () => {
const handleDelete = record => {
const msg = message.loading({
content: '正在删除',
duration: 0,
});
PublicApi.postAsReplaceGoodsDelete({
dataId: record.replaceId,
}).then(res => {
if (res.code === 1000) {
ref.current.reload();
}
}).finally(() => {
msg();
});
};
const handleSubmit = record => {
const msg = message.loading({
content: '正在提交',
duration: 0,
});
PublicApi.postAsReplaceGoodsSubmit({
dataId: record.replaceId,
}).then(res => {
if (res.code === 1000) {
ref.current.reload();
}
}).finally(() => {
msg();
});
};
const defaultColumns: ColumnType<any>[] = [
......@@ -56,7 +83,7 @@ const ExchangePrSubmit: React.FC = () => {
render: (text, record) => (
<>
<EyePreview
url={`/memberCenter/afterService/exchangeApplication/exchangePrSubmit/detail?id=${record.id}`}
url={`/memberCenter/afterService/exchangeApplication/exchangePrSubmit/detail?id=${record.replaceId}`}
>
{text}
</EyePreview>
......@@ -82,20 +109,16 @@ const ExchangePrSubmit: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
},
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
dataIndex: 'option',
......@@ -104,19 +127,19 @@ const ExchangePrSubmit: React.FC = () => {
<>
<Button
type="link"
onClick={() => {}}
onClick={() => handleSubmit(record)}
>
提交
</Button>
<Button
type="link"
onClick={() => history.push(`/memberCenter/afterService/exchangeApplication/exchangePrSubmit/edit`)}
onClick={() => history.push(`/memberCenter/afterService/exchangeApplication/exchangePrSubmit/edit?id=${record.replaceId}`)}
>
编辑
</Button>
<Button
type="link"
onClick={() => handleDelete()}
onClick={() => handleDelete(record)}
danger
>
删除
......@@ -129,69 +152,25 @@ const ExchangePrSubmit: React.FC = () => {
const [columns, setColumns] = useState<any[]>(defaultColumns);
const fetchListData = (params: any) => {
// const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getAsReturnGoodsPageToBeSubmitByConsumer({
// 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({
totalCount: 10,
data: [
{
applyNo: '123',
replaceId: 1,
}
],
const { startTime, endTime, ...rest } = params;
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeSubmitByConsumer({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
const controllerBtns = (
<>
<Space>
......@@ -232,10 +211,6 @@ const ExchangePrSubmit: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeApplication/exchangeQuery/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 14:25:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-19 10:04:28
* @LastEditTime: 2020-11-19 14:36:17
* @Description: 换货申请单查询
*/
import React, { useState, useRef } from 'react';
......@@ -25,9 +25,9 @@ import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -72,7 +72,7 @@ const ExchangeQuery: React.FC = () => {
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
......@@ -81,7 +81,7 @@ const ExchangeQuery: React.FC = () => {
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
];
......
src/pages/afterService/exchangeManage/exchangePr1/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-17 18:07:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 10:02:14
* @LastEditTime: 2020-11-19 18:28:16
* @Description: 待提交审核换货申请单
*/
import React, { useState, useRef } from 'react';
......@@ -18,17 +18,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -44,7 +42,7 @@ const ExchangePr1: React.FC = () => {
render: (text, record) => (
<>
<EyePreview
url={`/memberCenter/afterService/exchangeManage/exchangPr2/detail?id=${record.replaceId}`}
url={`/memberCenter/afterService/exchangeManage/exchangPr1/detail?id=${record.replaceId}`}
>
{text}
</EyePreview>
......@@ -70,19 +68,15 @@ const ExchangePr1: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -92,7 +86,7 @@ const ExchangePr1: React.FC = () => {
<>
<Button
type="link"
onClick={() => history.push(`/memberCenter/afterService/exchangeManage/exchangPr2/verify?id=${record.replaceId}`)}
onClick={() => history.push(`/memberCenter/afterService/exchangeManage/exchangPr1/verify?id=${record.replaceId}`)}
>
提交审核
</Button>
......@@ -105,68 +99,24 @@ const ExchangePr1: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// 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();
// });
// });
return Promise.resolve({
totalCount: 10,
data: [
{
applyNo: '123',
replaceId: 1,
}
],
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeVerifyStepOne({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -188,10 +138,6 @@ const ExchangePr1: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePr1/schema/index.ts
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-29 10:03:06
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-05 14:28:08
* @LastEditTime: 2020-11-19 18:29:31
* @Description:
*/
import { ISchema } from '@formily/antd';
......
src/pages/afterService/exchangeManage/exchangePr2/index.tsx
View file @ 2265c151
......@@ -18,17 +18,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -70,19 +68,15 @@ const ExchangePr2: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -105,68 +99,24 @@ const ExchangePr2: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// 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();
// });
// });
return Promise.resolve({
totalCount: 10,
data: [
{
applyNo: '123',
replaceId: 1,
}
],
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeVerifyStepTwo({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -188,10 +138,6 @@ const ExchangePr2: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePrAddDeliver/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 11:37:36
* @LastEditTime: 2020-11-19 18:55:37
* @Description: 待新增换货发货单
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const { confirm } = Modal;
......@@ -43,9 +41,11 @@ const ExchangePrAddDeliver: React.FC = () => {
confirm({
title: '确认审核操作',
icon: <ExclamationCircleOutlined />,
content: `是否确认审核换货发货单号为${'FH5421039'}的换货发货单？`,
content: `是否确认审核换货发货单号为${record.applyNo}的换货发货单？`,
onOk() {
// do something
return PublicApi.postAsReplaceGoodsVerifyReplaceDeliveryGoods({
dataId: record.replaceId,
});
},
});
};
......@@ -72,7 +72,7 @@ const ExchangePrAddDeliver: React.FC = () => {
},
{
title: '采购会员',
dataIndex: 'supplier',
dataIndex: 'consumerName',
align: 'center',
},
{
......@@ -95,20 +95,16 @@ const ExchangePrAddDeliver: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
},
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
dataIndex: 'option',
......@@ -123,7 +119,7 @@ const ExchangePrAddDeliver: React.FC = () => {
</Button>
<Button
type="link"
onClick={() => handleVerify(record.id)}
onClick={() => handleVerify(record)}
>
审核
</Button>
......@@ -136,71 +132,24 @@ const ExchangePrAddDeliver: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeAddReplaceDeliveryGoods({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -222,10 +171,6 @@ const ExchangePrAddDeliver: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePrAddDeliver/schema/index.ts
View file @ 2265c151
......@@ -42,7 +42,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
supplier: {
consumerName: {
type: 'string',
'x-component-props': {
placeholder: '采购会员',
......
src/pages/afterService/exchangeManage/exchangePrAddLogistics/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-18 11:22:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 11:29:12
* @LastEditTime: 2020-11-19 18:57:56
* @Description: 待新增换货发货单
*/
import React, { useState, useRef } from 'react';
......@@ -18,17 +18,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -44,7 +42,7 @@ const ReturnPrAddLogistics: React.FC = () => {
render: (text, record) => (
<>
<EyePreview
url={`/memberCenter/afterService/exchangeManage/exchangePrAddLogistics/detail?id=${record.id}`}
url={`/memberCenter/afterService/exchangeManage/exchangePrAddLogistics/detail?id=${record.replaceId}`}
>
{text}
</EyePreview>
......@@ -81,20 +79,16 @@ const ReturnPrAddLogistics: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
},
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
dataIndex: 'option',
......@@ -121,72 +115,25 @@ const ReturnPrAddLogistics: React.FC = () => {
const [columns, setColumns] = useState<any[]>(defaultColumns);
const fetchListData = (params: any) => {
// const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getAsReturnGoodsPageToBeAddLogisticsByConsumer({
// 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
const { startTime, endTime, ...rest } = params;
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeAddLogisticsBySupplier({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -208,10 +155,6 @@ const ReturnPrAddLogistics: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePrAddWarehousing/index.tsx
View file @ 2265c151
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const { confirm } = Modal;
......@@ -43,9 +41,11 @@ const ExchangePrAddWarehousing: React.FC = () => {
confirm({
title: '确认审核操作',
icon: <ExclamationCircleOutlined />,
content: `是否确认审核退货入库单号为${'FH5421039'}的退货入库单？`,
content: `是否确认审核退货入库单号为${record.applyNo}的退货入库单？`,
onOk() {
// do something
return PublicApi.postAsReplaceGoodsVerifyReturnGoodsStorage({
dataId: record.replaceId,
});
},
});
};
......@@ -95,20 +95,16 @@ const ExchangePrAddWarehousing: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
},
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
dataIndex: 'option',
......@@ -123,7 +119,7 @@ const ExchangePrAddWarehousing: React.FC = () => {
</Button>
<Button
type="link"
onClick={() => handleVerify(record.id)}
onClick={() => handleVerify(record)}
>
审核
</Button>
......@@ -136,71 +132,24 @@ const ExchangePrAddWarehousing: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeAddReturnGoodsStorage({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -222,10 +171,6 @@ const ExchangePrAddWarehousing: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePrConfirm/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-17 18:07:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 10:11:17
* @LastEditTime: 2020-11-19 18:34:49
* @Description: 待提交审核换货申请单
*/
import React, { useState, useRef } from 'react';
......@@ -18,17 +18,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -70,19 +68,15 @@ const ExchangePrConfirm: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -105,68 +99,24 @@ const ExchangePrConfirm: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// 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();
// });
// });
return Promise.resolve({
totalCount: 10,
data: [
{
applyNo: '123',
replaceId: 1,
}
],
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeConfirmVerify({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -188,10 +138,6 @@ const ExchangePrConfirm: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePrConfirmBack/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 17:34:55
* @LastEditTime: 2020-11-19 19:02:18
* @Description: 待确认换货回单
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -82,20 +80,16 @@ const ExchangePrConfirmBack: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
},
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
dataIndex: 'option',
......@@ -117,71 +111,24 @@ const ExchangePrConfirmBack: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeConfirmReplaceGoodsReceipt({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -203,10 +150,6 @@ const ExchangePrConfirmBack: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePrDeliver/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 17:23:22
* @LastEditTime: 2020-11-19 19:00:21
* @Description: 待换货发货
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -59,7 +57,7 @@ const ExchangePrDeliver: React.FC = () => {
},
{
title: '采购会员',
dataIndex: 'supplier',
dataIndex: 'consumerName',
align: 'center',
},
{
......@@ -82,20 +80,16 @@ const ExchangePrDeliver: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
},
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
dataIndex: 'option',
......@@ -117,71 +111,24 @@ const ExchangePrDeliver: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeReplaceDeliveryGoods({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -203,10 +150,6 @@ const ExchangePrDeliver: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePrDeliver/schema/index.ts
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-29 10:03:06
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-09 17:53:45
* @LastEditTime: 2020-11-19 19:00:51
* @Description:
*/
import { ISchema } from '@formily/antd';
......@@ -42,7 +42,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
supplier: {
consumerName: {
type: 'string',
'x-component-props': {
placeholder: '采购会员',
......
src/pages/afterService/exchangeManage/exchangePrReceived/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-06 16:30:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 17:54:47
* @LastEditTime: 2020-11-19 18:50:35
* @Description: 待退货收货
*/
import React, { useState, useRef } from 'react';
......@@ -19,17 +19,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const { confirm } = Modal;
......@@ -84,20 +82,16 @@ const ExchangePrReceived: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
},
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
dataIndex: 'option',
......@@ -119,71 +113,24 @@ const ExchangePrReceived: 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',
replaceId: 1,
parentMemberName: '申请单摘要',
created: '2020-11-03 11:46:00',
},
],
total: 10,
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeReturnReceiveGoods({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -205,10 +152,6 @@ const ExchangePrReceived: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangePrSubmit/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-17 18:07:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-18 10:12:10
* @LastEditTime: 2020-11-19 18:25:35
* @Description: 待提交审核换货申请单
*/
import React, { useState, useRef } from 'react';
......@@ -18,17 +18,15 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { createFormActions } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { coverColFiltersItem } from '@/utils';
import EyePreview from '@/components/EyePreview';
import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -70,19 +68,15 @@ const ExchangePrSubmit: React.FC = () => {
title: '外部状态',
dataIndex: 'outerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
{
title: '操作',
......@@ -105,68 +99,24 @@ const ExchangePrSubmit: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// 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();
// });
// });
return Promise.resolve({
totalCount: 10,
data: [
{
applyNo: '123',
replaceId: 1,
}
],
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageToBeSubmitBySupplier({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
// const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {};
};
return (
<PageHeaderWrapper>
<Card>
......@@ -188,10 +138,6 @@ const ExchangePrSubmit: React.FC = () => {
'applyNo',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['innerStatus', 'outerStatus'],
fetchSearchItems,
);
}}
schema={listSearchSchema}
/>
......
src/pages/afterService/exchangeManage/exchangeQuery/index.tsx
View file @ 2265c151
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 14:25:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-17 18:21:27
* @LastEditTime: 2020-11-19 18:23:23
* @Description: 换货申请单查询
*/
import React, { useState, useRef } from 'react';
......@@ -25,9 +25,9 @@ import NiceForm from '@/components/NiceForm';
import StatusTag from '@/components/StatusTag';
import { listSearchSchema } from './schema';
import {
CREDIT_OUTER_STATUS_TAG_MAP,
CREDIT_INNER_STATUS_BADGE_MAP,
} from '../../contants';
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from '../../constants';
import styles from './index.less';
const formActions = createFormActions();
......@@ -72,7 +72,7 @@ const ExchangeQuery: React.FC = () => {
filters: [],
onFilter: (value, record) => record.outerStatus === value,
render: (text, record) => (
<StatusTag type="success" title="售后完成" />
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} />
),
},
{
......@@ -81,7 +81,7 @@ const ExchangeQuery: React.FC = () => {
align: 'center',
filters: [],
onFilter: (value, record) => record.innerStatus === value,
render: (text, record) => <Badge color={'#6C9CEB'} text="待确认售后完成" />,
render: (text, record) => <Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[record.innerStatus]} text={text} />,
},
];
......@@ -89,65 +89,56 @@ const ExchangeQuery: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// 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();
// });
// });
return Promise.resolve({
totalCount: 10,
data: [
{
applyNo: '123',
replaceId: 1,
}
],
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageBySupplier({
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();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
const res = await PublicApi.getAsReplaceGoodsPageItems();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
if (res.code === 1000) {
const { data } = res;
const {
outerStatusList = [],
innerStatusList = [],
} = data;
// const newColumns = columns.slice();
const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// filter 0 过滤掉全部选项
coverColFiltersItem(
newColumns,
'outerStatusName',
outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
);
coverColFiltersItem(
newColumns,
'innerStatusName',
innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
);
// setColumns(newColumns);
setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {
outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
};
}
return {};
};
......
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/effects/useBusinessEffects.ts
View file @ 2265c151
......@@ -18,17 +18,6 @@ const {
onFieldValueChange$,
} = FormEffectHooks;
// 获取采购入库单相关数据
const fetchOrderPurchaseReceiptAddList = async (params: any) => {
const res = await PublicApi.getOrderPurchaseReceiptAddList({
...params,
})
if (res.code === 1000) {
return res.data;
}
return [];
};
export const useBusinessEffects = (context, actions) => {
const {
getFieldValue,
......
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/schema/index.ts
View file @ 2265c151
......@@ -255,6 +255,12 @@ export const addBillSchema: ISchema = {
title: '单位',
'x-component': 'Text',
},
// 采购数量
purchaseCount: {
type: 'string',
title: '采购数量',
'x-component': 'Text',
},
repairCount: {
type: 'string',
title: '维修数量',
......@@ -270,8 +276,8 @@ export const addBillSchema: ISchema = {
message: '请填写维修数量',
},
{
pattern: PATTERN_MAPS.quantity,
message: '请填写大于等于 0 的整数维修数量',
pattern: PATTERN_MAPS.weight,
message: '请填写正数，最多保留3位小数',
},
],
},
......@@ -305,11 +311,6 @@ export const addBillSchema: ISchema = {
type: 'string',
display: false,
},
// 采购数量
purchaseCount: {
type: 'string',
visible: false,
},
// 已维修数量
repairedCount: {
type: 'string',
......
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/effects/useBusinessEffects.ts
View file @ 2265c151
......@@ -19,17 +19,6 @@ const {
onFieldValueChange$,
} = FormEffectHooks;
// 获取采购入库单相关数据
const fetchOrderPurchaseReceiptAddList = async (params: any) => {
const res = await PublicApi.getOrderPurchaseReceiptAddList({
...params,
})
if (res.code === 1000) {
return res.data;
}
return [];
};
export const useBusinessEffects = (context, actions) => {
const {
getFieldValue,
......
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