This commit is contained in:
zlwu committed 2026-09-02 08:20:52 +08:00
1 parent 506cc7991a
commit 1dfcc66d2c
269 files changed
+1413333 -55990

No files matched your search

@@ -186,10 +186,11 @@
</ListTable>
</div>
<div ref="expenseItemPagerRef" class="pagination list-pager-bar">
<div ref="expenseItemPagerRef" class="pagination list-pager-bar">
<div class="list-pager-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
</div>
</div>
</section>
+11 -11
View File
@@ -397,6 +397,8 @@ import ListExportDropdown from '@/components/business/list-export-dropdown/index
import { ElMessage } from 'element-plus'
import { Search, RefreshLeft } from '@element-plus/icons-vue'
import { advanceApi, paymentApi, reimburseApi } from '@/api/bx'
import { pickBxPageResult } from '@/utils/http/bx'
import { fetchAllPagedRecords } from '@/utils/fetch-paged-list'
import {
bizTypeTagType,
statusLabel,
@@ -728,19 +730,17 @@ const selectedRows = ref<any[]>([])
async function loadData() {
loading.value = true
try {
const listParams = { page: 1, pageSize: 9999, ...buildApiQuery() }
const apiQuery = buildApiQuery()
const [advRes, reimRes] = await Promise.allSettled([
advanceApi.list(listParams),
reimburseApi.list(listParams)
fetchAllPagedRecords(async (page, pageSize) =>
pickBxPageResult(await advanceApi.list({ page, pageSize, ...apiQuery }))
),
fetchAllPagedRecords(async (page, pageSize) =>
pickBxPageResult(await reimburseApi.list({ page, pageSize, ...apiQuery }))
)
])
const advRows =
advRes.status === 'fulfilled'
? ((advRes.value as any).data?.rows || []).map(mapAdvanceRow)
: []
const reimRows =
reimRes.status === 'fulfilled'
? ((reimRes.value as any).data?.rows || []).map(mapReimburseRow)
: []
const advRows = advRes.status === 'fulfilled' ? advRes.value.map(mapAdvanceRow) : []
const reimRows = reimRes.status === 'fulfilled' ? reimRes.value.map(mapReimburseRow) : []
mergedRows.value = [...advRows, ...reimRows]
} catch {
// error handled by interceptor
+10 -7
View File
@@ -385,6 +385,8 @@ import ListExportDropdown from '@/components/business/list-export-dropdown/index
import { ElMessage } from 'element-plus'
import { Search, RefreshLeft } from '@element-plus/icons-vue'
import { advanceApi, paymentApi, reimburseApi } from '@/api/bx'
import { pickBxPageResult } from '@/utils/http/bx'
import { fetchAllPagedRecords } from '@/utils/fetch-paged-list'
import {
bizTypeTagType,
statusLabel,
@@ -678,17 +680,18 @@ const selectedRows = ref<any[]>([])
tableLoading.value = true
try {
const apiQuery = buildApiQuery()
const listParams = { page: 1, pageSize: 9999, ...apiQuery }
const [advRes, reimRes] = await Promise.allSettled([
advanceApi.my(listParams),
reimburseApi.my(listParams)
fetchAllPagedRecords(async (page, pageSize) =>
pickBxPageResult(await advanceApi.my({ page, pageSize, ...apiQuery }))
),
fetchAllPagedRecords(async (page, pageSize) =>
pickBxPageResult(await reimburseApi.my({ page, pageSize, ...apiQuery }))
)
])
const advRows =
advRes.status === 'fulfilled' ? (advRes.value.data?.rows || []).map(mapAdvanceMineRow) : []
advRes.status === 'fulfilled' ? advRes.value.map(mapAdvanceMineRow) : []
const reimRows =
reimRes.status === 'fulfilled'
? (reimRes.value.data?.rows || []).map(mapReimburseMineRow)
: []
reimRes.status === 'fulfilled' ? reimRes.value.map(mapReimburseMineRow) : []
mergedRows.value = sortMergedRows([...advRows, ...reimRows])
} catch {
// error handled by interceptor
+11 -7
View File
@@ -463,6 +463,8 @@ import ListExportDropdown from '@/components/business/list-export-dropdown/index
import { ElMessage } from 'element-plus'
import { Check, Close, Search, RefreshLeft } from '@element-plus/icons-vue'
import { advanceApi, paymentApi, reimburseApi } from '@/api/bx'
import { pickBxPageResult } from '@/utils/http/bx'
import { fetchAllPagedRecords } from '@/utils/fetch-paged-list'
import {
bizTypeTagType,
formatMoneyYuan,
@@ -729,17 +731,19 @@ import ListExportDropdown from '@/components/business/list-export-dropdown/index
if (options.buttonLoading) searchLoading.value = true
tableLoading.value = true
try {
const listParams = { page: 1, pageSize: 9999, ...buildApiQuery() }
const apiQuery = buildApiQuery()
const [advRes, reimRes] = await Promise.allSettled([
advanceApi.pendingApproval(listParams),
reimburseApi.pendingApproval(listParams)
fetchAllPagedRecords(async (page, pageSize) =>
pickBxPageResult(await advanceApi.pendingApproval({ page, pageSize, ...apiQuery }))
),
fetchAllPagedRecords(async (page, pageSize) =>
pickBxPageResult(await reimburseApi.pendingApproval({ page, pageSize, ...apiQuery }))
)
])
const advRows =
advRes.status === 'fulfilled' ? (advRes.value.data?.rows || []).map(mapAdvanceTodoRow) : []
advRes.status === 'fulfilled' ? advRes.value.map(mapAdvanceTodoRow) : []
const reimRows =
reimRes.status === 'fulfilled'
? (reimRes.value.data?.rows || []).map(mapReimburseTodoRow)
: []
reimRes.status === 'fulfilled' ? reimRes.value.map(mapReimburseTodoRow) : []
mergedRows.value = [...advRows, ...reimRows]
} catch {
// error handled by interceptor
@@ -119,10 +119,11 @@
</ListTable>
</div>
<div ref="wfAdvancePagerRef" class="pagination list-pager-bar">
<div ref="wfAdvancePagerRef" class="pagination list-pager-bar">
<div class="list-pager-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
</div>
</div>
</section>
@@ -124,6 +124,7 @@
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
</div>
</div>
</section>
<el-dialog