refactor(Order/List): 更新退款相关状态标签为更简洁的表达 #26

Merged
longbot merged 9 commits from zksu/WEB:main into main 2025-10-14 06:54:24 +00:00
1 changed files with 74 additions and 14 deletions
Showing only changes of commit 36c470a5b3 - Show all commits

View File

@ -27,6 +27,7 @@ import {
ordercontrollerUpdateorderitems, ordercontrollerUpdateorderitems,
} from '@/servers/api/order'; } from '@/servers/api/order';
import { productcontrollerSearchproducts } from '@/servers/api/product'; import { productcontrollerSearchproducts } from '@/servers/api/product';
import { wpproductcontrollerSearchproducts } from '@/servers/api/wpProduct';
import { sitecontrollerAll } from '@/servers/api/site'; import { sitecontrollerAll } from '@/servers/api/site';
import { stockcontrollerGetallstockpoints } from '@/servers/api/stock'; import { stockcontrollerGetallstockpoints } from '@/servers/api/stock';
import { formatShipmentState, formatSource } from '@/utils/format'; import { formatShipmentState, formatSource } from '@/utils/format';
@ -224,6 +225,11 @@ const ListPage: React.FC = () => {
title: '联系电话', title: '联系电话',
dataIndex: 'billing_phone', dataIndex: 'billing_phone',
render: (_, record) => record.shipping?.phone || record.billing?.phone, render: (_, record) => record.shipping?.phone || record.billing?.phone,
},
{
title: '换货次数',
dataIndex: 'exchange_frequency',
hideInSearch: true,
}, },
{ {
title: '州', title: '州',
@ -765,17 +771,16 @@ const Detail: React.FC<{
valueEnum={ORDER_STATUS_ENUM} valueEnum={ORDER_STATUS_ENUM}
/> />
<ProDescriptions.Item label="金额" dataIndex="total" /> <ProDescriptions.Item label="金额" dataIndex="total" />
<ProDescriptions.Item label="客户邮箱" dataIndex="customer_email" /> <ProDescriptions.Item label="客户邮箱" dataIndex="customer_email" />
<ProDescriptions.Item label="联系电话" span={3} <ProDescriptions.Item label="联系电话" span={3}
render={(_, record) => { render={(_, record) => { return (
return ( <div>
<div> <span>
<span> {record?.shipping?.phone || record?.billing?.phone || '-'}
{record?.shipping?.phone || record?.billing?.phone || '-'} </span>
</span> </div>
</div> );
); }} />
}} />
<ProDescriptions.Item label="交易Id" dataIndex="transaction_id" /> <ProDescriptions.Item label="交易Id" dataIndex="transaction_id" />
<ProDescriptions.Item label="IP" dataIndex="customer_id_address" /> <ProDescriptions.Item label="IP" dataIndex="customer_id_address" />
<ProDescriptions.Item label="设备" dataIndex="device_type" /> <ProDescriptions.Item label="设备" dataIndex="device_type" />
@ -1983,17 +1988,20 @@ const SalesChange: React.FC<{
}, },
[], [],
); );
// setOptions( // setOptions(
// data.sales?.map((item) => ({ // data.sales?.map((item) => ({
// label: item.name, // label: item.name,
// value: item.sku, // value: item.sku,
// })) || [], // })) || [],
// ); // );
return { ...data }; return { ...data};
}} }}
onFinish={async (formData: any) => { onFinish={async (formData: any) => {
const { sales } = formData; const { sales,items } = formData;
const res = await ordercontrollerUpdateorderitems({ orderId: id }, sales); const data ={sales,items }
const res = await ordercontrollerUpdateorderitems({orderId:id}, data);
if (!res.success) { if (!res.success) {
message.error(`更新货物信息失败: ${res.message}`); message.error(`更新货物信息失败: ${res.message}`);
return false; return false;
@ -2003,11 +2011,63 @@ const SalesChange: React.FC<{
return true; return true;
}} }}
> >
<ProFormList
label="换货订单"
name="items"
>
<ProForm.Group>
<ProFormSelect
params={{ }}
request={async ({ keyWords }) => {
try {
const { data } = await wpproductcontrollerSearchproducts({
name: keyWords,
});
return (
data?.map((item) => {
return {
label: `${item.name}`,
value: item?.sku,
};
})
);
} catch (error) {
return [];
}
}}
name="sku"
label="订单"
placeholder="请选择订单"
tooltip="至少输入3个字符"
fieldProps={{
showSearch: true,
filterOption: false,
}}
debounceTime={300} // 防抖,减少请求频率
rules={[{ required: true, message: '请选择订单' }]}
/>
<ProFormDigit
name="quantity"
colProps={{ span: 12 }}
label="订单数量"
placeholder="请输入数量"
rules={[{ required: true, message: '请输入数量' }]}
fieldProps={{
precision: 0,
}}
/>
</ProForm.Group>
</ProFormList>
<ProFormList <ProFormList
label="换货产品" label="换货产品"
name="sales" name="sales"
> >
<ProForm.Group> <ProForm.Group>
<ProFormSelect <ProFormSelect
params={{}} params={{}}
request={async ({ keyWords }) => { request={async ({ keyWords }) => {