提交
This commit is contained in:
1 parent
7f1f60e259
commit
c55f22a603
855 files changed
+4758807
-1373323
No files matched your search
@@ -48,6 +48,9 @@
|
||||
@search="handleQuickSearch"
|
||||
@clear="handleQuickSearchClear"
|
||||
/>
|
||||
<el-button v-if="hasActiveFilters" class="btn-ghost" @click="clearAllFilters">
|
||||
<el-icon><Filter /></el-icon>清空列过滤
|
||||
</el-button>
|
||||
|
||||
<ListExportDropdown
|
||||
:export-fn="fetchExportMyInstances"
|
||||
@@ -100,6 +103,19 @@
|
||||
header-align="center"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #header>
|
||||
<div class="col-header-with-filter">
|
||||
<span class="col-header-with-filter__label">流程名称</span>
|
||||
<ColumnHeaderFilter
|
||||
prop="processName"
|
||||
label="流程名称"
|
||||
type="text"
|
||||
:is-active="isFilterActive('processName')"
|
||||
:model-value="filters.processName || null"
|
||||
@update:model-value="(v) => setFilterState('processName', v)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #default="{ row }">
|
||||
<el-link type="primary" @click="handleViewDetail(row)">{{ row.processName }}</el-link>
|
||||
</template>
|
||||
@@ -129,6 +145,20 @@
|
||||
align="center"
|
||||
header-align="center"
|
||||
>
|
||||
<template #header>
|
||||
<div class="col-header-with-filter">
|
||||
<span class="col-header-with-filter__label">状态</span>
|
||||
<ColumnHeaderFilter
|
||||
prop="status"
|
||||
label="状态"
|
||||
type="enum"
|
||||
:enum-options="enumOptionsFor('status')"
|
||||
:is-active="isFilterActive('status')"
|
||||
:model-value="filters.status || null"
|
||||
@update:model-value="(v) => setFilterState('status', v)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #default="{ row }">
|
||||
<ProcessStatusTag :status="row.status || ''" />
|
||||
</template>
|
||||
@@ -246,11 +276,14 @@
|
||||
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 ColumnHeaderFilter from '@/components/business/column-header-filter/index.vue'
|
||||
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import { systemWorkflowColumnFilterDefs } from '@/views/system/_shared/columnFilterDefs'
|
||||
import { fetchMyInstances, fetchBusinessAllTasks, fetchExportMyInstances } from '@/api/workflow'
|
||||
import ProcessStatusTag from '../components/ProcessStatusTag.vue'
|
||||
import { Document, Search, RefreshLeft, Close } from '@element-plus/icons-vue'
|
||||
import { Document, Search, RefreshLeft, Close, Filter } from '@element-plus/icons-vue'
|
||||
|
||||
defineOptions({ name: 'WorkflowMyApplications' })
|
||||
|
||||
@@ -281,11 +314,44 @@ const { tableHeight, recalc: recalcTableHeight } = useListTableViewportHeight({
|
||||
const searchForm = reactive<{ keyword: string; status: string }>({ keyword: '', status: '' })
|
||||
const quickSearchKeyword = ref('')
|
||||
|
||||
const {
|
||||
filters,
|
||||
hasActiveFilters,
|
||||
setFilterState,
|
||||
clearAllFilters,
|
||||
isFilterActive,
|
||||
toQueryParams
|
||||
} = useServerColumnFilters(systemWorkflowColumnFilterDefs, {
|
||||
onChange: () => {
|
||||
pagination.page = 1
|
||||
loadData()
|
||||
}
|
||||
})
|
||||
|
||||
function enumOptionsFor(prop: string) {
|
||||
const def = systemWorkflowColumnFilterDefs.find((d) => d.prop === prop)
|
||||
return (def?.enumOptions || []).map((o) => ({ ...o, count: 0 }))
|
||||
}
|
||||
|
||||
function buildColumnQueryParams() {
|
||||
const q: Record<string, string> = { ...toQueryParams() }
|
||||
if (q.statusIn) {
|
||||
const parts = String(q.statusIn)
|
||||
.split(',')
|
||||
.map((s) => s.trim())
|
||||
.filter(Boolean)
|
||||
delete q.statusIn
|
||||
if (parts.length === 1) q.status = parts[0]
|
||||
}
|
||||
return q
|
||||
}
|
||||
|
||||
function getMyApplicationsExportFilterParams() {
|
||||
const quickKeyword = quickSearchKeyword.value?.trim()
|
||||
const col = buildColumnQueryParams()
|
||||
return {
|
||||
keyword: quickKeyword || searchForm.keyword || undefined,
|
||||
status: searchForm.status || undefined
|
||||
keyword: quickKeyword || searchForm.keyword || col.keyword || undefined,
|
||||
status: col.status ?? (searchForm.status || undefined)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -309,11 +375,12 @@ const { tableHeight, recalc: recalcTableHeight } = useListTableViewportHeight({
|
||||
loading.value = true
|
||||
try {
|
||||
const quickKeyword = quickSearchKeyword.value?.trim()
|
||||
const col = buildColumnQueryParams()
|
||||
const res = await fetchMyInstances({
|
||||
page: pagination.page,
|
||||
pageSize: pagination.pageSize,
|
||||
keyword: quickKeyword || searchForm.keyword || undefined,
|
||||
status: searchForm.status || undefined
|
||||
keyword: quickKeyword || searchForm.keyword || col.keyword || undefined,
|
||||
status: col.status ?? (searchForm.status || undefined)
|
||||
})
|
||||
tableData.value = res.list || []
|
||||
pagination.total = res.total ?? 0
|
||||
|
||||
@@ -36,6 +36,9 @@
|
||||
@search="handleQuickSearch"
|
||||
@clear="handleQuickSearchClear"
|
||||
/>
|
||||
<el-button v-if="hasActiveFilters" class="btn-ghost" @click="clearAllFilters">
|
||||
<el-icon><Filter /></el-icon>清空列过滤
|
||||
</el-button>
|
||||
|
||||
<ListExportDropdown
|
||||
:export-fn="fetchExportCompletedTasks"
|
||||
@@ -87,6 +90,19 @@
|
||||
align="center"
|
||||
header-align="center"
|
||||
>
|
||||
<template #header>
|
||||
<div class="col-header-with-filter">
|
||||
<span class="col-header-with-filter__label">流程名称</span>
|
||||
<ColumnHeaderFilter
|
||||
prop="processName"
|
||||
label="流程名称"
|
||||
type="text"
|
||||
:is-active="isFilterActive('processName')"
|
||||
:model-value="filters.processName || null"
|
||||
@update:model-value="(v) => setFilterState('processName', v)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #default="{ row }">
|
||||
<el-link type="primary" @click="handleViewDetail(row)">{{ row.processName }}</el-link>
|
||||
</template>
|
||||
@@ -251,11 +267,14 @@
|
||||
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 ColumnHeaderFilter from '@/components/business/column-header-filter/index.vue'
|
||||
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import { systemWorkflowColumnFilterDefs } from '@/views/system/_shared/columnFilterDefs'
|
||||
import { fetchCompletedTasks, fetchInstanceDetail, fetchExportCompletedTasks } from '@/api/workflow'
|
||||
import ProcessStatusTag from '../components/ProcessStatusTag.vue'
|
||||
import { Document, Search, RefreshLeft, Close } from '@element-plus/icons-vue'
|
||||
import { Document, Search, RefreshLeft, Close, Filter } from '@element-plus/icons-vue'
|
||||
|
||||
defineOptions({ name: 'WorkflowTaskCompleted' })
|
||||
|
||||
@@ -288,10 +307,25 @@ const { tableHeight, recalc: recalcTableHeight } = useListTableViewportHeight({
|
||||
const searchForm = reactive<{ keyword: string }>({ keyword: '' })
|
||||
const quickSearchKeyword = ref('')
|
||||
|
||||
const {
|
||||
filters,
|
||||
hasActiveFilters,
|
||||
setFilterState,
|
||||
clearAllFilters,
|
||||
isFilterActive,
|
||||
toQueryParams
|
||||
} = useServerColumnFilters(systemWorkflowColumnFilterDefs, {
|
||||
onChange: () => {
|
||||
pagination.page = 1
|
||||
loadData()
|
||||
}
|
||||
})
|
||||
|
||||
function getCompletedExportFilterParams() {
|
||||
const quickKeyword = quickSearchKeyword.value?.trim()
|
||||
const col = toQueryParams()
|
||||
return {
|
||||
keyword: quickKeyword || searchForm.keyword || undefined
|
||||
keyword: quickKeyword || searchForm.keyword || col.keyword || undefined
|
||||
}
|
||||
}
|
||||
|
||||
@@ -315,10 +349,11 @@ const { tableHeight, recalc: recalcTableHeight } = useListTableViewportHeight({
|
||||
loading.value = true
|
||||
try {
|
||||
const quickKeyword = quickSearchKeyword.value?.trim()
|
||||
const col = toQueryParams()
|
||||
const res = await fetchCompletedTasks({
|
||||
page: pagination.page,
|
||||
pageSize: pagination.pageSize,
|
||||
keyword: quickKeyword || searchForm.keyword || undefined
|
||||
keyword: quickKeyword || searchForm.keyword || col.keyword || undefined
|
||||
})
|
||||
tableData.value = res.list || []
|
||||
pagination.total = res.total ?? 0
|
||||
|
||||
@@ -36,6 +36,9 @@
|
||||
@search="handleQuickSearch"
|
||||
@clear="handleQuickSearchClear"
|
||||
/>
|
||||
<el-button v-if="hasActiveFilters" class="btn-ghost" @click="clearAllFilters">
|
||||
<el-icon><Filter /></el-icon>清空列过滤
|
||||
</el-button>
|
||||
<el-button
|
||||
class="btn-main"
|
||||
type="primary"
|
||||
@@ -97,6 +100,19 @@
|
||||
header-align="center"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #header>
|
||||
<div class="col-header-with-filter">
|
||||
<span class="col-header-with-filter__label">流程名称</span>
|
||||
<ColumnHeaderFilter
|
||||
prop="processName"
|
||||
label="流程名称"
|
||||
type="text"
|
||||
:is-active="isFilterActive('processName')"
|
||||
:model-value="filters.processName || null"
|
||||
@update:model-value="(v) => setFilterState('processName', v)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #default="{ row }">
|
||||
<el-link type="primary" @click="handleViewDetail(row)">{{ row.processName }}</el-link>
|
||||
</template>
|
||||
@@ -259,12 +275,15 @@
|
||||
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 ColumnHeaderFilter from '@/components/business/column-header-filter/index.vue'
|
||||
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
|
||||
import { useServerColumnFilters } from '@/composables/useServerColumnFilters'
|
||||
import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight'
|
||||
import { systemWorkflowColumnFilterDefs } from '@/views/system/_shared/columnFilterDefs'
|
||||
import { fetchPendingTasks, fetchInstanceDetail, fetchExportPendingTasks } from '@/api/workflow'
|
||||
import ApprovalDialog from '../components/ApprovalDialog.vue'
|
||||
import ProcessStatusTag from '../components/ProcessStatusTag.vue'
|
||||
import { Document, EditPen, Search, RefreshLeft, Close } from '@element-plus/icons-vue'
|
||||
import { Document, EditPen, Search, RefreshLeft, Close, Filter } from '@element-plus/icons-vue'
|
||||
|
||||
defineOptions({ name: 'WorkflowTaskPending' })
|
||||
|
||||
@@ -295,10 +314,25 @@ const { tableHeight, recalc: recalcTableHeight } = useListTableViewportHeight({
|
||||
const searchForm = reactive<{ keyword: string }>({ keyword: '' })
|
||||
const quickSearchKeyword = ref('')
|
||||
|
||||
const {
|
||||
filters,
|
||||
hasActiveFilters,
|
||||
setFilterState,
|
||||
clearAllFilters,
|
||||
isFilterActive,
|
||||
toQueryParams
|
||||
} = useServerColumnFilters(systemWorkflowColumnFilterDefs, {
|
||||
onChange: () => {
|
||||
pagination.page = 1
|
||||
loadData()
|
||||
}
|
||||
})
|
||||
|
||||
function getPendingExportFilterParams() {
|
||||
const quickKeyword = quickSearchKeyword.value?.trim()
|
||||
const col = toQueryParams()
|
||||
return {
|
||||
keyword: quickKeyword || searchForm.keyword || undefined
|
||||
keyword: quickKeyword || searchForm.keyword || col.keyword || undefined
|
||||
}
|
||||
}
|
||||
|
||||
@@ -332,10 +366,11 @@ const { tableHeight, recalc: recalcTableHeight } = useListTableViewportHeight({
|
||||
loading.value = true
|
||||
try {
|
||||
const quickKeyword = quickSearchKeyword.value?.trim()
|
||||
const col = toQueryParams()
|
||||
const res = await fetchPendingTasks({
|
||||
page: pagination.page,
|
||||
pageSize: pagination.pageSize,
|
||||
keyword: quickKeyword || searchForm.keyword || undefined
|
||||
keyword: quickKeyword || searchForm.keyword || col.keyword || undefined
|
||||
})
|
||||
tableData.value = res.list || []
|
||||
pagination.total = res.total ?? 0
|
||||
|
||||
Reference in new issue
Block a user