Merge branch 'master' of 47.122.114.111:qinjianhui/factory_front

src/views/order/orderTracking/index.vue

@@ -286,7 +286,7 @@ const goodsColumns = computed(() => {
     },
     },
   ]
   ]
 })
 })
-const tableData = ref<PodUsOrderListData[][]>([])
+const tableData = ref<PodUsOrderListData[]>([])
 const goodsData = ref<ProductList[]>([])
 const goodsData = ref<ProductList[]>([])
 const searchVisible = ref(false)
 const searchVisible = ref(false)
 const goodsLoading = ref(false)
 const goodsLoading = ref(false)
@@ -393,16 +393,16 @@ const submitExportForm = async () => {
     idList: [],
     idList: [],
   }
   }
   // 使用函数封装映射逻辑
   // 使用函数封装映射逻辑
-  const mapIds = (items: PodUsOrderListData[][] | PodUsOrderListData[]) => {
-    // 如果是二维数组，先展平成一维数组
-    const flatItems = Array.isArray(items[0])
-      ? (items as PodUsOrderListData[][]).flat()
-      : (items as PodUsOrderListData[])
-    return flatItems.map((el) => Number(el.id))
-  }
+  const mapIds = (items: PodUsOrderListData[]) =>
+    items
+      .filter(
+        (el): el is PodUsOrderListData & { id: string | number } =>
+          el.id !== undefined && el.id !== null,
+      )
+      .map((el) => Number(el.id))
   switch (resourceType) {
   switch (resourceType) {
     case 0:
     case 0:
-      params.idList = mapIds(tableData.value.flat())
+      params.idList = mapIds(tableData.value as PodUsOrderListData[])
       break
       break
     case 1:
     case 1:
       params.idList = mapIds(selection.value)
       params.idList = mapIds(selection.value)
@@ -429,7 +429,6 @@ const submitExportForm = async () => {
     exportLoading.value = false
     exportLoading.value = false
   }
   }
 }
 }
-
 const handleSizeChange = (pageSize: number) => {
 const handleSizeChange = (pageSize: number) => {
   pagination.value.pageSize = pageSize
   pagination.value.pageSize = pageSize
   getOrderListFn()
   getOrderListFn()
@@ -1045,7 +1044,6 @@ onMounted(() => {
       </span>
       </span>
     </template>
     </template>
   </ElDialog>
   </ElDialog>
-
   <ResultInfo
   <ResultInfo
     ref="resultRefs"
     ref="resultRefs"
     :list="resultInfo"
     :list="resultInfo"