From dbfe744e5136c1d5977b233a8f12ed0efccc4d3c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 20:01:44 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 80760a2..c6b8b7e 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -91,11 +91,21 @@
<div class="chuck-add-or-edit-actions">
<el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
<el-button
- v-if="isSettlement"
+ v-if="
+ isSettlement &&
+ (!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
+ "
class="chuck-add-or-edit-actions"
type="primary"
@click="handleSubmit()"
- >缁撶畻</el-button
+ >缁撶畻鐢宠</el-button
+ >
+ <el-button
+ v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+ class="chuck-add-or-edit-actions"
+ type="primary"
+ @click="handleSubmit()"
+ >鎻愪氦缁撶畻</el-button
>
</div>
</ChunkCell>
@@ -134,6 +144,7 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
+import { SettlementReceiveStatusText, EnumTaskSettlementAuditStatus } from '@/constants';
import {
downloadFile,
downloadFileByUrl,
@@ -167,6 +178,7 @@
const route = useRoute();
const id = (route.params.id as string) ?? '';
const settlement = (route.query.settlement as string) ?? '';
+// const settlementAccess = route.query.settlementAccess ?? '';
const isSettlement = computed(() => !!settlement);
const form = reactive({
@@ -179,6 +191,11 @@
settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
settlementUrl: [] as UploadUserFile[],
+
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ isSettlement: isSettlement.value,
+
+ auditStatus: '' as any as EnumTaskSettlementAuditStatus,
});
const BaseState = {
@@ -188,14 +205,20 @@
const state = reactive({ ...BaseState });
const { isLoading, refetch } = useQuery({
- queryKey: ['taskUserServices/getSettlementTaskUsers', id],
+ queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'isSettlement')],
queryFn: async () => {
- return await taskUserServices.getSettlementTaskUsers(
- { id: id },
- {
- showLoading: false,
- }
- );
+ let params: API.APIgetSettlementTaskUsersParams = {
+ id: id,
+ };
+ // if (form.settlementAccess) {
+ // params.settlementAccess = Number(form.settlementAccess);
+ // }
+ if (form.isSettlement) {
+ params.isImport = true;
+ }
+ return await taskUserServices.getSettlementTaskUsers(params, {
+ showLoading: false,
+ });
},
placeholderData: () => ({} as API.GetSettlementTaskUsersQueryResult),
onSuccess(res) {
@@ -205,6 +228,8 @@
form.settlementAmount = res?.detail?.settlementAmount ?? 0;
form.actualSettlementAmount = res?.detail?.actualSettlementAmount ?? 0;
form.code = res?.detail?.code;
+ form.settlementAccess = res?.detail?.settlementAccess;
+ form.auditStatus = res?.detail?.auditStatus;
// form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
// form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
}
@@ -274,6 +299,7 @@
settlementTime: { type: 'date' },
settlementAmount: { type: 'money' },
actualSettlementAmount: { type: 'money' },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
},
}
);
@@ -286,7 +312,9 @@
actualSettlementAmount: null as number,
receiveAccount: '',
bank: '',
- bankBranch: '',
+ totalWorkHours: null as number,
+ settlementAccess: form.settlementAccess,
+ // bankBranch: '',
},
});
@@ -298,7 +326,9 @@
actualSettlementAmount: row?.actualSettlementAmount ?? null,
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
- bankBranch: row?.bankBranch ?? '',
+ totalWorkHours: row?.totalWorkHours ?? null,
+ settlementAccess: form.settlementAccess,
+ // bankBranch: row?.bankBranch ?? '',
});
}
}
@@ -311,11 +341,13 @@
actualSettlementAmount: editForm.actualSettlementAmount,
receiveAccount: editForm.receiveAccount,
bank: editForm.bank,
- bankBranch: editForm.bankBranch,
+ totalWorkHours: editForm.totalWorkHours,
+ // bankBranch: editForm.bankBranch,
};
let res = await taskServices.editTaskSettlementOrderRoster(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
+ form.isSettlement = false;
refetch();
getList(paginationState.pageIndex);
}
@@ -337,6 +369,7 @@
let res = await taskServices.importTaskSettlementOrderRosters(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
+ form.isSettlement = false;
refetch();
getList(paginationState.pageIndex);
if (res?.errors?.length > 0) {
@@ -347,12 +380,12 @@
workbookHeaderMap: {
name: '濮撳悕',
identity: '韬唤璇佸彿',
- taskName: '浠诲姟鍚嶇О',
+ contactPhoneNumber: '鎵嬫満鍙�',
+ bank: '鎵�灞為摱琛�',
+ bankBranch: '鎵�灞炴敮琛�',
+ receiveAccount: '鏀舵璐︽埛',
settlementAmount: '缁撶畻閲戦',
actualSettlementAmount: '瀹炲彂閲戦',
- receiveAccount: '鏀舵璐︽埛',
- bank: '鎵�灞為摱琛�',
- bankBranch: '寮�鎴锋敮琛屽悕绉�',
errorMessage: '閿欒淇℃伅',
},
});
@@ -372,6 +405,7 @@
code: form.code,
settlementUserCount: form.settlementTaskUsers.length,
actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: form.settlementAccess,
});
}
@@ -387,6 +421,7 @@
code: '',
settlementUserCount: 0,
actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
},
});
--
Gitblit v1.9.1