From 0fd5c25a640e7d20661d7f2ed74c7b6a0d66571e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 26 十二月 2025 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobStandardAdmin
---
src/views/StandardOrderManage/OrderManage.vue | 62 ++----------------------------
1 files changed, 5 insertions(+), 57 deletions(-)
diff --git a/src/views/StandardOrderManage/OrderManage.vue b/src/views/StandardOrderManage/OrderManage.vue
index 12a9627..dc1aeb1 100644
--- a/src/views/StandardOrderManage/OrderManage.vue
+++ b/src/views/StandardOrderManage/OrderManage.vue
@@ -67,19 +67,15 @@
LoadingLayout,
AppContainer,
QueryFilterItem,
- useTable,
FieldDatePicker,
FieldSelect,
} from '@bole-core/components';
import { useAccess } from '@/hooks';
-import { ModelValueType } from 'element-plus';
-import * as standardOrderServices from '@/services/api/standardOrder';
import {
EnumStandardOrderAppointmentStatusText,
EnumStandardOrderPayStatusText,
- EnumStandardOrderSettlementStatusText,
} from '@/constants';
-import { format } from '@/utils';
+import { useGetStandardOrders } from '@/hooks';
defineOptions({
name: 'OrderManage',
@@ -100,63 +96,15 @@
const state = reactive({ ...BaseState });
+const { getList, proTableProps, paginationState, extraParamState, reset } = useGetStandardOrders({
+ isSettlement: false,
+});
+
onMounted(async () => {
await getList();
state.loading = false;
});
-const {
- getDataSource: getList,
- proTableProps,
- paginationState,
- extraParamState,
- reset,
-} = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
- try {
- let params: API.GetStandardOrdersQuery = {
- pageModel: {
- rows: pageSize,
- page: pageIndex,
- orderInput: extraParamState.orderInput,
- },
- keywords: extraParamState.keywords,
- appointmentStatus: extraParamState.appointmentStatus,
- payStatus: extraParamState.payStatus,
- createdTimeBegin: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
- payTimeBegin: format(extraParamState.payTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- payTimeEnd: format(extraParamState.payTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
- };
- let res = await standardOrderServices.getStandardOrders(params, {
- showLoading: !state.loading,
- });
- return res;
- } catch (error) {}
- },
- {
- defaultExtraParams: {
- keywords: '',
- appointmentStatus: '' as any as EnumStandardOrderAppointmentStatus,
- payStatus: '' as any as EnumStandardOrderPayStatus,
- createdTime: [] as unknown as ModelValueType,
- payTime: [] as unknown as ModelValueType,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
- },
- columnsRenderProps: {
- createdTime: { type: 'date' },
- payCompletedTime: { type: 'date' },
- payAmount: { type: 'money' },
- receiveAmount: { type: 'money' },
- serviceFee: { type: 'money' },
- settlementAmount: { type: 'money' },
- appointmentStatus: { type: 'enum', valueEnum: EnumStandardOrderAppointmentStatusText },
- payStatus: { type: 'enum', valueEnum: EnumStandardOrderPayStatusText },
- settlementStatus: { type: 'enum', valueEnum: EnumStandardOrderSettlementStatusText },
- },
- }
-);
-
function goDetail(row?: API.GetStandardOrdersQueryResultItem) {
router.push({ name: 'OrderManageDetail', params: { id: row?.id ?? '' } });
}
--
Gitblit v1.10.0