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/FinanceManage/OrderSettlementManage.vue | 69 +++++++++++++---------------------
1 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/src/views/FinanceManage/OrderSettlementManage.vue b/src/views/FinanceManage/OrderSettlementManage.vue
index 66a67a4..e441dd7 100644
--- a/src/views/FinanceManage/OrderSettlementManage.vue
+++ b/src/views/FinanceManage/OrderSettlementManage.vue
@@ -5,8 +5,8 @@
<template #query>
<QueryFilterItem tip-content="缁撶畻鐘舵��">
<FieldRadio
- v-model="extraParamState.status"
- :value-enum="[]"
+ v-model="extraParamState.settlementStatus"
+ :value-enum="EnumStandardOrderSettlementStatusText"
buttonStyle
showAllBtn
@change="getList()"
@@ -36,7 +36,6 @@
ProTableV2,
LoadingLayout,
AppContainer,
- useTable,
useFormDialog,
ProTableQueryFilterBar,
QueryFilterItem,
@@ -44,9 +43,12 @@
SearchInput,
} from '@bole-core/components';
import { useAccess } from '@/hooks';
-import { ModelValueType } from 'element-plus';
-import * as userServices from '@/services/api/user';
import OrderSettlementDetailDialog from './components/OrderSettlementDetailDialog.vue';
+import { useGetStandardOrders } from '@/hooks';
+import { EnumStandardOrderSettlementStatusText } from '@/constants';
+import * as standardOrderServices from '@/services/api/standardOrder';
+import { Message } from '@bole-core/core';
+import { toThousand } from '@/utils';
defineOptions({
name: 'OrderSettlementManage',
@@ -68,47 +70,30 @@
const state = reactive({ ...BaseState });
+const { getList, proTableProps, paginationState, extraParamState, reset } = useGetStandardOrders({
+ isSettlement: true,
+});
+
onMounted(async () => {
await getList();
state.loading = false;
});
-const {
- getDataSource: getList,
- proTableProps,
- paginationState,
- extraParamState,
- reset,
-} = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
- try {
- let params: API.GetPersonalUserTransactionsQuery = {
- pageModel: {
- rows: pageSize,
- page: pageIndex,
- orderInput: extraParamState.orderInput,
- },
- type: EnumUserWalletTransactionType.Income,
- };
- let res = await userServices.getPersonalUserTransactions(params, {
- showLoading: !state.loading,
- });
- return res;
- } catch (error) {}
- },
- {
- defaultExtraParams: {
- status: '',
- keywords: '',
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
- },
- columnsRenderProps: {
- transDate: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
- },
- }
-);
-
-async function handleSettlement(row) {}
+async function handleSettlement(row: API.GetStandardOrdersQueryResultItem) {
+ try {
+ await Message.tipMessage(
+ `纭灏�${toThousand(row.settlementAmount)}鍏冪粨绠楃粰${row.supplierEnterpriseName}鍚楋紵`
+ );
+ let params: API.SettlementStandardOrderCommand = {
+ id: row.id,
+ };
+ let res = await standardOrderServices.settlementStandardOrder(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList(paginationState.pageIndex);
+ }
+ } catch (error) {}
+}
const { dialogProps, handleEdit, editForm } = useFormDialog({
defaultFormParams: {
@@ -116,7 +101,7 @@
},
});
-function openDialog(row) {
+function openDialog(row: API.GetStandardOrdersQueryResultItem) {
handleEdit({
id: row.id,
});
--
Gitblit v1.10.0