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

src/api/podCnOrder.ts

@@ -127,6 +127,7 @@ export function getOrderList(
   params: SearchForm,
   currentPage: number,
   pageSize: number,
+  orderTracking?: boolean,
 ) {
   return axios.post<never, BasePaginationData<PodCnOrderListData[]>>(
     '/factory/podJomallOrderCn/list_page',
@@ -134,6 +135,7 @@ export function getOrderList(
       ...params,
       currentPage,
       pageSize,
+      orderTracking,
     },
   )
 }

src/api/podUsOrder.ts

@@ -55,6 +55,7 @@ export function getOrderList(
   params: SearchForm,
   currentPage: number,
   pageSize: number,
+  orderTracking?: boolean,
 ) {
   return axios.post<never, BasePaginationData<PodUsOrderListData>>(
     '/factory/podJomallOrderUs/list_page',
@@ -62,6 +63,7 @@ export function getOrderList(
       ...params,
       currentPage,
       pageSize,
+      orderTracking,
     },
   )
 }
@@ -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>>(
     'factory/podJomallOrderUs/delPodBoxOrderDetails',
     {
-      params: { warehouseId,factoryNo },
+      params: { warehouseId, factoryNo },
     },
   )
 }

src/views/order/orderTracking/index.vue

@@ -2,6 +2,8 @@
 defineOptions({
   name: 'OrderTracking',
 })
+import { WarningFilled } from '@element-plus/icons-vue'
+
 import LogisticsWaySelect from '../../logistics/components/LogisticsWaySelect.tsx'
 import {
   factoryWarehouseInfo,
@@ -75,6 +77,7 @@ const tableColumns = computed(() => {
       prop: 'factoryOrderNumber',
       width: 160,
       align: 'center',
+      slot: 'factoryOrderNumber',
     },
     {
       label: '第三方订单号',
@@ -549,6 +552,7 @@ const getOrderListFn = async () => {
       },
       currentPage,
       pageSize,
+      true,
     )
     tableData.value = data.records
     pagination.value.total = data.total
@@ -1136,6 +1140,28 @@ onMounted(() => {
                   @row-click="rowClick"
                   @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 }">
                     <div>{{ getStatus(row.status) }}</div>
                   </template>

src/views/order/orderTracking/indexcn.vue

 <script setup lang="ts">
 import { OrderCnReceiverAddress } from '@/api/podUsOrder.ts'
+import { WarningFilled } from '@element-plus/icons-vue'
 
 defineOptions({
   name: 'OrderTracking',
@@ -76,6 +77,7 @@ const tableColumns = computed(() => {
       prop: 'factoryOrderNumber',
       width: 160,
       align: 'center',
+      slot: 'factoryOrderNumber',
     },
     {
       label: '第三方订单号',
@@ -568,6 +570,7 @@ const getOrderListFn = async () => {
       },
       currentPage,
       pageSize,
+      true,
     )
     tableData.value = data.records.flat()
     pagination.value.total = data.total
@@ -1226,6 +1229,28 @@ onMounted(() => {
                   @row-click="rowClick"
                   @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 }">
                     <div>{{ getStatus(row.status) }}</div>
                   </template>