Merge branch 'dev' into 'master'

Dev

See merge request !167

src/types/api/podCnOrder.ts

@@ -11,6 +11,7 @@ export interface IconfirmSubmit {
 export interface ExportParams extends SearchForm {
 export interface ExportParams extends SearchForm {
   idList?: number[]
   idList?: number[]
   exportAll: boolean
   exportAll: boolean
+  orderTracking?: boolean
 }
 }
 export interface SearchForm {
 export interface SearchForm {
   timeType?: number | null
   timeType?: number | null

src/types/api/podUsOrder.ts

@@ -7,6 +7,7 @@ export interface ExportParams extends SearchForm {
   idList?: number[]
   idList?: number[]
   exportAll: boolean
   exportAll: boolean
   status?: string
   status?: string
+  orderTracking?: boolean
 }
 }
 
 
 export interface SearchForm {
 export interface SearchForm {

src/views/order/orderTracking/index.vue

@@ -411,6 +411,7 @@ const submitExportForm = async () => {
   const params: ExportParams = {
   const params: ExportParams = {
     exportAll: false,
     exportAll: false,
     idList: [],
     idList: [],
+    orderTracking: true,
   }
   }
   // 使用函数封装映射逻辑
   // 使用函数封装映射逻辑
   const mapIds = (items: PodUsOrderListData[]) =>
   const mapIds = (items: PodUsOrderListData[]) =>

src/views/order/orderTracking/indexcn.vue

@@ -440,6 +440,7 @@ const submitExportForm = async () => {
   const params: ExportParams = {
   const params: ExportParams = {
     exportAll: false,
     exportAll: false,
     idList: [],
     idList: [],
+    orderTracking: true,
   }
   }
   // 使用函数封装映射逻辑
   // 使用函数封装映射逻辑
   const mapIds = (items: PodCnOrderListData[]) =>
   const mapIds = (items: PodCnOrderListData[]) =>