Skip to content

F
factory_front
Commit fc14f49b by wusiyi
Options

feat: 订单跟踪添加拦截展示

parent 1d1e87fe
Showing with 57 additions and 2 deletions
src/api/podCnOrder.ts
...@@ -127,6 +127,7 @@ export function getOrderList( ...@@ -127,6 +127,7 @@ export function getOrderList(
params: SearchForm, params: SearchForm,
currentPage: number, currentPage: number,
pageSize: number, pageSize: number,
orderTracking?: boolean,
) { ) {
return axios.post<never, BasePaginationData<PodCnOrderListData[]>>( return axios.post<never, BasePaginationData<PodCnOrderListData[]>>(
'/factory/podJomallOrderCn/list_page', '/factory/podJomallOrderCn/list_page',
...@@ -134,6 +135,7 @@ export function getOrderList( ...@@ -134,6 +135,7 @@ export function getOrderList(
...params, ...params,
currentPage, currentPage,
pageSize, pageSize,
orderTracking,
}, },
) )
} }
......
src/api/podUsOrder.ts
...@@ -55,6 +55,7 @@ export function getOrderList( ...@@ -55,6 +55,7 @@ export function getOrderList(
params: SearchForm, params: SearchForm,
currentPage: number, currentPage: number,
pageSize: number, pageSize: number,
orderTracking?: boolean,
) { ) {
return axios.post<never, BasePaginationData<PodUsOrderListData>>( return axios.post<never, BasePaginationData<PodUsOrderListData>>(
'/factory/podJomallOrderUs/list_page', '/factory/podJomallOrderUs/list_page',
...@@ -62,6 +63,7 @@ export function getOrderList( ...@@ -62,6 +63,7 @@ export function getOrderList(
...params, ...params,
currentPage, currentPage,
pageSize, pageSize,
orderTracking,
}, },
) )
} }
...@@ -284,11 +286,11 @@ export function clearBoxApi( ...@@ -284,11 +286,11 @@ export function clearBoxApi(
}, },
) )
} }
export function clearAllBoxApi(warehouseId: string | number,factoryNo: string | number | undefined) { export function clearAllBoxApi(warehouseId: string | number, factoryNo: string | number | undefined) {
return axios.get<never, BaseRespData<never>>( return axios.get<never, BaseRespData<never>>(
'factory/podJomallOrderUs/delPodBoxOrderDetails', 'factory/podJomallOrderUs/delPodBoxOrderDetails',
{ {
params: { warehouseId,factoryNo }, params: { warehouseId, factoryNo },
}, },
) )
} }
......
src/views/order/orderTracking/index.vue
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
defineOptions({ defineOptions({
name: 'OrderTracking', name: 'OrderTracking',
}) })
import { WarningFilled } from '@element-plus/icons-vue'
import LogisticsWaySelect from '../../logistics/components/LogisticsWaySelect.tsx' import LogisticsWaySelect from '../../logistics/components/LogisticsWaySelect.tsx'
import { import {
factoryWarehouseInfo, factoryWarehouseInfo,
...@@ -75,6 +77,7 @@ const tableColumns = computed(() => { ...@@ -75,6 +77,7 @@ const tableColumns = computed(() => {
prop: 'factoryOrderNumber', prop: 'factoryOrderNumber',
width: 160, width: 160,
align: 'center', align: 'center',
slot: 'factoryOrderNumber',
}, },
{ {
label: '第三方订单号', label: '第三方订单号',
...@@ -549,6 +552,7 @@ const getOrderListFn = async () => { ...@@ -549,6 +552,7 @@ const getOrderListFn = async () => {
}, },
currentPage, currentPage,
pageSize, pageSize,
true,
) )
tableData.value = data.records tableData.value = data.records
pagination.value.total = data.total pagination.value.total = data.total
...@@ -1136,6 +1140,28 @@ onMounted(() => { ...@@ -1136,6 +1140,28 @@ onMounted(() => {
@row-click="rowClick" @row-click="rowClick"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<template #factoryOrderNumber="{ row }">
<div style="display: flex; align-items: center">
{{ row.factoryOrderNumber }}
<el-tooltip
effect="light"
content="该订单已拦截"
placement="bottom"
>
<el-icon
v-if="
row.interceptStatus !== null &&
(row.interceptStatus === 1 ||
row.interceptStatus === 3)
"
style="margin-left: 5px; cursor: pointer"
color="#E6A23C"
>
<WarningFilled />
</el-icon>
</el-tooltip>
</div>
</template>
<template #status="{ row }"> <template #status="{ row }">
<div>{{ getStatus(row.status) }}</div> <div>{{ getStatus(row.status) }}</div>
</template> </template>
......
src/views/order/orderTracking/indexcn.vue
<script setup lang="ts"> <script setup lang="ts">
import { OrderCnReceiverAddress } from '@/api/podUsOrder.ts' import { OrderCnReceiverAddress } from '@/api/podUsOrder.ts'
import { WarningFilled } from '@element-plus/icons-vue'
defineOptions({ defineOptions({
name: 'OrderTracking', name: 'OrderTracking',
...@@ -76,6 +77,7 @@ const tableColumns = computed(() => { ...@@ -76,6 +77,7 @@ const tableColumns = computed(() => {
prop: 'factoryOrderNumber', prop: 'factoryOrderNumber',
width: 160, width: 160,
align: 'center', align: 'center',
slot: 'factoryOrderNumber',
}, },
{ {
label: '第三方订单号', label: '第三方订单号',
...@@ -568,6 +570,7 @@ const getOrderListFn = async () => { ...@@ -568,6 +570,7 @@ const getOrderListFn = async () => {
}, },
currentPage, currentPage,
pageSize, pageSize,
true,
) )
tableData.value = data.records.flat() tableData.value = data.records.flat()
pagination.value.total = data.total pagination.value.total = data.total
...@@ -1226,6 +1229,28 @@ onMounted(() => { ...@@ -1226,6 +1229,28 @@ onMounted(() => {
@row-click="rowClick" @row-click="rowClick"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<template #factoryOrderNumber="{ row }">
<div style="display: flex; align-items: center">
{{ row.factoryOrderNumber }}
<el-tooltip
effect="light"
content="该订单已拦截"
placement="bottom"
>
<el-icon
v-if="
row.interceptStatus &&
(row.interceptStatus === 1 ||
row.interceptStatus === 3)
"
style="margin-left: 5px; cursor: pointer"
color="#E6A23C"
>
<WarningFilled />
</el-icon>
</el-tooltip>
</div>
</template>
<template #status="{ row }"> <template #status="{ row }">
<div>{{ getStatus(row.status) }}</div> <div>{{ getStatus(row.status) }}</div>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment