提交

2026-08-22 09:08:05 +08:00
1 parent 833544def3
commit 16be6fa22d
@@ -112,10 +112,14 @@
            <el-icon><Delete /></el-icon>
            删除
          </el-button>
-          <el-button class="btn-ghost" :loading="exportLoading" @click="handleExport">
-            <el-icon><Download /></el-icon>
-            导出 Excel
-          </el-button>
+          <ListExportDropdown
+            :export-fn="(payload) => inventoryApi.export(payload)"
+            :get-filter-params="getInventoryExportFilterParams"
+            :has-selection="true"
+            :selected-ids="selectedRows.map((r) => String(r.id))"
+            :visible-columns="inventoryExportColumns"
+            filename="出入库列表.xlsx"
+          />

          <ListToolbarEndActions
            :loading="loading"
@@ -536,6 +540,7 @@
  import DbCrmCustomerSelect from '@/components/business/db/DbCrmCustomerSelect.vue'
  import ListToolbarDateShortcuts from '@/components/core/list-toolbar-date-shortcuts/index.vue'
  import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
+  import ListExportDropdown from '@/components/business/list-export-dropdown/index.vue'
  import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
  import ListColumnStatsRow from '@/components/business/list-column-stats-row/index.vue'
  import type { StatsRowColumn } from '@/utils/list-column-stats'
@@ -592,6 +597,17 @@
    resetToDefault
  } = usePersistedListColumns('db-inventory-list-columns', listColumnDefs)

+  const inventoryExportColumns = computed(() => {
+    const cols = [...visibleColumns.value]
+    if (!cols.includes('planNo')) cols.unshift('planNo')
+    return cols
+  })
+
+  function getInventoryExportFilterParams() {
+    return { ...buildListQueryParams() }
+  }
+
+
  const inventoryTableWrapRef = ref<HTMLElement | null>(null)
  const inventoryStatsRowRef = ref<{ resync?: () => void } | null>(null)

@@ -631,7 +647,6 @@
    return (row as any)?.[prop]
  }

-  const exportLoading = ref(false)
  const saving = ref(false)
  const tableData = ref<InventoryRecord[]>([])
  const allRecords = ref<InventoryRecord[]>([])
@@ -1114,52 +1129,6 @@
    }
  }

