Skip to content

J
jinfa-platform
Commit 9fa96330 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

fixbug

parent 743be149
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 92 deletions
src/constants/index.ts
View file @ 9fa96330
......@@ -1767,3 +1767,78 @@ export const RETURN_OUTER_STATUS = {
[RETURN_OUTER_STATUS_UNCONFIRMED_FINISHED]: '待确认售后完成',
[RETURN_OUTER_STATUS_FINISHED]: '售后完成',
}
// 支付方式
/**
* 线上支付
*/
export const PAY_WAY_ONLINE = 1;
/**
* 线下支付
*/
export const PAY_WAY_OFFLINE = 2;
/**
* 授信支付
*/
export const PAY_WAY_CREDIT = 3;
/**
* 货到付款
*/
export const PAY_WAY_COD = 4;
/**
* 支付方式对应中文
*/
export const PAYWAY = {
[PAY_WAY_ONLINE]: '线上支付',
[PAY_WAY_OFFLINE]: '线下支付',
[PAY_WAY_CREDIT]: '授信支付',
[PAY_WAY_COD]: '货到付款',
};
// 支付渠道
/**
* 积分支付
*/
export const PAY_CHANNEL_INTEGRAL = 0;
/**
* 支付宝
*/
export const PAY_CHANNEL_ALI = 1;
/**
* 微信
*/
export const PAY_CHANNEL_WECHAT = 2;
/**
* 银联
*/
export const PAY_CHANNEL_UNION = 3;
/**
* 余额
*/
export const PAY_CHANNEL_BALANCE = 4;
/**
* 线下支付
*/
export const PAY_CHANNEL_OFFLINE = 5;
/**
* 授信
*/
export const PAY_CHANNEL_CREDIT = 6;
/**
* 货到付款
*/
export const PAY_CHANNEL_COD = 7;
/**
* 支付渠道对应中文
*/
export const PAY_CHANNEL = {
[PAY_CHANNEL_INTEGRAL]: '积分支付',
[PAY_CHANNEL_ALI]: '支付宝',
[PAY_CHANNEL_WECHAT]: '微信',
[PAY_CHANNEL_UNION]: '银联',
[PAY_CHANNEL_BALANCE]: '余额',
[PAY_CHANNEL_OFFLINE]: '线下支付',
[PAY_CHANNEL_CREDIT]: '授信',
[PAY_CHANNEL_COD]: '货到付款',
};
\ No newline at end of file
src/pages/afterService/components/FlowRecords/index.tsx
View file @ 9fa96330
......@@ -7,13 +7,6 @@ import PolymericTable from '@/components/PolymericTable';
import { EditableColumns } from '@/components/PolymericTable/interface';
import MellowCard from '@/components/MellowCard';
import StatusTag from '@/components/StatusTag';
import {
CREDIT_INNER_STATUS,
CREDIT_OUTER_STATUS,
} from '@/constants';
import {
} from '../../constants';
import styles from './index.less';
export interface InnerHistoryItem {
......@@ -54,15 +47,24 @@ interface FlowRecordsProps {
* 获取内部流转记录
*/
fetchInnerHistory: (params: { [key: string]: any }) => Promise<InnerHistoryData>;
/**
* 外部状态map
*/
outerStatusMap: {[key: string]: any};
/**
* 内部状态 color map
*/
innerStatusColorMap: {[key: string]: any};
};
const PAGE_SIZE = 10;
const FlowRecords: React.FC<FlowRecordsProps> = ({
outerHistory = [],
innerHistory,
fetchOuterHistory,
fetchInnerHistory,
outerStatusMap = {},
innerStatusColorMap = {},
}) => {
const [outerPage, setOuterPage] = useState(1);
const [outerSize, setOuterSize] = useState(PAGE_SIZE);
......@@ -87,10 +89,10 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({
},
{
title: '状态',
dataIndex: 'status',
dataIndex: 'statusName',
align: 'center',
render: (text, record) => (
<StatusTag type={'success'} title={'待提交'} />
<StatusTag type={outerStatusMap[record.status] || 'default'} title={text} />
),
},
{
......@@ -135,10 +137,10 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({
},
{
title: '状态',
dataIndex: 'status',
dataIndex: 'statusName',
align: 'center',
render: (text, record) => (
<Badge color={'#EF6260'} text={'待退货发货'} />
<Badge color={innerStatusColorMap[record.status] || '#EF6260'} text={text} />
),
},
{
......@@ -218,7 +220,7 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({
return (
<MellowCard>
<Tabs onChange={() => {}}>
{outerHistory ? (
{outerData.data && outerData.data.length > 0 ? (
<Tabs.TabPane tab="外部流转记录" key="1">
<PolymericTable
rowKey="operateTime"
......
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @ 9fa96330
......@@ -2,16 +2,17 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 15:09:09
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-11 11:04:53
* @LastEditTime: 2020-12-11 16:25:51
* @Description: 维修商品抽屉组件
*/
import React, { useState, useEffect } from 'react';
import { Drawer, Button, Pagination } from 'antd';
import { createFormActions } from '@formily/antd';
import moment from 'moment';
import { ColumnType } from 'antd/lib/table/interface';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { PurchaseOrderOutWorkStateTexts, ORDER_TYPE2 } from '@/constants';
import { PurchaseOrderOutWorkStateTexts, ORDER_TYPE2, PAYWAY, PAY_CHANNEL} from '@/constants';
import NiceForm from '@/components/NiceForm';
import NestTable from '@/components/NestTable';
import { goodItem, OrderListParams, OrderListRes } from './interface';
......@@ -380,9 +381,14 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
payList:
item.payInfoList ?
item.payInfoList.map(item => {
const { payPrice, ...rest } = item;
const { payPrice, payTime, payWay, channel, ...rest } = item;
return {
payAmount: payPrice,
payTime: moment(payTime).format('YYYY-MM-DD HH:mm:ss'),
payWay,
channel,
payWayName: PAYWAY[payWay],
channelName: PAY_CHANNEL[channel],
...rest,
}
}) :
......
src/pages/afterService/components/OuterCirculationRecord/index.tsx
View file @ 9fa96330
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-29 15:04:46
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-10-26 18:54:44
* @LastEditTime: 2020-12-11 16:39:17
* @Description: 外部流转记录
*/
import React from 'react';
......@@ -43,9 +43,9 @@ const OuterCirculationRecord: React.FC<OuterCirculationRecordProps> = ({
},
{
title: '状态',
dataIndex: 'status',
dataIndex: 'statusName',
align: 'center',
render: text => <StatusTag type={REPAIR_OUTER_STATUS_TAG_MAP[text]} title={REPAIR_OUTER_STATUS[text]} />
render: (text, record) => <StatusTag type={REPAIR_OUTER_STATUS_TAG_MAP[record.status]} title={text} />
},
{
title: '操作',
......
src/pages/afterService/components/ReturnDetailInfo/index.tsx
View file @ 9fa96330
......@@ -13,6 +13,12 @@ import { EditableColumns } from '@/components/PolymericTable/interface';
import PolymericTable from '@/components/PolymericTable';
import StatusTag from '@/components/StatusTag';
import { FileData, normalizeFiledata } from '@/utils';
import {
PAY_CHANNEL_OFFLINE,
PAY_CHANNEL_BALANCE,
PAY_CHANNEL_CREDIT,
PAY_CHANNEL_COD,
} from '@/constants';
import Stamp from '../Stamp';
import DescribeLine from '../DescribeLine';
import CheckVoucherModal from '../CheckVoucherModal';
......@@ -24,10 +30,6 @@ import {
REFUND_OUTER_STATUS_NOT_RECEIVED,
REFUND_OUTER_STATUS_RECEIVED,
REFUND_OUTER_STATUS_TAG_MAP,
PAY_CHANNEL_OFFLINE,
PAY_CHANNEL_BALANCE,
PAY_CHANNEL_CREDIT,
PAY_CHANNEL_COD,
} from '../../constants';
import styles from './index.less';
......
src/pages/afterService/components/ReturnInfoDrawer/effects/useBusinessEffects.ts
View file @ 9fa96330
......@@ -29,7 +29,7 @@ export const useBusinessEffects = (context, actions) => {
onFieldValueChange$('payList.*.refundAmount').subscribe(fieldState => {
const payListValue = getFieldValue('payList');
const amount = payListValue.reduce((pre, now) => +now.refundAmount + pre, 0);
setFieldValue('returnAmount', amount);
setFieldValue('refundAmount', amount);
});
// 退款数量 联动，支付信息里边的 退款金额
......
src/pages/afterService/components/ReturnInfoDrawer/schema/index.ts
View file @ 9fa96330
......@@ -158,7 +158,7 @@ const schema: ISchema = {
display: false,
'x-component': 'Text',
},
payWayTxt: {
payWayName: {
type: 'string',
title: '支付方式',
'x-component': 'Text',
......@@ -169,7 +169,7 @@ const schema: ISchema = {
display: false,
'x-component': 'Text',
},
channelTxt: {
channelName: {
type: 'string',
title: '支付渠道',
'x-component': 'Text',
......@@ -204,7 +204,7 @@ const schema: ISchema = {
labelCol: 4,
},
properties: {
returnAmount: {
refundAmount: {
type: 'string',
title: '退款金额(元)',
editable: false,
......
src/pages/afterService/constants.ts
View file @ 9fa96330
......@@ -277,37 +277,3 @@ export const REFUND_OUTER_STATUS_TAG_MAP = {
[REFUND_OUTER_STATUS_NOT_RECEIVED]: 'warning',
[REFUND_OUTER_STATUS_RECEIVED]: 'success',
};
// 支付渠道
/**
* 积分支付
*/
export const PAY_CHANNEL_INTEGRAL = 0;
/**
* 支付宝
*/
export const PAY_CHANNEL_ALI = 1;
/**
* 微信
*/
export const PAY_CHANNEL_WECHAT = 2;
/**
* 银联
*/
export const PAY_CHANNEL_UNION = 3;
/**
* 余额
*/
export const PAY_CHANNEL_BALANCE = 4;
/**
* 线下支付
*/
export const PAY_CHANNEL_OFFLINE = 5;
/**
* 授信
*/
export const PAY_CHANNEL_CREDIT = 6;
/**
* 货到付款
*/
export const PAY_CHANNEL_COD = 7;
\ No newline at end of file
src/pages/afterService/exchangeApplication/components/DetailInfo/index.tsx
View file @ 9fa96330
......@@ -437,6 +437,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<FlowRecords
fetchOuterHistory={fetchOuterHistory}
fetchInnerHistory={fetchInnerHistory}
outerStatusMap={EXCHANGE_OUTER_STATUS_TAG_MAP}
innerStatusColorMap={EXCHANGE_INNER_STATUS_BADGE_MAP}
/>
</Suspense>
</Col>
......
src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx
View file @ 9fa96330
......@@ -490,6 +490,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<FlowRecords
fetchOuterHistory={fetchOuterHistory}
fetchInnerHistory={fetchInnerHistory}
outerStatusMap={EXCHANGE_OUTER_STATUS_TAG_MAP}
innerStatusColorMap={EXCHANGE_INNER_STATUS_BADGE_MAP}
/>
</Suspense>
</Col>
......
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/index.tsx
View file @ 9fa96330
......@@ -279,8 +279,8 @@ const RepairForm: React.FC<BillsFormProps> = ({
productId: item.productId,
productName: item.productName,
category: item.category,
brand: item.unitName,
unit: item.costPrice,
brand: item.brand,
unit: item.unit,
purchaseCount: item.purchaseCount,
repairReason: '',
extraData: {
......
src/pages/afterService/repairManage/components/FlowRecords/index.tsx
View file @ 9fa96330
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 18:22:57
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-04 18:30:47
* @LastEditTime: 2020-12-11 17:15:08
* @Description: 内、外部流转记录
*/
import React from 'react';
......@@ -14,14 +14,10 @@ import PolymericTable from '@/components/PolymericTable';
import { EditableColumns } from '@/components/PolymericTable/interface';
import MellowCard from '@/components/MellowCard';
import StatusTag from '@/components/StatusTag';
import {
CREDIT_INNER_STATUS,
CREDIT_OUTER_STATUS,
} from '@/constants';
// import {
// CREDIT_INNER_STATUS_BADGE_MAP,
// CREDIT_OUTER_STATUS_TAG_MAP,
// } from '../../../constant';
import {
REPAIR_OUTER_STATUS_TAG_MAP,
REPAIR_INNER_STATUS_BADGE_MAP,
} from '../../../constants';
import styles from './index.less';
export interface InnerHistoryItem {
......@@ -64,10 +60,10 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
},
{
title: '状态',
dataIndex: 'status',
dataIndex: 'statusName',
align: 'center',
render: (text, record) => (
<StatusTag type="success" title="待确认售后完成" />
<StatusTag type={REPAIR_OUTER_STATUS_TAG_MAP[record.status]} title={text} />
),
},
{
......@@ -112,10 +108,10 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
},
{
title: '状态',
dataIndex: 'status',
dataIndex: 'statusName',
align: 'center',
render: (text, record) => (
<Badge color="#6C9CEB" text="待确认售后完成" />
<Badge color={REPAIR_INNER_STATUS_BADGE_MAP[record.status]} text={text} />
),
},
{
......
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @ 9fa96330
......@@ -33,8 +33,8 @@ import { EditableColumns } from '@/components/PolymericTable/interface';
import ReturnInfoDrawer, { OrderInfo } from '../../../components/ReturnInfoDrawer';
import { OuterHistoryData, InnerHistoryData } from '../../../components/FlowRecords';
import {
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
RETURN_OUTER_STATUS_TAG_MAP,
RETURN_INNER_STATUS_BADGE_MAP,
} from '../../../constants';
const OuterCirculation = React.lazy(() => import('../../../components/OuterCirculation'));
......@@ -338,10 +338,10 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<Descriptions.Item label="供应会员">{detailInfo?.supplierName}</Descriptions.Item>
<Descriptions.Item label="单据时间">{detailInfo?.applyTime}</Descriptions.Item>
<Descriptions.Item label="外部状态">
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[detailInfo?.outerStatus]} title={detailInfo?.outerStatusName} />
<StatusTag type={RETURN_OUTER_STATUS_TAG_MAP[detailInfo?.outerStatus]} title={detailInfo?.outerStatusName} />
</Descriptions.Item>
<Descriptions.Item label="内部状态">
<Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[detailInfo?.innerStatus]} text={detailInfo?.innerStatusName} />
<Badge color={RETURN_INNER_STATUS_BADGE_MAP[detailInfo?.innerStatus]} text={detailInfo?.innerStatusName} />
</Descriptions.Item>
</Descriptions>
</PageHeader>
......@@ -459,6 +459,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<FlowRecords
fetchOuterHistory={fetchOuterHistory}
fetchInnerHistory={fetchInnerHistory}
outerStatusMap={RETURN_OUTER_STATUS_TAG_MAP}
innerStatusColorMap={RETURN_INNER_STATUS_BADGE_MAP}
/>
</Suspense>
</Col>
......
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @ 9fa96330
......@@ -485,7 +485,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
returnedCount: item.returnCount || item.purchaseCount || 0, // 已退货数量
payAmount: item.payAmount,
returnCount: '',
returnAmount: '',
refundAmount: '',
extraData: {
id: item.id,
returnReason: '',
......@@ -521,7 +521,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
newData.splice(index, 1, {
...newData[index],
returnCount: values.returnCount,
returnAmount: values.returnAmount,
refundAmount: values.refundAmount,
extraData: {
...newData[index].extraData,
returnReason: values.returnReason,
......
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/schema/index.ts
View file @ 9fa96330
......@@ -283,7 +283,7 @@ export const addBillSchema: ISchema = {
title: '退货数量',
'x-component': 'Text',
},
returnAmount: {
refundAmount: {
type: 'string',
title: '退款金额',
'x-component': 'Text',
......
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @ 9fa96330
......@@ -35,9 +35,10 @@ import AuditProcess from '@/components/AuditProcess';
import { EditableColumns } from '@/components/PolymericTable/interface';
import { Values as ReturnAddressValues } from '../../../components/ReturnAddressInfo';
import ReturnInfoDrawer, { OrderInfo } from '../../../components/ReturnInfoDrawer';
import { OuterHistoryData, InnerHistoryData } from '../../../components/FlowRecords';
import {
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
RETURN_OUTER_STATUS_TAG_MAP,
RETURN_INNER_STATUS_BADGE_MAP,
} from '../../../constants';
const ProductList = React.lazy(() => import('../../../components/ProductList'));
......@@ -46,7 +47,7 @@ const ReturnDetailInfo = React.lazy(() => import('../../../components/ReturnDeta
const FileList = React.lazy(() => import('../../../components/FileList'));
const ReturnAddressInfo = React.lazy(() => import('../../../components/ReturnAddressInfo'));
const Score = React.lazy(() => import('../../../components/Score'));
const OuterCirculationRecord = React.lazy(() => import('../../../components/OuterCirculationRecord'));
const FlowRecords = React.lazy(() => import('../../../components/FlowRecords'));
interface DetailInfoProps {
// 记录id
......@@ -277,6 +278,42 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const handleReturnAddressSubmit = values => {
setReturnAddress(values);
};
const fetchOuterHistory = (params): Promise<OuterHistoryData> => {
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageOuterWorkflowRecord({
...params,
dataId: id,
})
.then(res => {
if (res.code === 1000) {
resolve(res.data);
}
reject(res);
})
.catch(err => {
reject(err);
});
});
};
const fetchInnerHistory = (params): Promise<InnerHistoryData> => {
return new Promise((resolve, reject) => {
PublicApi.getAsReturnGoodsPageInnerWorkflowRecord({
...params,
dataId: id,
})
.then(res => {
if (res.code === 1000) {
resolve(res.data);
}
reject(res);
})
.catch(err => {
reject(err);
});
});
};
// 确认退货收货
const handleReceivedConfirmReturnReceive = (id): Promise<any> => {
......@@ -338,10 +375,10 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<Descriptions.Item label="采购会员">{detailInfo?.consumerName}</Descriptions.Item>
<Descriptions.Item label="单据时间">{detailInfo?.applyTime}</Descriptions.Item>
<Descriptions.Item label="外部状态">
<StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[detailInfo?.outerStatus]} title={detailInfo?.outerStatusName} />
<StatusTag type={RETURN_OUTER_STATUS_TAG_MAP[detailInfo?.outerStatus]} title={detailInfo?.outerStatusName} />
</Descriptions.Item>
<Descriptions.Item label="内部状态">
<Badge color={EXCHANGE_INNER_STATUS_BADGE_MAP[detailInfo?.innerStatus]} text={detailInfo?.innerStatusName} />
<Badge color={RETURN_INNER_STATUS_BADGE_MAP[detailInfo?.innerStatus]} text={detailInfo?.innerStatusName} />
</Descriptions.Item>
</Descriptions>
</PageHeader>
......@@ -464,8 +501,14 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
</Col>
<Col span={24}>
{/* 内、外部流转记录 */}
<Suspense fallback={null}>
<OuterCirculationRecord dataSource={[]} />
<FlowRecords
fetchOuterHistory={fetchOuterHistory}
fetchInnerHistory={fetchInnerHistory}
outerStatusMap={RETURN_OUTER_STATUS_TAG_MAP}
innerStatusColorMap={RETURN_INNER_STATUS_BADGE_MAP}
/>
</Suspense>
</Col>
</Row>
......
src/pages/member/components/SincerityInfo/index.tsx
View file @ 9fa96330
......@@ -65,6 +65,7 @@ export interface BasicInfo {
creditTypeName: string,
remark: string,
creditPoint: number,
currentPoint: number,
}[],
loading?: boolean,
};
......@@ -554,7 +555,7 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
<ContentBox
title={item.creditTypeName}
desc={`${item.remark}（${item.creditPoint}）`}
content={item.creditPoint}
content={item.currentPoint}
extra={
<img
className={styles['tofo-item-logo']}
......
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