From cc76c7d2eff14915f01cfe5fdef7c8951945bf05 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 16 九月 2025 16:49:42 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index dd0843d..80760a2 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -134,7 +134,14 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
-import { downloadFile, paginateList, setOssFileName, toThousand } from '@/utils';
+import {
+ downloadFile,
+ downloadFileByUrl,
+ paginateList,
+ setOssFileName,
+ setOSSLink,
+ toThousand,
+} from '@/utils';
import _ from 'lodash';
defineOptions({
@@ -152,12 +159,14 @@
emits: {
onClick: (role) => openDialog(role),
},
+ extraProps: {
+ hide: () => !isSettlement.value,
+ },
},
]);
const route = useRoute();
const id = (route.params.id as string) ?? '';
const settlement = (route.query.settlement as string) ?? '';
-
const isSettlement = computed(() => !!settlement);
const form = reactive({
@@ -178,7 +187,7 @@
const state = reactive({ ...BaseState });
-const { isLoading } = useQuery({
+const { isLoading, refetch } = useQuery({
queryKey: ['taskUserServices/getSettlementTaskUsers', id],
queryFn: async () => {
return await taskUserServices.getSettlementTaskUsers(
@@ -196,8 +205,8 @@
form.settlementAmount = res?.detail?.settlementAmount ?? 0;
form.actualSettlementAmount = res?.detail?.actualSettlementAmount ?? 0;
form.code = res?.detail?.code;
- form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
- form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
+ // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
+ // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
}
// if (res?.errors?.length > 0) {
// Message.tipMessage('瀛樺湪瀵煎叆閿欒鐨勬暟鎹紝鏄惁瀵煎嚭锛�').then(() => {
@@ -307,6 +316,7 @@
let res = await taskServices.editTaskSettlementOrderRoster(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
+ refetch();
getList(paginationState.pageIndex);
}
} catch (error) {}
@@ -327,6 +337,7 @@
let res = await taskServices.importTaskSettlementOrderRosters(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
+ refetch();
getList(paginationState.pageIndex);
if (res?.errors?.length > 0) {
Message.tipMessage('瀛樺湪瀵煎叆閿欒鐨勬暟鎹紝鏄惁瀵煎嚭锛�').then(() => {
@@ -399,22 +410,17 @@
const handleExport = _.debounce(
async () => {
- // if (paginationState.total === 0) {
- // Message.warnMessage('娌℃湁鏁版嵁鍙互瀵煎嚭鍝');
- // return;
- // }
+ if (paginationState.total === 0) {
+ Message.warnMessage('娌℃湁鏁版嵁鍙互瀵煎嚭鍝');
+ return;
+ }
try {
let params: API.ExportTaskSettlementOrderRostersCommand = {
id: id,
};
- let res = await taskServices.exportTaskSettlementOrderRosters(params, {
- responseType: 'blob',
- getResponse: true,
- });
+ let res = await taskServices.exportTaskSettlementOrderRosters(params);
if (res) {
- console.log('res: ', res);
- //@ts-ignore
- downloadFile(res?.data, `${form.name}-${form.code}`, 'xlsx');
+ downloadFileByUrl(setOSSLink(res), `${form.name}-${form.code}`);
}
} catch (error) {}
},
--
Gitblit v1.9.1