Merge branch 'linjinhong' of http://47.122.114.111:9999/qinjianhui/factory_front into linjinhong

src/api/podUsOrder.ts

@@ -8,7 +8,7 @@ import {
   ProductionClient,
   ProductionClient,
   WarehouseListData,
   WarehouseListData,
   LogisticsData,
   LogisticsData,
-  ExportParams
+  ExportParams,
 } from '@/types/api/podUsOrder'
 } from '@/types/api/podUsOrder'
 import axios from './axios'
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
@@ -338,7 +338,7 @@ export function createLogisticsOrderApi(params: {
   )
   )
 }
 }
 
 
-// 创建物流
+// 物流面单上传
 export function uploadExpressSheet(params: {
 export function uploadExpressSheet(params: {
   trackingNumber: string
   trackingNumber: string
   file: File
   file: File
@@ -347,7 +347,8 @@ export function uploadExpressSheet(params: {
     'factory/podJomallOrderUs/uploadExpressSheet',
     'factory/podJomallOrderUs/uploadExpressSheet',
     params,
     params,
   )
   )
-} // 创建物流
+}
+// 更新物流信息确认
 export function updateSelfLogistics(params: {
 export function updateSelfLogistics(params: {
   trackingNumber: string
   trackingNumber: string
   expressSheet: string
   expressSheet: string

src/views/order/orderTracking/index.vue

@@ -372,15 +372,13 @@ const getWeekRange = (weeks = 0, type: 'past' | 'future' = 'past') => {
   return [start.startOf('week').toDate(), start.endOf('week').toDate()]
   return [start.startOf('week').toDate(), start.endOf('week').toDate()]
 }
 }
 
 
-async function getData() {}
-
 const handleSizeChange = (pageSize: number) => {
 const handleSizeChange = (pageSize: number) => {
   pagination.value.pageSize = pageSize
   pagination.value.pageSize = pageSize
-  getData()
+  getOrderListFn()
 }
 }
 const handleCurrentChange = (currentPage: number) => {
 const handleCurrentChange = (currentPage: number) => {
   pagination.value.currentPage = currentPage
   pagination.value.currentPage = currentPage
-  getData()
+  getOrderListFn()
 }
 }
 
 
 const productionClient = ref<ProductionClient[]>()
 const productionClient = ref<ProductionClient[]>()
@@ -508,7 +506,7 @@ const resultInfo = ref<
 const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
 const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
 
 
 /**
 /**
- * @description: 创建物流、获取跟踪号、获取打印面单、更改物流、取消物流订单
+ * @description: 获取打印面单
  */
  */
 
 
 const getOrderByIdApi = async (type: string) => {
 const getOrderByIdApi = async (type: string) => {
@@ -593,7 +591,6 @@ loadTabData()
 loadProductionClient()
 loadProductionClient()
 getUserMark()
 getUserMark()
 loadCraftList()
 loadCraftList()
-getData()
 getWarehouse()
 getWarehouse()
 
 
 onMounted(() => {
 onMounted(() => {