-  const handleExport = async () => {
-    exportLoading.value = true
-    try {
-      let records = await inventoryApi.list(buildListQueryParams())
-      if (records.length === 0) {
-        $modal.msgWarning('没有数据可导出')
-        return
-      }
-
-      let list = [...records]
-      if (sortProp.value && sortOrder.value) {
-        list.sort((a, b) => compare(a, b, sortProp.value, sortOrder.value!))
-      }
-
-      const headers = ['日期', '往来单位', '业务类型', '产品', '数量(吨)', '车牌号', '计划号', '备注']
-      const csvContent = [
-        headers.join(','),
-        ...list.map((r) =>
-          [
-            r.date,
-            r.partnerCompany,
-            r.businessType,
-            r.product,
-            r.quantity,
-            r.vehicleNo,
-            r.planNo || '',
-            r.remarks || ''
-          ].join(',')
-        )
-      ].join('\n')
-      const blob = new Blob(['\uFEFF' + csvContent], { type: 'text/csv;charset=utf-8' })
-      const url = URL.createObjectURL(blob)
-      const a = document.createElement('a')
-      a.href = url
-      const now = new Date()
-      const stamp = `${now.getFullYear()}${pad2(now.getMonth() + 1)}${pad2(now.getDate())}_${pad2(now.getHours())}${pad2(now.getMinutes())}${pad2(now.getSeconds())}`
-      a.download = `出入库列表_${stamp}.csv`
-      a.click()
-      URL.revokeObjectURL(url)
-      $modal.msgSuccess('导出成功')
-    } catch (error) {
-      console.error('导出失败', error)
-    } finally {
-      exportLoading.value = false
-    }
-  }

  useDbInstantSearch(
    () => ({
@@ -112,10 +112,14 @@
            <el-icon><Delete /></el-icon>
            删除
          </el-button>
-          <el-button class="btn-ghost" :loading="exportLoading" @click="handleExport">
-            <el-icon><Download /></el-icon>
-            导出 Excel
-          </el-button>
+          <ListExportDropdown
+            :export-fn="(payload) => planApi.export(payload)"
+            :get-filter-params="getPlanExportFilterParams"
+            :has-selection="true"
+            :selected-ids="selectedRows.map((r) => String(r.id))"
+            :visible-columns="planExportColumns"
+            filename="计划列表.xlsx"
+          />

          <ListToolbarEndActions
            :loading="loading"
@@ -488,6 +492,7 @@
  import DbCrmCustomerSelect from '@/components/business/db/DbCrmCustomerSelect.vue'
  import ListToolbarDateShortcuts from '@/components/core/list-toolbar-date-shortcuts/index.vue'
  import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
+  import ListExportDropdown from '@/components/business/list-export-dropdown/index.vue'
  import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
  import ListColumnStatsRow from '@/components/business/list-column-stats-row/index.vue'
  import type { StatsRowColumn } from '@/utils/list-column-stats'
@@ -534,6 +539,17 @@
    resetToDefault
  } = usePersistedListColumns('db-plans-list-columns', listColumnDefs)

+  const planExportColumns = computed(() => {
+    const cols = [...visibleColumns.value]
+    if (!cols.includes('planNo')) cols.unshift('planNo')
+    return cols
+  })
+
+  function getPlanExportFilterParams() {
+    return { ...buildListQueryParams() }
+  }
+
+
  const plansTableWrapRef = ref<HTMLElement | null>(null)
  const plansStatsRowRef = ref<{ resync?: () => void } | null>(null)

@@ -565,7 +581,6 @@
  }

  const loading = ref(false)
-  const exportLoading = ref(false)
  const saving = ref(false)
  const tableData = ref<Plan[]>([])
  const total = ref(0)
@@ -993,64 +1008,6 @@
    formRef.value?.resetFields()
  }

