From be028017a461af4c9745c69c4df084d4c3e6b296 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:08:49 +0800
Subject: [PATCH] fix: bug
---
src/views/TaskManage/components/SelltementDetailView.vue | 78 +++++++++++++++++----------------------
1 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/src/views/TaskManage/components/SelltementDetailView.vue b/src/views/TaskManage/components/SelltementDetailView.vue
index 37d6c99..4813a9f 100644
--- a/src/views/TaskManage/components/SelltementDetailView.vue
+++ b/src/views/TaskManage/components/SelltementDetailView.vue
@@ -13,22 +13,17 @@
<script setup lang="ts">
import { ProTableV2, LoadingLayout, AppContainer, useTable } from '@bole-core/components';
-import { ModelValueType } from 'element-plus';
-import * as taskUserServices from '@/services/api/taskUser';
-import { useQuery } from '@tanstack/vue-query';
+import * as taskServices from '@/services/api/task';
import { SettlementReceiveStatusText } from '@/constants';
-import { downloadFileByUrl, paginateList, setOSSLink } from '@/utils';
+import { setOssFileName } from '@/utils';
defineOptions({
name: 'SelltementDetailView',
});
const operationBtnMap: Record<string, OperationBtnType> = {
- 'settle-downloadBtn': {
- emits: { onClick: (role) => handleDownload(role) },
- extraProps: {
- hide: (row: API.GetSettlementTaskUsersQueryResultItem) => !row.ereceiptDownloadOssUrl,
- },
+ 'settle-detailBtn': {
+ emits: { onClick: (role) => goDetail(role) },
},
};
@@ -43,7 +38,6 @@
const id = route.params?.id as string;
const BaseState = {
loading: true,
- settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
};
const state = reactive({ ...BaseState });
@@ -51,24 +45,6 @@
onMounted(async () => {
await getList();
state.loading = false;
-});
-
-const { isLoading, data, refetch } = useQuery({
- queryKey: ['taskUserServices/getSettlementTaskUsers', id],
- queryFn: async () => {
- return await taskUserServices.getSettlementTaskUsers(
- { taskInfoId: id },
- {
- showLoading: false,
- }
- );
- },
- placeholderData: () => ({} as API.GetSettlementTaskUsersQueryResult),
- onSuccess(res) {
- state.settlementTaskUsers = res.data;
- getList();
- },
- enabled: !!id,
});
const {
@@ -80,38 +56,52 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let list = [...state.settlementTaskUsers];
-
- return Promise.resolve({
+ let params: API.GetSettlementTasksQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
- totalCount: list.length,
+ orderInput: extraParamState.orderInput,
},
- data: paginateList(list, pageIndex, pageSize),
+ taskInfoId: id,
+ };
+ let res = await taskServices.getSettlementTasks(params, {
+ showLoading: !state.loading,
});
- } catch (error) {
- console.log('error: ', error);
- }
+ return res;
+ } catch (error) {}
},
{
defaultExtraParams: {
keywords: '',
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- queryKey: ['taskUserServices/getSettlementTaskUsers'],
+ queryKey: ['taskServices/getSettlementTasks'],
columnsRenderProps: {
- settlementTime: { type: 'date' },
- createdTime: { type: 'date' },
- settlementAmount: { type: 'money' },
+ settlementOrderStatus: { type: 'enum', valueEnum: EnumTaskSettlementOrderStatusText },
+ settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
+ checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
+ auditStatus: { type: 'enum', valueEnum: EnumTaskSettlementAuditStatusText },
actualSettlementAmount: { type: 'money' },
- settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
+ settlementAmount: { type: 'money' },
+ settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ createdTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ settlementOrderTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ settlementOrderName: {
+ formatter: (row: API.GetSettlementTasksQueryResultItem) =>
+ row.settlementOrderName && setOssFileName(row.settlementOrderName),
+ },
},
}
);
-function handleDownload(row: API.GetSettlementTaskUsersQueryResultItem) {
- if (!row.ereceiptDownloadOssUrl) return;
- downloadFileByUrl(setOSSLink(row.ereceiptDownloadOssUrl), '缁撶畻鍥炲崟');
+const router = useRouter();
+
+function goDetail(row: API.GetSettlementTasksQueryResultItem) {
+ router.push({
+ name: 'SelltementDetailInfo',
+ params: {
+ id: row.id ?? '',
+ },
+ });
}
</script>
--
Gitblit v1.9.1