Compare commits
No commits in common. "4d3abcd13f7c86edfdb04bc90cfcd3def94d6553" and "4da8fbfdc83bfbe6327df6446a5b12988acd1afb" have entirely different histories.
4d3abcd13f
...
4da8fbfdc8
|
|
@ -1,6 +1,4 @@
|
|||
import { logisticscontrollerGetlist, logisticscontrollerGetShipmentLabel,
|
||||
logisticscontrollerDeleteShipment
|
||||
} from '@/servers/api/logistics';
|
||||
import { logisticscontrollerGetlist, logisticscontrollerGetShipmentLabel } from '@/servers/api/logistics';
|
||||
import { stockcontrollerGetallstockpoints } from '@/servers/api/stock';
|
||||
import { formatShipmentState } from '@/utils/format';
|
||||
import { printPDF } from '@/utils/util';
|
||||
|
|
@ -11,7 +9,7 @@ import {
|
|||
ProColumns,
|
||||
ProTable,
|
||||
} from '@ant-design/pro-components';
|
||||
import { App, Button, Divider } from 'antd';
|
||||
import { App, Button } from 'antd';
|
||||
import { useRef, useState } from 'react';
|
||||
|
||||
const ListPage: React.FC = () => {
|
||||
|
|
@ -79,7 +77,6 @@ const ListPage: React.FC = () => {
|
|||
hideInSearch: true,
|
||||
render(_, record) {
|
||||
return (
|
||||
<>
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={async () => {
|
||||
|
|
@ -90,17 +87,6 @@ const ListPage: React.FC = () => {
|
|||
>
|
||||
Label
|
||||
</Button>
|
||||
<Divider type="vertical" />
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={async () => {
|
||||
const { data } = await logisticscontrollerDeleteShipment(record.id);
|
||||
console.log('data', data);// todo 刷新页面
|
||||
}}
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
</>
|
||||
);
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import InternationalPhoneInput from '@/components/InternationalPhoneInput';
|
||||
import { HistoryOrder } from '@/pages/Statistics/Order';
|
||||
import { ORDER_STATUS_ENUM } from '@/constants';
|
||||
import {
|
||||
logisticscontrollerCreateshipment,
|
||||
|
|
@ -311,14 +310,6 @@ const ListPage: React.FC = () => {
|
|||
: 'block',
|
||||
},
|
||||
},
|
||||
{
|
||||
key: 'history',
|
||||
label:
|
||||
<HistoryOrder
|
||||
email={record.customer_email}
|
||||
tableRef={actionRef}
|
||||
/>,
|
||||
},
|
||||
{
|
||||
key: 'note',
|
||||
label: <OrderNote id={record.id as number} />,
|
||||
|
|
|
|||
|
|
@ -48,20 +48,6 @@ export async function logisticscontrollerGetShipmentLabel(
|
|||
}
|
||||
});
|
||||
}
|
||||
/** 此处后端没有提供注释 DEL /logistics/deleteShipment/${param0} */
|
||||
export async function logisticscontrollerDeleteShipment(
|
||||
shipmentId: number
|
||||
) {
|
||||
return request<API.BooleanRes>(`/logistics/deleteShipment/${shipmentId}`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/** 此处后端没有提供注释 POST /logistics/createShippingAddress */
|
||||
export async function logisticscontrollerCreateshippingaddress(
|
||||
|
|
|
|||
Loading…
Reference in New Issue