-  const handleExport = async () => {
-    exportLoading.value = true
-    try {
-      const records = await fetchFilteredPlans()
-      if (records.length === 0) {
-        $modal.msgWarning('没有数据可导出')
-        return
-      }
-
-      const headers = [
-        '计划号',
-        '往来单位',
-        '计划日期',
-        '起始日期',
-        '截止日期',
-        '产品',
-        '规格',
-        '车牌号',
-        '计划量',
-        '已执行量',
-        '执行状态',
-        '备注'
-      ]
-      const csvContent = [
-        headers.join(','),
-        ...records.map((r) =>
-          [
-            r.planNo,
-            r.customerName,
-            r.planDate,
-            r.startDate,
-            r.endDate,
-            r.product,
-            r.specification,
-            r.vehicleNo,
-            r.plannedQuantity,
-            r.executedQuantity || 0,
-            r.executionStatus,
-            r.remarks || ''
-          ].join(',')
-        )
-      ].join('\n')
-      const blob = new Blob(['\uFEFF' + csvContent], { type: 'text/csv;charset=utf-8' })
-      const url = URL.createObjectURL(blob)
-      const a = document.createElement('a')
-      a.href = url
-      const now = new Date()
-      const stamp = `${now.getFullYear()}${pad2(now.getMonth() + 1)}${pad2(now.getDate())}_${pad2(now.getHours())}${pad2(now.getMinutes())}${pad2(now.getSeconds())}`
-      a.download = `计划列表_${stamp}.csv`
-      a.click()
-      URL.revokeObjectURL(url)
-      $modal.msgSuccess('导出成功')
-    } catch (error) {
-      console.error('导出失败', error)
-    } finally {
-      exportLoading.value = false
-    }
-  }

  useDbInstantSearch(
    () => ({
@@ -91,10 +91,14 @@
            <el-icon><Close /></el-icon>
            作废
          </el-button>
-          <el-button class="btn-ghost" :loading="exportLoading" @click="handleExport">
-            <el-icon><Download /></el-icon>
-            导出 Excel
-          </el-button>
+          <ListExportDropdown
+            :export-fn="(payload) => weighingApi.export(payload)"
+            :get-filter-params="getWeighingExportFilterParams"
+            :has-selection="true"
+            :selected-ids="selectedRows.map((r) => String(r.id))"
+            :visible-columns="weighingExportColumns"
+            filename="地磅单列表.xlsx"
+          />

          <ListToolbarEndActions
            :loading="loading"
@@ -527,6 +531,7 @@
  import DbCrmCustomerSelect from '@/components/business/db/DbCrmCustomerSelect.vue'
  import ListToolbarDateShortcuts from '@/components/core/list-toolbar-date-shortcuts/index.vue'
  import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
+  import ListExportDropdown from '@/components/business/list-export-dropdown/index.vue'
  import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
  import ListColumnStatsRow from '@/components/business/list-column-stats-row/index.vue'
  import type { StatsRowColumn } from '@/utils/list-column-stats'
@@ -581,6 +586,17 @@
    resetToDefault
  } = usePersistedListColumns('db-weighing-list-columns', listColumnDefs)

+  const weighingExportColumns = computed(() => {
+    const cols = [...visibleColumns.value]
+    if (!cols.includes('planNo')) cols.unshift('planNo')
+    return cols
+  })
+
+  function getWeighingExportFilterParams() {
+    return { ...buildListQueryParams() }
+  }
+
+
  const weighingTableWrapRef = ref<HTMLElement | null>(null)
  const weighingStatsRowRef = ref<{ resync?: () => void } | null>(null)

@@ -609,7 +625,6 @@
  })

  const loading = ref(false)
-  const exportLoading = ref(false)
  const saving = ref(false)
  const allData = ref<WeighingRecord[]>([])
  const total = ref(0)
@@ -1075,60 +1090,6 @@
    formRef.value?.resetFields()
  }

-  const handleExport = async () => {
-    exportLoading.value = true
-    try {
-      const exportRecords = await weighingApi.list(buildListQueryParams())
-      if (exportRecords.length === 0) {
-        $modal.msgWarning('没有数据可导出')
-        return
-      }
-
-      const headers = [
-        '车牌号',
-        '货物名称',
-        '业务类型',
-        '毛重(kg)',
-        '皮重(kg)',
-        '净重(kg)',
-        '毛重时间',
-        '皮重时间',
-        '供货单位',
-        '收货单位'
-      ]
-      const csvContent = [
-        headers.join(','),
-        ...exportRecords.map((r) =>
-          [
-            r.vehicleNo,
-            r.cargoName,
-            r.businessType,
-            r.grossWeight,
-            r.tareWeight,
-            r.netWeight,
-            r.grossWeightTime,
-            r.tareWeightTime,
-            r.supplier,
-            r.consignee
-          ].join(',')
-        )
-      ].join('\n')
-      const blob = new Blob(['\uFEFF' + csvContent], { type: 'text/csv;charset=utf-8' })
-      const url = URL.createObjectURL(blob)
-      const a = document.createElement('a')
-      a.href = url
-      const now = new Date()
-      const stamp = `${now.getFullYear()}${pad2(now.getMonth() + 1)}${pad2(now.getDate())}_${pad2(now.getHours())}${pad2(now.getMinutes())}${pad2(now.getSeconds())}`
-      a.download = `地磅单列表_${stamp}.csv`
-      a.click()
-      URL.revokeObjectURL(url)
-      $modal.msgSuccess('导出成功')
-    } catch (error) {
-      console.error('导出失败', error)
-    } finally {
-      exportLoading.value = false
-    }
-  }

  const clearInventoryRouteQuery = () => {
    if (!route.query.inboundOutboundId) return