From 336441bd3d811427f957654f12936c4cab9b4c1a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 16:42:00 +0800
Subject: [PATCH] fix: bug
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 104 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 0a1e4dd..97363ae 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -74,12 +74,18 @@
>
<el-button text type="primary" class="pro-table-operation-btn">瀵煎叆</el-button>
</BlFileUpload> -->
- <el-button type="primary" link @click="handleExport()">瀵煎嚭</el-button>
+ <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"
@@ -90,21 +96,21 @@
</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)
"
class="chuck-add-or-edit-actions"
type="primary"
- @click="handleSubmit()"
- >缁撶畻鐢宠</el-button
- > -->
+ @click="handleSubmit('confirm')"
+ >缁撶畻纭</el-button
+ >
<el-button
- v-if="isSettlement"
+ v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
class="chuck-add-or-edit-actions"
type="primary"
- @click="handleSubmit()"
+ @click="handleSubmit('submit')"
>鎻愪氦缁撶畻</el-button
>
</div>
@@ -139,7 +145,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';
@@ -151,6 +156,7 @@
import {
downloadFile,
downloadFileByUrl,
+ hiddenIDNumberForEnd4,
paginateList,
setOssFileName,
setOSSLink,
@@ -164,25 +170,22 @@
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: (row: API.GetSettlementTaskUsersQueryResultItem) =>
- row.settlementReceiveStatus !== SettlementReceiveStatus.Refunded,
+ !(
+ (row.settlementReceiveStatus === SettlementReceiveStatus.Refunded &&
+ form.auditStatus === EnumTaskSettlementAuditStatus.Pass) ||
+ form.auditStatus === EnumTaskSettlementAuditStatus.Wait
+ ),
},
},
- {
- data: {
- enCode: 'editBtn',
- name: '閲嶆柊缁撶畻',
- },
+ reSettleBtn: {
emits: {
onClick: (role) => againSureTaskSettlementOrderRoster(role),
},
@@ -191,7 +194,11 @@
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) ?? '';
@@ -330,6 +337,11 @@
},
timeoutFee: { type: 'money' },
otherFee: { type: 'money' },
+ identity: {
+ formatter: (row: API.GetSettlementTaskUsersQueryResultItem) => {
+ return hiddenIDNumberForEnd4(row.identity);
+ },
+ },
},
}
);
@@ -459,14 +471,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,
});
}
@@ -481,6 +500,7 @@
id: '',
name: '',
code: '',
+ submitStatus: '',
settlementUserCount: 0,
settlementAmount: 0,
actualSettlementAmount: 0,
@@ -489,7 +509,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() {
--
Gitblit v1.9.1