From 3ae270ee2e6518522dce3153f483b8c5b3d3428d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 16:42:05 +0800
Subject: [PATCH] fix: bug
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 78 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 18 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 440afdb..6748247 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -61,7 +61,7 @@
</QueryFilterItem>
</template>
<template #btn v-if="isSettlement">
- <BlFileUpload
+ <!-- <BlFileUpload
v-model:file-url="form.settlementUrl"
ref="uploadRef"
:showTip="false"
@@ -73,13 +73,13 @@
accept="xlsx,xls"
>
<el-button text type="primary" class="pro-table-operation-btn">瀵煎叆</el-button>
- </BlFileUpload>
+ </BlFileUpload> -->
<el-button type="primary" link @click="handleExport()">瀵煎嚭</el-button>
</template>
</ProTableQueryFilterBar>
<ProTableV2
v-bind="proTableProps"
- :columns="SettlementListColumns"
+ :columns="column"
:operationBtns="operationBtns"
:auto-height="false"
ref="proTable"
@@ -90,7 +90,7 @@
</ProTableV2>
<div class="chuck-add-or-edit-actions">
<el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
- <el-button
+ <!-- <el-button
v-if="
isSettlement &&
(!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
@@ -99,13 +99,13 @@
type="primary"
@click="handleSubmit()"
>缁撶畻鐢宠</el-button
- >
+ > -->
<el-button
- v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+ v-if="isSettlement"
class="chuck-add-or-edit-actions"
type="primary"
@click="handleSubmit()"
- >鎻愪氦缁撶畻</el-button
+ >缁撶畻纭</el-button
>
</div>
</ChunkCell>
@@ -138,7 +138,6 @@
BlFileUpload,
UploadUserFile,
} from '@bole-core/components';
-import { SettlementListColumns } from './constants';
import { useQuery } from '@tanstack/vue-query';
import * as taskServices from '@/services/api/task';
import * as taskUserServices from '@/services/api/taskUser';
@@ -149,6 +148,7 @@
import {
downloadFile,
downloadFileByUrl,
+ hiddenIDNumberForEnd4,
paginateList,
setOssFileName,
setOSSLink,
@@ -162,12 +162,8 @@
const { closeViewPush } = useRouteView();
const eventContext = useGlobalEventContext();
-const operationBtns = defineOperationBtns([
- {
- data: {
- enCode: 'editBtn',
- name: '缂栬緫',
- },
+const operationBtnMap: Record<string, OperationBtnType> = {
+ editBtn: {
emits: {
onClick: (role) => openDialog(role),
},
@@ -175,7 +171,10 @@
hide: () => !isSettlement.value,
},
},
-]);
+};
+const { column, operationBtns, checkSubModuleItemShow } = useAccess({
+ operationBtnMap,
+});
const route = useRoute();
const id = (route.params.id as string) ?? '';
const settlement = (route.query.settlement as string) ?? '';
@@ -199,6 +198,8 @@
auditStatus: '' as any as EnumTaskSettlementAuditStatus,
timeoutServiceFee: 0,
+
+ supplierEnterpriseId: '',
});
const BaseState = {
@@ -234,6 +235,7 @@
form.settlementAccess = res?.detail?.settlementAccess;
form.auditStatus = res?.detail?.auditStatus;
form.timeoutServiceFee = res?.detail?.timeoutServiceFee ?? 0;
+ form.supplierEnterpriseId = res?.detail?.supplierEnterpriseId;
// form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
// form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
}
@@ -311,6 +313,11 @@
},
timeoutFee: { type: 'money' },
otherFee: { type: 'money' },
+ identity: {
+ formatter: (row: API.GetSettlementTaskUsersQueryResultItem) => {
+ return hiddenIDNumberForEnd4(row.identity);
+ },
+ },
},
}
);
@@ -414,6 +421,7 @@
bank: '鎵�灞為摱琛�',
bankBranch: '鎵�灞炴敮琛�',
receiveAccount: '鏀舵璐︽埛',
+ totalWorkHours: '绱宸ユ椂锛堝皬鏃讹級',
settlementAmount: '缁撶畻閲戦',
actualSettlementAmount: '瀹炲彂閲戦',
errorMessage: '閿欒淇℃伅',
@@ -429,13 +437,21 @@
}
function handleSubmit() {
+ let actualList = form.settlementTaskUsers.filter((x) => x.actualSettlementAmount > 0);
+ const actualSettlementAmount = actualList.reduce(
+ (pre, cur) => pre + cur.actualSettlementAmount,
+ 0
+ );
+ const settlementAmount = actualList.reduce((pre, cur) => pre + cur.settlementAmount, 0);
handleSettleEdit({
id: id,
name: form.name,
code: form.code,
- settlementUserCount: form.settlementTaskUsers.length,
- actualSettlementAmount: form.actualSettlementAmount,
+ settlementUserCount: actualList.length,
+ actualSettlementAmount: actualSettlementAmount,
+ settlementAmount: settlementAmount,
settlementAccess: form.settlementAccess,
+ supplierEnterpriseId: form.supplierEnterpriseId,
});
}
@@ -450,13 +466,39 @@
name: '',
code: '',
settlementUserCount: 0,
+ settlementAmount: 0,
actualSettlementAmount: 0,
settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ supplierEnterpriseId: '',
},
});
async function handleSettle() {
- sureTaskSettlementOrder();
+ auditTaskSettlement();
+}
+
+async function auditTaskSettlement() {
+ try {
+ let params: API.AuditTaskSettlementCommand = {
+ id: id,
+ auditStatus: EnumTaskSettlementAuditStatus.Pass,
+ rosters: form.settlementTaskUsers.map((item) => ({
+ id: item.id,
+ serviceFee: item.serviceFee,
+ timeoutHours: item.timeoutHours,
+ timeoutFee: item.timeoutFee,
+ otherFee: item.otherFee,
+ remark: item.remark,
+ settlementAmount: item.settlementAmount,
+ })),
+ };
+ let res = await taskServices.auditTaskSettlement(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ eventContext.emit('sureTaskSettlementOrder');
+ handleBack();
+ }
+ } catch (error) {}
}
async function sureTaskSettlementOrder() {
--
Gitblit v1.9.1