feat(pl): add datetime column dual-caret sort on scoped transport lists.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
100b0880f0
commit
45a6fc5cc5
25 files changed
+41949
-40523
No files matched your search
@@ -242,6 +242,7 @@ import { CircleCheck, Filter } from '@element-plus/icons-vue'
|
||||
import { inventoryApi, type DocumentReminder } from '@/api/pl'
|
||||
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import { plDocumentReminderColumnFilterDefs } from '@/views/pl/inventory/columnFilterDefs'
|
||||
import { refreshMenuBadges } from '@/utils/menu-badge-registry'
|
||||
@@ -277,6 +278,26 @@ const {
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams,
|
||||
watchVisibleColumns: watchSortVisibleColumns
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plDocumentReminderColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -290,6 +311,7 @@ const visibleFilterProps = computed(() => {
|
||||
return props
|
||||
})
|
||||
watchVisibleColumns(visibleFilterProps)
|
||||
watchSortVisibleColumns(visibleFilterProps)
|
||||
|
||||
function handleResetColumns() {
|
||||
resetToDefault()
|
||||
@@ -312,7 +334,7 @@ const quickSearchKeyword = ref('')
|
||||
const selectedRows = ref<DocumentReminder[]>([])
|
||||
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const params: Record<string, any> = { ...toQueryParams() }
|
||||
const params: Record<string, any> = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearchKeyword.value.trim()
|
||||
if (keyword) params.q = keyword
|
||||
return params
|
||||
|
||||
@@ -683,6 +683,7 @@ import {
|
||||
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
|
||||
import ColumnHeaderFilter from '@/components/business/column-header-filter/index.vue'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { plPlanArchiveColumnFilterDefs } from './columnFilterDefs'
|
||||
import {
|
||||
getPlPlanListRowClassName,
|
||||
@@ -788,6 +789,26 @@ const {
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams,
|
||||
watchVisibleColumns: watchSortVisibleColumns
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plPlanArchiveColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -801,6 +822,7 @@ const visibleFilterProps = computed(() => {
|
||||
return props
|
||||
})
|
||||
watchVisibleColumns(visibleFilterProps)
|
||||
watchSortVisibleColumns(visibleFilterProps)
|
||||
|
||||
function handleResetColumns() {
|
||||
resetToDefault()
|
||||
@@ -944,7 +966,7 @@ tableEl: archiveTableWrapRef,
|
||||
tableRef: archiveTableRef
|
||||
})
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const colParams = { ...toQueryParams() }
|
||||
const colParams = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearch.value.trim()
|
||||
const params: Record<string, any> = { ...colParams }
|
||||
if (keyword) params.q = keyword
|
||||
|
||||
@@ -614,6 +614,7 @@
|
||||
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
|
||||
import ColumnHeaderFilter from '@/components/business/column-header-filter/index.vue'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { plPlanCertColumnFilterDefs } from './columnFilterDefs'
|
||||
import {
|
||||
getPlPlanListRowClassName,
|
||||
@@ -695,6 +696,26 @@
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams,
|
||||
watchVisibleColumns: watchSortVisibleColumns
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plPlanCertColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -708,6 +729,7 @@
|
||||
return props
|
||||
})
|
||||
watchVisibleColumns(visibleFilterProps)
|
||||
watchSortVisibleColumns(visibleFilterProps)
|
||||
|
||||
function handleResetColumns() {
|
||||
resetToDefault()
|
||||
@@ -751,7 +773,7 @@ tableEl: planCertTableWrapRef,
|
||||
onView: (plan) => handleView(plan)
|
||||
})
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const colParams = { ...toQueryParams() }
|
||||
const colParams = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearch.value.trim()
|
||||
const tabFilters = plPlanCertTabToFilters(activePlanTypeTab.value)
|
||||
const params: Record<string, any> = { ...colParams }
|
||||
|
||||
@@ -490,6 +490,7 @@ import {
|
||||
} from '@/api/pl'
|
||||
import ColumnHeaderFilter from '@/components/business/column-header-filter/index.vue'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { plPlanContractColumnFilterDefs } from './columnFilterDefs'
|
||||
import PlPlanContractCell from '@/components/business/pl-plan-contract-cell/index.vue'
|
||||
import PlPlanContractMultiSelect from '@/components/business/pl-plan-contract-multi-select/index.vue'
|
||||
@@ -570,6 +571,25 @@ const {
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plPlanContractColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -659,7 +679,7 @@ function showGapSupplementAction(row: PlPlanListDisplayRow): boolean {
|
||||
}
|
||||
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const colParams = { ...toQueryParams() }
|
||||
const colParams = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearch.value.trim()
|
||||
const params: Record<string, any> = { ...colParams }
|
||||
if (keyword) params.q = keyword
|
||||
|
||||
@@ -433,6 +433,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="isColumnVisible('productPackageSpec')"
|
||||
prop="productPackageSpec"
|
||||
label="包装规格"
|
||||
min-width="120"
|
||||
align="center"
|
||||
@@ -440,6 +441,19 @@
|
||||
class-name="pl-plan-stop-col"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #header>
|
||||
<div class="col-header-with-filter">
|
||||
<span class="col-header-with-filter__label">包装规格</span>
|
||||
<ColumnHeaderFilter
|
||||
prop="productPackageSpec"
|
||||
label="包装规格"
|
||||
type="text"
|
||||
:is-active="isFilterActive('productPackageSpec')"
|
||||
:model-value="filters.productPackageSpec || null"
|
||||
@update:model-value="(v) => setFilterState('productPackageSpec', v)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #default="{ row }">
|
||||
<PlPlanListProductCell
|
||||
:stop-products="getStopProducts(row)"
|
||||
@@ -854,6 +868,7 @@ import { useListTableViewportHeight } from '@/composables/useListTableViewportHe
|
||||
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
|
||||
import ColumnHeaderFilter from '@/components/business/column-header-filter/index.vue'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { plPlanColumnFilterDefs } from './columnFilterDefs'
|
||||
|
||||
/** 计划区可合并列(顺序须与表格左侧列一致,不含勾选/序号/计划编号) */
|
||||
@@ -932,6 +947,26 @@ import { useListTableViewportHeight } from '@/composables/useListTableViewportHe
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams,
|
||||
watchVisibleColumns: watchSortVisibleColumns
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plPlanColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -945,6 +980,7 @@ import { useListTableViewportHeight } from '@/composables/useListTableViewportHe
|
||||
return props
|
||||
})
|
||||
watchVisibleColumns(visibleFilterProps)
|
||||
watchSortVisibleColumns(visibleFilterProps)
|
||||
|
||||
function handleResetColumns() {
|
||||
resetToDefault()
|
||||
@@ -1107,7 +1143,7 @@ tableEl: planTableWrapRef,
|
||||
|
||||
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const colParams = { ...toQueryParams() }
|
||||
const colParams = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearch.value.trim()
|
||||
const tabFilters = plPlanListTabToFilters(activePlanTypeTab.value)
|
||||
const params: Record<string, any> = { ...colParams }
|
||||
|
||||
@@ -410,6 +410,7 @@ import ListColumnStatsRow from '@/components/business/list-column-stats-row/inde
|
||||
import type { StatsRowColumn } from '@/utils/list-column-stats'
|
||||
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { plVehicleMaintenanceApplyColumnFilterDefs } from '@/views/pl/vehicle-maintenance-apply/columnFilterDefs'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import {
|
||||
@@ -479,6 +480,26 @@ const {
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams,
|
||||
watchVisibleColumns: watchSortVisibleColumns
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plVehicleMaintenanceApplyColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -492,6 +513,7 @@ const visibleFilterProps = computed(() => {
|
||||
return props
|
||||
})
|
||||
watchVisibleColumns(visibleFilterProps)
|
||||
watchSortVisibleColumns(visibleFilterProps)
|
||||
|
||||
function handleResetColumns() {
|
||||
resetToDefault()
|
||||
@@ -551,7 +573,7 @@ const tableData = ref<VehicleMaintenanceApply[]>([])
|
||||
const selectedRows = ref<VehicleMaintenanceApply[]>([])
|
||||
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const params: Record<string, any> = { ...toQueryParams() }
|
||||
const params: Record<string, any> = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearchKeyword.value.trim()
|
||||
if (keyword) params.q = keyword
|
||||
return params
|
||||
|
||||
@@ -457,6 +457,7 @@ import ListColumnStatsRow from '@/components/business/list-column-stats-row/inde
|
||||
import type { StatsRowColumn } from '@/utils/list-column-stats'
|
||||
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { plVehicleMaintenanceProcessColumnFilterDefs } from '@/views/pl/vehicle-maintenance-apply/columnFilterDefs'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import { Check, Close, Delete, Edit, Filter, Plus, Tools } from '@element-plus/icons-vue'
|
||||
@@ -535,6 +536,26 @@ const {
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams,
|
||||
watchVisibleColumns: watchSortVisibleColumns
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plVehicleMaintenanceProcessColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -548,6 +569,7 @@ const visibleFilterProps = computed(() => {
|
||||
return props
|
||||
})
|
||||
watchVisibleColumns(visibleFilterProps)
|
||||
watchSortVisibleColumns(visibleFilterProps)
|
||||
|
||||
function handleResetColumns() {
|
||||
resetToDefault()
|
||||
@@ -601,7 +623,7 @@ const deleteLoadingMap = reactive<Record<string, boolean>>({})
|
||||
const selectedRows = ref<VehicleMaintenanceProcessBoardItem[]>([])
|
||||
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const params: Record<string, any> = { ...toQueryParams() }
|
||||
const params: Record<string, any> = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearchKeyword.value.trim()
|
||||
if (keyword) params.q = keyword
|
||||
return params
|
||||
|
||||
@@ -362,6 +362,7 @@ import ListToolbarEndActions from '@/components/business/list-toolbar-end-action
|
||||
import ListExportDropdown from '@/components/business/list-export-dropdown/index.vue'
|
||||
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { plVehicleRechargeApplyColumnFilterDefs } from '@/views/pl/vehicle-recharge-apply/columnFilterDefs'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import {
|
||||
@@ -429,6 +430,26 @@ const {
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams,
|
||||
watchVisibleColumns: watchSortVisibleColumns
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plVehicleRechargeApplyColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -442,6 +463,7 @@ const visibleFilterProps = computed(() => {
|
||||
return props
|
||||
})
|
||||
watchVisibleColumns(visibleFilterProps)
|
||||
watchSortVisibleColumns(visibleFilterProps)
|
||||
|
||||
function handleResetColumns() {
|
||||
resetToDefault()
|
||||
@@ -473,7 +495,7 @@ const tableData = ref<VehicleRechargeApply[]>([])
|
||||
const selectedRows = ref<VehicleRechargeApply[]>([])
|
||||
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const params: Record<string, any> = { ...toQueryParams() }
|
||||
const params: Record<string, any> = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearchKeyword.value.trim()
|
||||
if (keyword) params.q = keyword
|
||||
return params
|
||||
|
||||
@@ -474,6 +474,7 @@ import ListToolbarEndActions from '@/components/business/list-toolbar-end-action
|
||||
import ListExportDropdown from '@/components/business/list-export-dropdown/index.vue'
|
||||
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useColumnSort } from '@/composables/useColumnSort'
|
||||
import { plVehicleRechargeDisburseColumnFilterDefs } from '@/views/pl/vehicle-recharge-apply/columnFilterDefs'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import { Check, Close, Delete, Edit, Filter, Money, Plus } from '@element-plus/icons-vue'
|
||||
@@ -543,6 +544,26 @@ const {
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
const {
|
||||
sortField,
|
||||
sortOrder,
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
toQueryParams: toSortQueryParams,
|
||||
watchVisibleColumns: watchSortVisibleColumns
|
||||
} = useColumnSort({
|
||||
onChange: () => handleSearch()
|
||||
})
|
||||
|
||||
provide('crmColumnSort', {
|
||||
setSort,
|
||||
clearSort,
|
||||
isSortActive,
|
||||
sortField,
|
||||
sortOrder
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = plVehicleRechargeDisburseColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
@@ -556,6 +577,7 @@ const visibleFilterProps = computed(() => {
|
||||
return props
|
||||
})
|
||||
watchVisibleColumns(visibleFilterProps)
|
||||
watchSortVisibleColumns(visibleFilterProps)
|
||||
|
||||
function handleResetColumns() {
|
||||
resetToDefault()
|
||||
@@ -577,7 +599,7 @@ const tableData = ref<VehicleRechargeDisburseBoardItem[]>([])
|
||||
const selectedRows = ref<VehicleRechargeDisburseBoardItem[]>([])
|
||||
|
||||
function buildListQueryParams(): Record<string, any> {
|
||||
const params: Record<string, any> = { ...toQueryParams() }
|
||||
const params: Record<string, any> = { ...toQueryParams(), ...toSortQueryParams() }
|
||||
const keyword = quickSearchKeyword.value.trim()
|
||||
if (keyword) params.q = keyword
|
||||
return params
|
||||
|
||||
Reference in new issue
Block a user