Compare commits

...

3 Commits
main ... div

Author SHA1 Message Date
zhuotianyuan 84ec4f5895 fix(订单列表): 将默认发货平台从uniuni改为freightwaves 2026-01-21 16:16:34 +08:00
zhuotianyuan 82e0df6d43 feat(订单列表): 添加发货平台选择功能
在发货弹窗中新增发货平台选择字段,默认值为uniuni,并添加必填校验规则
2026-01-21 16:12:12 +08:00
黄珑 2245c71702 Fix: 显示sitename错误临时补丁 2025-12-30 18:14:53 +08:00
1 changed files with 31 additions and 1 deletions

View File

@ -83,6 +83,7 @@ import Item from 'antd/es/list/Item';
import RelatedOrders from '../../Subscription/Orders/RelatedOrders';
import React, { useMemo, useRef, useState } from 'react';
import { printPDF } from '@/utils/util';
import dayjs from 'dayjs';
const ListPage: React.FC = () => {
const actionRef = useRef<ActionType>();
@ -195,6 +196,19 @@ const ListPage: React.FC = () => {
value: item.id,
}));
},
render: (_, record) => {
const siteNameArr = {
1: 'Togovape',
2: 'CanPouches',
3: 'ZYN-Pouches',
4: 'Togopouches',
5: 'Yoonepouches',
6: 'CanPouches_co',
7: 'Canadapouch',
8: 'Zoltpouches'
};
return siteNameArr[record.siteId];
}
},
{
title: '订单包含',
@ -1183,7 +1197,10 @@ const Shipping: React.FC<{
const [rates, setRates] = useState<API.RateDTO[]>([]);
const [ratesLoading, setRatesLoading] = useState(false);
const { message } = App.useApp();
const [shipmentPlatforms, setShipmentPlatforms] = useState([
{ label: 'uniuni', value: 'uniuni' },
{ label: 'tms.freightwaves', value: 'freightwaves' },
]);
return (
<ModalForm
formRef={formRef}
@ -1234,6 +1251,7 @@ const Shipping: React.FC<{
let shipmentInfo = localStorage.getItem('shipmentInfo');
if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
return {
shipmentPlatform: 'freightwaves',
...data,
// payment_method_id: shipmentInfo?.payment_method_id,
stockPointId: shipmentInfo?.stockPointId,
@ -1347,6 +1365,18 @@ const Shipping: React.FC<{
}
}}
>
<Row gutter={16}>
<Col span={8}>
<ProFormSelect
name="shipmentPlatform"
label="发货平台"
options={shipmentPlatforms}
placeholder="请选择发货平台"
rules={[{ required: true, message: '请选择一个选项' }]}
/>
</Col>
</Row>
<ProFormText
label="订单号"
readonly