Skip to content

J
jinfa-admin
Commit 14927c2d authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

chore: 修改类型

parent ffef2c70
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 100 deletions
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @ 14927c2d
......@@ -32,7 +32,7 @@ import AvatarWrap from '@/components/AvatarWrap';
import StatusTag from '@/components/StatusTag';
import AuditProcess from '@/components/AuditProcess';
import { EditableColumns } from '@/components/PolymericTable/interface';
import ReturnInfoDrawer, { OrderInfo } from '../ReturnInfoDrawer';
import ReturnInfoDrawer, { OrderInfoType } from '../ReturnInfoDrawer';
import { OuterHistoryData } from '../FlowRecords';
import {
RETURN_OUTER_STATUS_TAG_MAP,
......@@ -77,7 +77,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
const [returnGoodsLoading, setReturnGoodsLoading] = useState(false);
const [infoLoading, setInfoloading] = useState(false);
const [visibleOrderDetial, setVisibleReturnInfo] = useState<boolean>(false);
const [orderInfo, setOrderInfo] = useState<OrderInfo>({});
const [orderInfo, setOrderInfo] = useState<OrderInfoType>({});
const handleCheckOrderDetial = record => {
setOrderInfo({
......@@ -399,7 +399,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
>
<Col span={detailInfo && detailInfo.outerStatus === RETURN_OUTER_STATUS_FINISHED ? 6 : 9}>
<Suspense fallback={null}>
<FileList fileList={detailInfo?.fileList} />
<FileList fileList={detailInfo?.faultFileList} />
</Suspense>
</Col>
......
src/pages/afterService/returnManage/components/ReturnAnalysis/index.tsx
View file @ 14927c2d
......@@ -7,7 +7,7 @@
*/
import React, { useState } from 'react';
import { Tabs, Row, Col, Descriptions, Badge, Radio, Modal, RadioChangeEvent } from 'antd';
import { SummaryData, Detailed } from './interface';
import { ReturnStatisticsListItem, ReturnDeliveryGoodsListItem } from './interface';
import MellowCard from '@/components/MellowCard';
import { EditableColumns } from '@/components/PolymericTable/interface';
import PolymericTable from '@/components/PolymericTable';
......@@ -19,12 +19,12 @@ interface ReturnInfoProps {
/**
* 退货收货统计
*/
summary: SummaryData[],
summary: ReturnStatisticsListItem[],
/**
* 退货发货明细
*/
detailed: Detailed[],
detailed: ReturnDeliveryGoodsListItem[],
/**
* 是否是采购商
......
src/pages/afterService/returnManage/components/ReturnAnalysis/interface.d.ts
View file @ 14927c2d
/*
* @Author: XieZhiXiong
* @Date: 2020-11-30 18:44:40
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-30 18:44:41
* @Description:
*/
export interface SummaryData {
export type ReturnStatisticsListItem = {
/**
* 订单号
*/
......@@ -13,7 +6,7 @@ export interface SummaryData {
/**
* 商品id
*/
productId: number
productId: string
/**
* 商品名称
*/
......@@ -39,7 +32,7 @@ export interface SummaryData {
*/
deliveryCount: number
/**
* 未退货发货数量,(未退货发货=换货数量-已退货发货)
* 未退货发货数量,(未退货发货=退货数量-已退货发货)
*/
unDeliveryCount: number
/**
......@@ -52,7 +45,91 @@ export interface SummaryData {
differenceCount: number
}
export interface Detailed {
export type ReturnDeliveryGoodsDetailListItem = {
/**
* 订单id
*/
orderId?: number
/**
* 订单号
*/
orderNo?: string
/**
* 商品id
*/
productId?: string
/**
* 商品名称
*/
productName?: string
/**
* 品类
*/
category?: string
/**
* 品牌
*/
brand?: string
/**
* 单位
*/
unit?: string
/**
* 数量
*/
count?: number
/**
* 发货数量
*/
deliveryCount?: number
/**
* 入库数量
*/
storageCount?: number
/**
* 差异数量,(差异数量=发货数量-入库数量)
*/
differenceCount?: number
/**
* 关联商品. ,AssociatedProductVO
*/
associatedProductVO?: {
/**
* id
*/
id?: number
/**
* 商品ID
*/
productId?: string
/**
* 商品名称、规格
*/
productName?: string
/**
* 规格
*/
type?: string
/**
* 品类
*/
category?: string
/**
* 品牌
*/
brand?: string
/**
* 单位
*/
unit?: string
}
/**
* 商品图片.
*/
skuPic?: string
}
export type ReturnDeliveryGoodsListItem = {
/**
* 发货Id
*/
......@@ -62,6 +139,10 @@ export interface Detailed {
*/
batch: number
/**
* 发货单Id
*/
deliveryNoId: number
/**
* 发货单号
*/
deliveryNo: string
......@@ -70,6 +151,10 @@ export interface Detailed {
*/
deliveryTime: string
/**
* 物流id
*/
logisticsId: number
/**
* 物流单号
*/
logisticsOrderNo: string
......@@ -78,15 +163,35 @@ export interface Detailed {
*/
logisticsName: string
/**
* 物流收货地址
*/
logisticsReceiveAddress: string
/**
* 物流收货地址id
*/
logisticsReceiveAddressId: number
/**
* 发货方地址id
*/
shipperAddressId: number
/**
* 发货方地址
*/
shipperFullAddress: string
/**
* 入库单号
*/
storageNo: string
/**
* 入库单号
*/
storageId: number
/**
* 入库时间（yyyy-MM-ddHH:mm）
*/
storageTime: string
/**
* 内部状态
* 内部状态:未确认发货-1,已确认发货-2,已确认收货-3,确认回单-4
*/
innerStatus: number
/**
......@@ -96,46 +201,5 @@ export interface Detailed {
/**
* 发货明细 ,DeliveryGoodsDetailVO
*/
detailList: {
/**
* 订单号
*/
orderNo?: string
/**
* 商品id
*/
productId?: number
/**
* 商品名称
*/
productName?: string
/**
* 品类
*/
category?: string
/**
* 品牌
*/
brand?: string
/**
* 单位
*/
unit?: string
/**
* 数量
*/
count?: number
/**
* 发货数量
*/
deliveryCount?: number
/**
* 入库数量
*/
storageCount?: number
/**
* 差异数量,(差异数量=发货数量-入库数量)
*/
differenceCount?: number
}[]
detailList: ReturnDeliveryGoodsDetailListItem[]
}
\ No newline at end of file
src/pages/afterService/returnManage/components/ReturnInfoDrawer/index.tsx
View file @ 14927c2d
......@@ -6,7 +6,7 @@
* @Description: 查看退货数量与退款金额 抽屉
*/
import React from 'react';
import { Drawer, Button } from 'antd';
import { Drawer, Button, Space } from 'antd';
import NiceForm from '@/components/NiceForm';
import { createAsyncFormActions } from '@formily/antd';
import schema from './schema';
......@@ -16,42 +16,62 @@ import SteamerTicket from './components/SteamerTicket';
const schemaAction = createAsyncFormActions();
export interface PayListItem {
export interface PayListItemType {
/**
* 支付id
*/
payId: number
/**
* 支付外部状态：1.待支付2.待确认支付结果3.确认到账4.确认未到账
*/
externalState: number
/**
* 支付次数
*/
payCount: number,
payCount: number
/**
* 支付环节
*/
payNode: string,
payNode: string
/**
* 支付比例
*/
payRatio: number,
payRatio: number
/**
* 支付金额
*/
payAmount: number,
payAmount: number
/**
* 支付方式：1.线上支付2.线下支付3.授信额度支付4.货到付款支付
*/
payWay: number
/**
* 支付方式
* 支付方式名称
*/
payWay: string,
payWayName: string
/**
* 支付渠道
* 支付渠道：0.积分支付1.支付宝2.微信3.银联4.余额支付5.线下支付线上确认6.授信额度支付7.货到付款
*/
channel: string,
channel: number
/**
* 支付时间
* 支付渠道名称
*/
payTime: string,
channelName: string
/**
* 支付时间(yyyy-MM-ddHH:mm)
*/
payTime: string
/**
* 退款金额
*/
refundAmount: number,
refundAmount: number
/**
* 交易支付id
*/
transactionPayId: string
};
export interface OrderInfo {
export interface OrderInfoType {
/**
* 列表索引
*/
......@@ -79,19 +99,19 @@ export interface OrderInfo {
/**
* 采购数量
*/
purchaseCount: string;
purchaseCount: number;
/**
* 采购单价
*/
purchasePrice: string;
purchasePrice: number;
/**
* 采购金额
*/
purchaseAmount: string;
purchaseAmount: number;
/**
* 支付记录
*/
payList: PayListItem[];
payList: PayListItemType[];
/**
* 退款数量
*/
......@@ -108,7 +128,7 @@ export interface OrderInfo {
interface ReturnInfoDrawerProps {
visible: boolean;
orderInfo: OrderInfo;
orderInfo: OrderInfoType;
onClose: () => void;
onSubmit?: (values: { [key: string]: any }) => void;
/**
......@@ -118,11 +138,11 @@ interface ReturnInfoDrawerProps {
};
const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
visible = false,
orderInfo = {},
onClose,
onSubmit,
isEdit = false,
visible = false,
orderInfo = {},
onClose,
onSubmit,
isEdit = false,
}) => {
const handleClose = () => {
......@@ -130,7 +150,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
onClose();
}
};
const handleSubmit = values => {
if (onSubmit) {
onSubmit(values);
......@@ -153,30 +173,31 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
textAlign: 'right',
}}
>
<Button
onClick={handleClose}
style={{ marginRight: 8 }}
>
{onSubmit ? '取消' : '关闭'}
</Button>
{onSubmit && (
<Button
onClick={() => schemaAction.submit()}
type="primary"
<Space>
<Button
onClick={handleClose}
>
确定
{onSubmit ? '取消' : '关闭'}
</Button>
)}
{onSubmit && (
<Button
onClick={() => schemaAction.submit()}
type="primary"
>
确定
</Button>
)}
</Space>
</div>
}
destroyOnClose
>
<NiceForm
<NiceForm
initialValues={orderInfo}
previewPlaceholder=" "
components={{
Stamp,
SteamerTicket,
Stamp,
SteamerTicket,
}}
editable={isEdit}
effects={($, actions) => {
......
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