提交 07829189 作者: 龚洪江

修复:意向订单流程操作问题

上级 339bccf8
import { FC, useState } from 'react';
import {
Form,
Modal,
ModalProps,
Radio,
Image,
Row,
Col,
Input,
RadioChangeEvent,
message,
} from 'antd';
import { Form, Modal, ModalProps, Radio, Image, Input, RadioChangeEvent, message } from 'antd';
import './index.scss';
import { OrderManageAPI } from '~/api';
......
import { FC, useEffect, useState } from 'react';
import { Cascader, Form, Input, message, Modal, ModalProps, Select } from 'antd';
import { OrderManageAPI } from '~/api';
import { InterListType, InterReqType } from '~/api/interface';
import { mallOrderListType, mallOrderSendType } from '~/api/interface/orderManageType';
import { InterReqType } from '~/api/interface';
import { mallOrderSendType } from '~/api/interface/orderManageType';
import regionData from '~/assets/json/district.json';
type mallOrderType = InterListType<mallOrderListType>[0];
// 发货请求类型
type sendMallType = Omit<Exclude<InterReqType<mallOrderSendType>, undefined>, 'takeRegion'> & {
takeRegion: string[];
......
......@@ -24,6 +24,7 @@ import { decode } from 'js-base64';
import { UploadFile } from 'antd/es/upload/interface';
import { uploadContractType, userFddInfoType } from '~/api/interface/fddInterfaceType';
import { useNavigate } from 'react-router-dom';
import dayjs from 'dayjs';
// 商城订单对象类型
type mallOrderItemType = InterListType<mallOrderListType>[0];
......@@ -187,6 +188,7 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem
id: orderItem.id,
orderAmount: type === 1 ? undefined : values[0].orderTotalAmount,
orderTotalAmount: type === 1 ? values[0].orderTotalAmount : undefined,
deliveryTime: dayjs(values[0].deliveryTime).format('YYYY-MM-DD'),
}).then(({ code, message: msg }) => {
if (code === '200') {
message.success('确认订单成功');
......
......@@ -16,6 +16,7 @@ import { filterObjAttr } from '~/utils';
import './index.scss';
import qs from 'query-string';
import { useSelector } from 'react-redux';
import dayjs from 'dayjs';
// 表格数据类型
type TableType = InterListType<mallOrderListType>;
......@@ -346,7 +347,7 @@ function ProductOrderView() {
title: '订单交期',
dataIndex: 'deliveryTime',
align: 'center',
render: (text: string) => <TableItem tr={<div>{text}</div>} />,
render: (text: string) => <TableItem tr={<div>{dayjs(text).format('YYYY-MM-DD')}</div>} />,
},
{
title: '备注',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论