forked from yoone/WEB
1
0
Fork 0

Compare commits

..

No commits in common. "e5794c3d25fdab5ee2c674906ddde285478881b7" and "1843a16dd7cf315b9b7e9804cd3d58a71895efe2" have entirely different histories.

3 changed files with 10 additions and 101 deletions

View File

@ -105,16 +105,4 @@ export const ORDER_STATUS_ENUM: ProSchemaValueEnumObj = {
text: '待退款',
status: 'warning',
},
refund_requested: {
text: '已申请退款',
status: 'refund_approved',
},
refund_approved: {
text: '退款申请已通过',
status: 'refund_approved',
},
refund_cancelled: {
text: '已取消退款',
status: 'refund_cancelled',
}
};

View File

@ -27,7 +27,6 @@ import {
ordercontrollerUpdateorderitems,
} from '@/servers/api/order';
import { productcontrollerSearchproducts } from '@/servers/api/product';
import { wpproductcontrollerSearchproducts } from '@/servers/api/wpProduct';
import { sitecontrollerAll } from '@/servers/api/site';
import { stockcontrollerGetallstockpoints } from '@/servers/api/stock';
import { formatShipmentState, formatSource } from '@/utils/format';
@ -123,18 +122,6 @@ const ListPage: React.FC = () => {
key: 'pending_reshipment',
label: '待补发',
},
{
key: 'refund_requested',
label: '已申请退款',
},
{
key: 'refund_approved',
label: '退款申请已通过',
},
{
key: 'refund_cancelled',
label: '已取消退款',
},
// {
// key: 'pending_refund',
// label: '待退款',
@ -223,11 +210,6 @@ const ListPage: React.FC = () => {
title: '联系电话',
dataIndex: 'billing_phone',
render: (_, record) => record.shipping?.phone || record.billing?.phone,
},
{
title: '换货次数',
dataIndex: 'exchange_frequency',
hideInSearch: true,
},
{
title: '州',
@ -1986,20 +1968,17 @@ const SalesChange: React.FC<{
},
[],
);
// setOptions(
// data.sales?.map((item) => ({
// label: item.name,
// value: item.sku,
// })) || [],
// );
return { ...data};
return { ...data };
}}
onFinish={async (formData: any) => {
const { sales,items } = formData;
const data ={sales,items }
const res = await ordercontrollerUpdateorderitems({orderId:id}, data);
const { sales } = formData;
const res = await ordercontrollerUpdateorderitems({orderId:id}, sales);
if (!res.success) {
message.error(`更新货物信息失败: ${res.message}`);
return false;
@ -2009,63 +1988,11 @@ const SalesChange: React.FC<{
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
label="换货产品"
name="sales"
>
<ProForm.Group>
<ProFormSelect
params={{ }}
request={async ({ keyWords }) => {

View File

@ -332,10 +332,7 @@ declare namespace API {
| 'failed'
| 'after_sale_pending'
| 'pending_reshipment'
| 'pending_refund'
| 'refund_requested'
| 'refund_approved'
| 'refund_cancelled';
| 'pending_refund';
payment_method?: string;
};
@ -860,10 +857,7 @@ declare namespace API {
| 'failed'
| 'after_sale_pending'
| 'pending_reshipment'
| 'pending_refund'
| 'refund_requested'
| 'refund_approved'
| 'refund_cancelled';
| 'pending_refund';
payment_method?: string;
};