From cbcc6a8eecfc19e93da08500dcc898efdabf7836 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:38:45 +0800
Subject: [PATCH] fix: s
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 465 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 381 insertions(+), 84 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index ad92f39..440afdb 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -2,11 +2,6 @@
<LoadingLayout :loading="isLoading">
<AppScrollContainer>
<ChunkCell title="缁撶畻鍗曡鎯�">
- <template #titleRight>
- <el-button type="primary" icon="Download" @click="handleDownloadTemplate()"
- >鐢靛瓙鍥炲崟涓嬭浇</el-button
- >
- </template>
<ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
<ProFormCol>
<ProFormColItem :span="8">
@@ -15,83 +10,71 @@
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="浠诲姟缂栧彿:" prop="name">
- <ProFormText v-model="form.name"> </ProFormText>
+ <ProFormItemV2 label="浠诲姟缂栧彿:" prop="code">
+ <ProFormText v-model="form.code"> </ProFormText>
</ProFormItemV2>
</ProFormColItem>
- <ProFormColItem :span="8"></ProFormColItem>
</ProFormCol>
- <ProFormCol>
+ <!-- <ProFormCol>
<ProFormColItem :span="8">
- <ProFormItemV2 label="缁撶畻鍗曞悕绉�:" prop="name">
- <ProFormText v-model="form.name"> </ProFormText>
+ <ProFormItemV2 label="缁撶畻鍗曞悕绉�:" prop="settlementOrderName">
+ <ProFormText v-model="form.settlementOrderName"> </ProFormText>
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="涓婁紶鏃堕棿:" prop="name">
+ <ProFormItemV2 label="涓婁紶鏃堕棿:" prop="settlementOrderTime">
<ProFormDatePicker
- v-model="form.name"
+ v-model="form.settlementOrderTime"
type="date"
format="YYYY-MM-DD HH:mm"
></ProFormDatePicker>
</ProFormItemV2>
</ProFormColItem>
- <ProFormColItem :span="8"></ProFormColItem>
- </ProFormCol>
+ </ProFormCol> -->
<ProFormCol>
<ProFormColItem :span="8">
- <ProFormItemV2 label="缁撶畻閲戦:" prop="money">
- <ProFormInputNumber v-model="form.money"> </ProFormInputNumber>
+ <ProFormItemV2 label="缁撶畻閲戦:" prop="settlementAmount">
+ <ProFormInputNumber v-model="form.settlementAmount" format-value="money">
+ </ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="瀹炲彂閲戦:" prop="money">
- <ProFormInputNumber v-model="form.money"> </ProFormInputNumber>
- </ProFormItemV2>
- </ProFormColItem>
- <ProFormColItem :span="8">
- <ProFormItemV2 label="鐘舵��:" prop="status">
- <ProFormRadio v-model="form.status" :value-enum="[{ label: '鏄�', value: 1 }]">
- </ProFormRadio>
+ <ProFormItemV2 label="瀹炲彂閲戦:" prop="actualSettlementAmount">
+ <ProFormInputNumber v-model="form.actualSettlementAmount" format-value="money">
+ </ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
</ProForm>
</ChunkCell>
- <ChunkCell title="缁撶畻娴佺▼">
- <div class="step-wrapper">
- <el-steps :active="1" align-center finish-status="process">
- <el-step title="缁撶畻鍗曚笂浼�" :icon="Edit">
- <template #description>
- <div>鍒涘缓浜�:{{ form.name }}</div>
- <div>鏃堕棿:{{ form.name }}</div>
- <TextOverTooltip>澶囨敞:{{ form.name }}</TextOverTooltip>
- </template>
- </el-step>
- <el-step title="缁撶畻浠樻" :icon="Upload">
- <template #description>
- <div>鍒涘缓浜�:{{ form.name }}</div>
- <div>鏃堕棿:{{ form.name }}</div>
- <TextOverTooltip
- >澶囨敞:{{ 'form.nameform.nameform.eform.nameform.nameform.name' }}</TextOverTooltip
- >
- </template>
- </el-step>
- </el-steps>
- </div>
- </ChunkCell>
- <ChunkCell title="缁撶畻鍚嶅崟">
+ <ChunkCell title="缁撶畻鍚嶅崟" style="flex: 1" class="settlement-user-list-chunk">
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
<QueryFilterItem>
<SearchInput
- v-model="extraParamState.searchWord"
+ v-model="extraParamState.keywords"
style="width: 300px"
- placeholder="浜哄憳濮撳悕/韬唤璇佸彿/鎵嬫満鍙�"
+ placeholder="濮撳悕/鎵嬫満/韬唤璇佸彿/瀹㈡埛"
@on-click-search="getList"
>
</SearchInput>
</QueryFilterItem>
+ </template>
+ <template #btn v-if="isSettlement">
+ <BlFileUpload
+ v-model:file-url="form.settlementUrl"
+ ref="uploadRef"
+ :showTip="false"
+ :show-file-list="false"
+ class="pro-table-operation-btn upload-style-btn"
+ :on-success="(event) => handleUploadSuccess(event)"
+ :limitFileSize="null"
+ :limit="1"
+ 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>
</template>
</ProTableQueryFilterBar>
<ProTableV2
@@ -105,13 +88,36 @@
}"
>
</ProTableV2>
+ <div class="chuck-add-or-edit-actions">
+ <el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</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
+ >
+ <el-button
+ v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+ class="chuck-add-or-edit-actions"
+ type="primary"
+ @click="handleSubmit()"
+ >鎻愪氦缁撶畻</el-button
+ >
+ </div>
</ChunkCell>
</AppScrollContainer>
+ <EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog>
+ <SettleDetailDialog v-bind="dialogSettleProps" />
</LoadingLayout>
</template>
<script setup lang="ts">
import {
LoadingLayout,
+ AppContainer,
AppScrollContainer,
ChunkCell,
ProForm,
@@ -121,54 +127,137 @@
ProFormColItem,
ProFormDatePicker,
ProFormInputNumber,
- ProFormRadio,
useTable,
ProTableV2,
defineOperationBtns,
SearchInput,
QueryFilterItem,
ProTableQueryFilterBar,
- TextOverTooltip,
+ useFormDialog,
+ XLSXUtils,
+ BlFileUpload,
+ UploadUserFile,
} from '@bole-core/components';
-import { Edit, Upload } from '@element-plus/icons-vue';
import { SettlementListColumns } from './constants';
import { useQuery } from '@tanstack/vue-query';
-import { downloadFileByUrl, OrderInputType } from '@bole-core/core';
+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 { Message } from '@bole-core/core';
+import { SettlementReceiveStatusText, EnumTaskSettlementAuditStatus } from '@/constants';
+import {
+ downloadFile,
+ downloadFileByUrl,
+ paginateList,
+ setOssFileName,
+ setOSSLink,
+ toThousand,
+} from '@/utils';
+import _ from 'lodash';
defineOptions({
name: 'ServiceChargeDetail',
});
+const { closeViewPush } = useRouteView();
+const eventContext = useGlobalEventContext();
const operationBtns = defineOperationBtns([
{
data: {
- enCode: 'downloadBtn',
- name: '涓嬭浇鍥炲崟',
+ enCode: 'editBtn',
+ name: '缂栬緫',
+ },
+ emits: {
+ onClick: (role) => openDialog(role),
+ },
+ extraProps: {
+ hide: () => !isSettlement.value,
},
},
]);
-
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({
name: '',
- money: 0,
- status: 1,
+ settlementAmount: 0,
+ actualSettlementAmount: 0,
+ code: '',
+ settlementOrderName: '',
+ settlementOrderTime: '',
+ settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
+
+ settlementUrl: [] as UploadUserFile[],
+
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ isSettlement: isSettlement.value,
+
+ auditStatus: '' as any as EnumTaskSettlementAuditStatus,
+
+ timeoutServiceFee: 0,
});
-const { isLoading } = useQuery({
- queryKey: ['flexTaskServices/getFlexTaskDetail', id],
+const BaseState = {
+ loading: true,
+};
+
+const state = reactive({ ...BaseState });
+
+const { isLoading, refetch } = useQuery({
+ queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'isSettlement')],
queryFn: async () => {
- return await flexTaskServices.getFlexTaskDetail(
- { 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.GetFlexTaskDetailForBackOutput),
- onSuccess(data) {},
+ placeholderData: () => ({} as API.GetSettlementTaskUsersQueryResult),
+ onSuccess(res) {
+ form.settlementTaskUsers = res?.data ?? [];
+ if (res?.detail) {
+ form.name = res?.detail?.name;
+ 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.timeoutServiceFee = res?.detail?.timeoutServiceFee ?? 0;
+ // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
+ // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
+ }
+ // if (res?.errors?.length > 0) {
+ // Message.tipMessage('瀛樺湪瀵煎叆閿欒鐨勬暟鎹紝鏄惁瀵煎嚭锛�').then(() => {
+ // XLSXUtils.exportToXLSX({
+ // workbookDataList: res.errors,
+ // fileName: '缁撶畻瀵煎叆-閿欒鏁版嵁',
+ // workbookHeaderMap: {
+ // name: '濮撳悕',
+ // identity: '韬唤璇佸彿',
+ // taskName: '浠诲姟鍚嶇О',
+ // settlementAmount: '缁撶畻閲戦',
+ // actualSettlementAmount: '瀹炲彂閲戦',
+ // receiveAccount: '鏀舵璐︽埛',
+ // bank: '鎵�灞為摱琛�',
+ // bankBranch: '寮�鎴锋敮琛屽悕绉�',
+ // errorMessage: '閿欒淇℃伅',
+ // },
+ // });
+ // });
+ // }
+ getList();
+ },
enabled: !!id,
});
@@ -181,38 +270,234 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetFlexEnterpriseInput = {
+ let list = [...form.settlementTaskUsers];
+ if (extraParamState.keywords) {
+ list = list?.filter((item) => {
+ return (
+ item.name.includes(extraParamState.keywords) ||
+ item.contactPhoneNumber.includes(extraParamState.keywords) ||
+ item.identity.includes(extraParamState.keywords)
+ );
+ });
+ }
+
+ return Promise.resolve({
pageModel: {
rows: pageSize,
page: pageIndex,
- orderInput: extraParamState.orderInput,
+ totalCount: list.length,
},
- searchWord: extraParamState.searchWord,
- };
-
- let res = await flexEnterpriseServices.getFlexEnterpriseList(params);
- return res;
+ data: paginateList(list, pageIndex, pageSize),
+ });
} catch (error) {
console.log('error: ', error);
}
},
{
defaultExtraParams: {
- searchWord: '',
- orderInput: [{ property: 'id', order: OrderInputType.Desc }],
+ keywords: '',
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- queryKey: ['flexEnterpriseServices/getFlexEnterpriseList'],
- columnsRenderProps: {},
+ queryKey: ['taskUserServices/getSettlementTaskUsers'],
+ columnsRenderProps: {
+ settlementTime: { type: 'date' },
+ settlementAmount: { type: 'money' },
+ actualSettlementAmount: { type: 'money' },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
+ serviceFee: { type: 'money' },
+ timeoutHours: {
+ formatter: (row: API.GetSettlementTaskUsersQueryResultItem) =>
+ row.timeoutHours ? `${row.timeoutHours}灏忔椂` : '',
+ },
+ timeoutFee: { type: 'money' },
+ otherFee: { type: 'money' },
+ },
}
);
-function handleDownloadTemplate() {
- downloadFileByUrl('', '鐢靛瓙鍥炲崟');
+const { dialogProps, handleAdd, handleEdit, editForm } = useFormDialog({
+ onConfirm: handleAddOrEdit,
+ defaultFormParams: {
+ id: '',
+ settlementAmount: null as number,
+ actualSettlementAmount: null as number,
+ receiveAccount: '',
+ bank: '',
+ // totalWorkHours: null as number,
+ settlementAccess: form.settlementAccess,
+ // bankBranch: '',
+ timeoutServiceFee: 0,
+ serviceFee: null as number,
+ timeoutHours: null as number,
+ timeoutFee: null as number,
+ otherFee: null as number,
+ remark: '',
+ },
+});
+
+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 ?? '',
+ });
+ }
}
-onMounted(() => {
- getList();
+async function handleAddOrEdit() {
+ try {
+ const settlementAmount =
+ (editForm.timeoutFee ?? 0) + (editForm.serviceFee ?? 0) + (editForm.otherFee ?? 0);
+ let params: API.EditTaskSettlementOrderRosterCommand = {
+ id: editForm.id,
+ settlementAmount: settlementAmount,
+ actualSettlementAmount: editForm.actualSettlementAmount,
+ receiveAccount: editForm.receiveAccount,
+ bank: editForm.bank,
+ // totalWorkHours: editForm.totalWorkHours,
+ // bankBranch: editForm.bankBranch,
+ serviceFee: editForm.serviceFee,
+ timeoutHours: editForm.timeoutHours,
+ timeoutFee: editForm.timeoutFee,
+ otherFee: editForm.otherFee,
+ remark: editForm.remark,
+ };
+ let res = await taskServices.editTaskSettlementOrderRoster(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ form.isSettlement = false;
+ refetch();
+ getList(paginationState.pageIndex);
+ }
+ } catch (error) {}
+}
+
+function handleUploadSuccess(response: UploadUserFile & { file: File & { uid: number } }) {
+ if (response.path) {
+ importTaskSettlementOrderRosters(response.path);
+ }
+}
+
+async function importTaskSettlementOrderRosters(url: string) {
+ try {
+ let params: API.ImportTaskSettlementOrderRostersCommand = {
+ id: id,
+ url: url,
+ };
+ let res = await taskServices.importTaskSettlementOrderRosters(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ form.isSettlement = false;
+ refetch();
+ getList(paginationState.pageIndex);
+ if (res?.errors?.length > 0) {
+ Message.tipMessage('瀛樺湪瀵煎叆閿欒鐨勬暟鎹紝鏄惁瀵煎嚭锛�').then(() => {
+ XLSXUtils.exportToXLSX({
+ workbookDataList: res.errors,
+ fileName: '缁撶畻瀵煎叆-閿欒鏁版嵁',
+ workbookHeaderMap: {
+ name: '濮撳悕',
+ identity: '韬唤璇佸彿',
+ contactPhoneNumber: '鎵嬫満鍙�',
+ bank: '鎵�灞為摱琛�',
+ bankBranch: '鎵�灞炴敮琛�',
+ receiveAccount: '鏀舵璐︽埛',
+ settlementAmount: '缁撶畻閲戦',
+ actualSettlementAmount: '瀹炲彂閲戦',
+ errorMessage: '閿欒淇℃伅',
+ },
+ });
+ });
+ }
+ }
+ } catch (error) {
+ } finally {
+ form.settlementUrl = [] as UploadUserFile[];
+ }
+}
+
+function handleSubmit() {
+ handleSettleEdit({
+ id: id,
+ name: form.name,
+ code: form.code,
+ settlementUserCount: form.settlementTaskUsers.length,
+ actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: form.settlementAccess,
+ });
+}
+
+const {
+ dialogProps: dialogSettleProps,
+ handleEdit: handleSettleEdit,
+ editForm: settleEditForm,
+} = useFormDialog({
+ onConfirm: handleSettle,
+ defaultFormParams: {
+ id: '',
+ name: '',
+ code: '',
+ settlementUserCount: 0,
+ actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ },
});
+
+async function handleSettle() {
+ sureTaskSettlementOrder();
+}
+
+async function sureTaskSettlementOrder() {
+ try {
+ let params: API.SureTaskSettlementCommand = {
+ taskInfoId: id,
+ };
+ let res = await taskServices.sureTaskSettlement(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ eventContext.emit('sureTaskSettlementOrder');
+ handleBack();
+ }
+ } catch (error) {}
+}
+
+const handleExport = _.debounce(
+ async () => {
+ if (paginationState.total === 0) {
+ Message.warnMessage('娌℃湁鏁版嵁鍙互瀵煎嚭鍝');
+ return;
+ }
+ try {
+ let params: API.ExportTaskSettlementOrderRostersCommand = {
+ id: id,
+ };
+ let res = await taskServices.exportTaskSettlementOrderRosters(params);
+ if (res) {
+ downloadFileByUrl(setOSSLink(res), `${form.name}-${form.code}`);
+ }
+ } catch (error) {}
+ },
+ 1000,
+ { leading: true, trailing: false }
+);
+
+function handleBack() {
+ closeViewPush(route, {
+ name: 'ServiceChargeManageList',
+ });
+}
</script>
<style lang="scss" scoped>
@@ -222,6 +507,18 @@
margin: 0 auto;
padding: 24px 0;
}
+
+.settlement-user-list-chunk {
+ :deep() {
+ .no-data img {
+ width: 280px;
+ }
+ }
+}
+
+.chuck-add-or-edit-actions {
+ margin-bottom: 20px;
+}
</style>
<style lang="scss">
.text-over-tooltip-content {
--
Gitblit v1.9.1