From 14f396c8ce2eff17a39c662e8f77a0ee5f32d6fd Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 13 十一月 2025 18:17:21 +0800
Subject: [PATCH] fix: bug
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 198 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 161 insertions(+), 37 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 21a8b34..9b41992 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,19 @@
accept="xlsx,xls"
>
<el-button text type="primary" class="pro-table-operation-btn">瀵煎叆</el-button>
- </BlFileUpload>
- <el-button type="primary" link @click="handleExport()">瀵煎嚭</el-button>
+ </BlFileUpload> -->
+ <el-button
+ v-if="checkSubModuleItemShow('pageButton', 'exportBtn')"
+ type="primary"
+ link
+ @click="handleExport()"
+ >瀵煎嚭</el-button
+ >
</template>
</ProTableQueryFilterBar>
<ProTableV2
v-bind="proTableProps"
- :columns="SettlementListColumns"
+ :columns="column"
:operationBtns="operationBtns"
:auto-height="false"
ref="proTable"
@@ -97,14 +103,14 @@
"
class="chuck-add-or-edit-actions"
type="primary"
- @click="handleSubmit()"
- >缁撶畻鐢宠</el-button
+ @click="handleSubmit('confirm')"
+ >缁撶畻纭</el-button
>
<el-button
v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
class="chuck-add-or-edit-actions"
type="primary"
- @click="handleSubmit()"
+ @click="handleSubmit('submit')"
>鎻愪氦缁撶畻</el-button
>
</div>
@@ -112,6 +118,7 @@
</AppScrollContainer>
<EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog>
<SettleDetailDialog v-bind="dialogSettleProps" />
+ <ResettleEditDialog v-bind="dialogResettleProps" />
</LoadingLayout>
</template>
<script setup lang="ts">
@@ -138,12 +145,12 @@
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';
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
+import ResettleEditDialog from './components/ResettleEditDialog.vue';
import { Message } from '@bole-core/core';
import { SettlementReceiveStatusText, EnumTaskSettlementAuditStatus } from '@/constants';
import {
@@ -162,20 +169,35 @@
const { closeViewPush } = useRouteView();
const eventContext = useGlobalEventContext();
-const operationBtns = defineOperationBtns([
- {
- data: {
- enCode: 'editBtn',
- name: '缂栬緫',
- },
+
+const operationBtnMap: Record<string, OperationBtnType> = {
+ editBtn: {
emits: {
onClick: (role) => openDialog(role),
},
extraProps: {
- hide: () => !isSettlement.value,
+ hide: (row: API.GetSettlementTaskUsersQueryResultItem) =>
+ !(
+ (row.settlementReceiveStatus === SettlementReceiveStatus.Refunded &&
+ form.auditStatus === EnumTaskSettlementAuditStatus.Pass) ||
+ form.auditStatus === EnumTaskSettlementAuditStatus.Wait
+ ),
},
},
-]);
+ reSettleBtn: {
+ emits: {
+ onClick: (role) => againSureTaskSettlementOrderRoster(role),
+ },
+ extraProps: {
+ hide: (row: API.GetSettlementTaskUsersQueryResultItem) =>
+ row.settlementReceiveStatus !== SettlementReceiveStatus.Refunded,
+ },
+ },
+};
+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 +221,8 @@
auditStatus: '' as any as EnumTaskSettlementAuditStatus,
timeoutServiceFee: 0,
+
+ settlementStatus: '' as any as EnumTaskSettlementStatus,
});
const BaseState = {
@@ -234,6 +258,7 @@
form.settlementAccess = res?.detail?.settlementAccess;
form.auditStatus = res?.detail?.auditStatus;
form.timeoutServiceFee = res?.detail?.timeoutServiceFee ?? 0;
+ form.settlementStatus = res?.detail?.settlementStatus;
// form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
// form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
}
@@ -337,22 +362,33 @@
function openDialog(row?: API.GetSettlementTaskUsersQueryResultItem) {
if (row) {
- handleEdit({
- id: row?.id,
- settlementAmount: row?.settlementAmount ?? null,
- actualSettlementAmount: row?.actualSettlementAmount ?? null,
- receiveAccount: row?.receiveAccount ?? '',
- bank: row?.bank ?? '',
- // totalWorkHours: row?.totalWorkHours ?? null,
- settlementAccess: form.settlementAccess,
- // bankBranch: row?.bankBranch ?? '',
- timeoutServiceFee: form.timeoutServiceFee,
- serviceFee: row?.serviceFee ?? 0,
- timeoutHours: row?.timeoutHours ?? null,
- timeoutFee: row?.timeoutFee ?? null,
- otherFee: row?.otherFee ?? null,
- remark: row?.remark ?? '',
- });
+ if (isSettlement) {
+ handleEdit({
+ id: row?.id,
+ settlementAmount: row?.settlementAmount ?? null,
+ actualSettlementAmount: row?.actualSettlementAmount ?? null,
+ receiveAccount: row?.receiveAccount ?? '',
+ bank: row?.bank ?? '',
+ // totalWorkHours: row?.totalWorkHours ?? null,
+ settlementAccess: form.settlementAccess,
+ // bankBranch: row?.bankBranch ?? '',
+ timeoutServiceFee: form.timeoutServiceFee,
+ serviceFee: row?.serviceFee ?? 0,
+ timeoutHours: row?.timeoutHours ?? null,
+ timeoutFee: row?.timeoutFee ?? null,
+ otherFee: row?.otherFee ?? null,
+ remark: row?.remark ?? '',
+ });
+ } else {
+ handleResettleEdit({
+ id: row?.id,
+ name: row?.name ?? '',
+ bank: row?.bank ?? '',
+ bankBranch: row?.bankBranch ?? '',
+ receiveAccount: row?.receiveAccount ?? '',
+ remark: row?.remark ?? '',
+ });
+ }
}
}
@@ -429,14 +465,21 @@
}
}
-function handleSubmit() {
+function handleSubmit(submitStatus: string) {
+ 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,
- settlementAmount: form.settlementAmount,
+ submitStatus: submitStatus,
+ settlementUserCount: actualList.length,
+ actualSettlementAmount: actualSettlementAmount,
+ settlementAmount: settlementAmount,
settlementAccess: form.settlementAccess,
});
}
@@ -451,6 +494,7 @@
id: '',
name: '',
code: '',
+ submitStatus: '',
settlementUserCount: 0,
settlementAmount: 0,
actualSettlementAmount: 0,
@@ -459,7 +503,37 @@
});
async function handleSettle() {
- sureTaskSettlementOrder();
+ if (settleEditForm.submitStatus === 'confirm') {
+ auditTaskSettlement();
+ }
+ if (settleEditForm.submitStatus === 'submit') {
+ sureTaskSettlementOrder();
+ }
+}
+
+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();
+ refetch();
+ }
+ } catch (error) {}
}
async function sureTaskSettlementOrder() {
@@ -496,6 +570,56 @@
{ leading: true, trailing: false }
);
+const {
+ dialogProps: dialogResettleProps,
+ handleEdit: handleResettleEdit,
+ editForm: resettleEditForm,
+} = useFormDialog({
+ onConfirm: handleResettle,
+ defaultFormParams: {
+ id: '',
+ name: '',
+ bank: '',
+ bankBranch: '',
+ receiveAccount: '',
+ remark: '',
+ },
+});
+
+async function handleResettle() {
+ try {
+ let params: API.EditTaskSettlementOrderRosterCommand = {
+ id: id,
+ bank: resettleEditForm.bank,
+ bankBranch: resettleEditForm.bankBranch,
+ receiveAccount: resettleEditForm.receiveAccount,
+ remark: resettleEditForm.remark,
+ settlementAmount: 0,
+ actualSettlementAmount: 0,
+ };
+ let res = await taskServices.editTaskSettlementOrderRoster(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ refetch();
+ getList(paginationState.pageIndex);
+ }
+ } catch (error) {}
+}
+
+async function againSureTaskSettlementOrderRoster(row: API.GetSettlementTaskUsersQueryResultItem) {
+ try {
+ let params: API.AgainSureTaskSettlementOrderRosterCommand = {
+ id: row.id,
+ };
+ let res = await taskServices.againSureTaskSettlementOrderRoster(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ refetch();
+ getList(paginationState.pageIndex);
+ }
+ } catch (error) {}
+}
+
function handleBack() {
closeViewPush(route, {
name: 'ServiceChargeManageList',
--
Gitblit v1.9.1