From 3f4d122ac2da38b068e31c210acc455b0388c211 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 16:52:05 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 1a8e273..2046563 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -91,6 +91,20 @@
<div class="chuck-add-or-edit-actions">
<el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
<el-button
+ v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait"
+ class="chuck-add-or-edit-actions"
+ type="primary"
+ @click="handleSubmit()"
+ >缁撶畻鐢宠</el-button
+ >
+ <el-button
+ v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+ class="chuck-add-or-edit-actions"
+ type="primary"
+ @click="handleSubmit()"
+ >鎻愪氦缁撶畻</el-button
+ >
+ <el-button
v-if="isSettlement"
class="chuck-add-or-edit-actions"
type="primary"
@@ -134,7 +148,7 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
-import { SettlementReceiveStatusText } from '@/constants';
+import { SettlementReceiveStatusText, EnumTaskSettlementAuditStatus } from '@/constants';
import {
downloadFile,
downloadFileByUrl,
@@ -168,7 +182,7 @@
const route = useRoute();
const id = (route.params.id as string) ?? '';
const settlement = (route.query.settlement as string) ?? '';
-const settlementAccess = route.query.settlementAccess ?? '';
+// const settlementAccess = route.query.settlementAccess ?? '';
const isSettlement = computed(() => !!settlement);
const form = reactive({
@@ -182,7 +196,10 @@
settlementUrl: [] as UploadUserFile[],
- settlementAccess: settlementAccess,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ isSettlement: isSettlement.value,
+
+ auditStatus: '' as any as EnumTaskSettlementAuditStatus,
});
const BaseState = {
@@ -192,13 +209,16 @@
const state = reactive({ ...BaseState });
const { isLoading, refetch } = useQuery({
- queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'settlementAccess')],
+ queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'isSettlement')],
queryFn: async () => {
let params: API.APIgetSettlementTaskUsersParams = {
id: id,
};
- if (form.settlementAccess) {
- params.settlementAccess = Number(form.settlementAccess);
+ // if (form.settlementAccess) {
+ // params.settlementAccess = Number(form.settlementAccess);
+ // }
+ if (form.isSettlement) {
+ params.isImport = true;
}
return await taskUserServices.getSettlementTaskUsers(params, {
showLoading: false,
@@ -212,6 +232,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 ?? '';
}
@@ -295,7 +317,7 @@
receiveAccount: '',
bank: '',
totalWorkHours: null as number,
- settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ settlementAccess: form.settlementAccess,
// bankBranch: '',
},
});
@@ -309,7 +331,7 @@
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
totalWorkHours: null as number,
- settlementAccess: Number(form.settlementAccess),
+ settlementAccess: form.settlementAccess,
// bankBranch: row?.bankBranch ?? '',
});
}
@@ -329,7 +351,7 @@
let res = await taskServices.editTaskSettlementOrderRoster(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
- form.settlementAccess = '';
+ form.isSettlement = false;
refetch();
getList(paginationState.pageIndex);
}
@@ -351,7 +373,7 @@
let res = await taskServices.importTaskSettlementOrderRosters(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
- form.settlementAccess = '';
+ form.isSettlement = false;
refetch();
getList(paginationState.pageIndex);
if (res?.errors?.length > 0) {
@@ -387,6 +409,7 @@
code: form.code,
settlementUserCount: form.settlementTaskUsers.length,
actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: form.settlementAccess,
});
}
@@ -402,6 +425,7 @@
code: '',
settlementUserCount: 0,
actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
},
});
--
Gitblit v1.9.1