From 371c8e3d876864633e99a2f79474d0a0b2acf4cb Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 16:44:00 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 238 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 174 insertions(+), 64 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 72b74e5..2046563 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -74,13 +74,13 @@
>
<el-button text type="primary" class="pro-table-operation-btn">瀵煎叆</el-button>
</BlFileUpload>
- <el-button type="primary" link @click="handleDownload()">瀵煎嚭</el-button>
+ <el-button type="primary" link @click="handleExport()">瀵煎嚭</el-button>
</template>
</ProTableQueryFilterBar>
<ProTableV2
v-bind="proTableProps"
:columns="SettlementListColumns"
- :show-operation-column="false"
+ :operationBtns="operationBtns"
:auto-height="false"
ref="proTable"
:tableProps="{
@@ -91,10 +91,24 @@
<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"
- @click="handleSubmit"
+ @click="handleSubmit()"
>缁撶畻</el-button
>
</div>
@@ -134,7 +148,16 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
-import { paginateList, setOssFileName, toThousand } from '@/utils';
+import { SettlementReceiveStatusText, EnumTaskSettlementAuditStatus } from '@/constants';
+import {
+ downloadFile,
+ downloadFileByUrl,
+ paginateList,
+ setOssFileName,
+ setOSSLink,
+ toThousand,
+} from '@/utils';
+import _ from 'lodash';
defineOptions({
name: 'ServiceChargeDetail',
@@ -151,14 +174,16 @@
emits: {
onClick: (role) => openDialog(role),
},
+ extraProps: {
+ hide: () => !isSettlement.value,
+ },
},
]);
const route = useRoute();
const id = (route.params.id as string) ?? '';
-const url = (route.query.url as string) ?? '';
const settlement = (route.query.settlement as string) ?? '';
-
-const isSettlement = computed(() => !!url || !!settlement);
+// const settlementAccess = route.query.settlementAccess ?? '';
+const isSettlement = computed(() => !!settlement);
const form = reactive({
name: '',
@@ -170,6 +195,11 @@
settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
settlementUrl: [] as UploadUserFile[],
+
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ isSettlement: isSettlement.value,
+
+ auditStatus: '' as any as EnumTaskSettlementAuditStatus,
});
const BaseState = {
@@ -178,15 +208,21 @@
const state = reactive({ ...BaseState });
-const { isLoading } = useQuery({
- queryKey: ['taskUserServices/getSettlementTaskUsers', id, url],
+const { isLoading, refetch } = useQuery({
+ queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'isSettlement')],
queryFn: async () => {
- return await taskUserServices.getSettlementTaskUsers(
- { taskInfoId: id, settlementOrderUrl: url },
- {
- 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.GetSettlementTaskUsersQueryResult),
onSuccess(res) {
@@ -196,28 +232,30 @@
form.settlementAmount = res?.detail?.settlementAmount ?? 0;
form.actualSettlementAmount = res?.detail?.actualSettlementAmount ?? 0;
form.code = res?.detail?.code;
- form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
- form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
+ form.settlementAccess = res?.detail?.settlementAccess;
+ form.auditStatus = res?.detail?.auditStatus;
+ // 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: '閿欒淇℃伅',
- },
- });
- });
- }
+ // 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,
@@ -265,6 +303,7 @@
settlementTime: { type: 'date' },
settlementAmount: { type: 'money' },
actualSettlementAmount: { type: 'money' },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
},
}
);
@@ -273,45 +312,93 @@
onConfirm: handleAddOrEdit,
defaultFormParams: {
id: '',
- name: '',
+ settlementAmount: null as number,
+ actualSettlementAmount: null as number,
+ receiveAccount: '',
+ bank: '',
+ totalWorkHours: null as number,
+ settlementAccess: form.settlementAccess,
+ // bankBranch: '',
},
});
-function openDialog(row?) {
+function openDialog(row?: API.GetSettlementTaskUsersQueryResultItem) {
if (row) {
handleEdit({
id: row?.id,
- name: row?.name,
+ settlementAmount: row?.settlementAmount ?? null,
+ actualSettlementAmount: row?.actualSettlementAmount ?? null,
+ receiveAccount: row?.receiveAccount ?? '',
+ bank: row?.bank ?? '',
+ totalWorkHours: null as number,
+ settlementAccess: form.settlementAccess,
+ // bankBranch: row?.bankBranch ?? '',
});
}
}
-async function handleAddOrEdit() {}
-
-async function sureTaskSettlementOrder() {
+async function handleAddOrEdit() {
try {
- let params: API.SureTaskSettlementOrderCommand = {
- taskInfoId: id,
- settlementOrderUrl: url,
- taskInfoUsers:
- proTableProps.value.tableData?.length > 0
- ? proTableProps.value.tableData.map(
- (x) => ({ ...x } as API.SureTaskSettlementOrderCommandUser)
- )
- : [],
+ let params: API.EditTaskSettlementOrderRosterCommand = {
+ id: editForm.id,
+ settlementAmount: editForm.settlementAmount,
+ actualSettlementAmount: editForm.actualSettlementAmount,
+ receiveAccount: editForm.receiveAccount,
+ bank: editForm.bank,
+ totalWorkHours: editForm.totalWorkHours,
+ // bankBranch: editForm.bankBranch,
};
- let res = await taskServices.sureTaskSettlementOrder(params);
+ let res = await taskServices.editTaskSettlementOrderRoster(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
- eventContext.emit('sureTaskSettlementOrder');
- handleBack();
+ form.isSettlement = false;
+ refetch();
+ getList(paginationState.pageIndex);
}
} catch (error) {}
}
function handleUploadSuccess(response: UploadUserFile & { file: File & { uid: number } }) {
if (response.path) {
- // sureTaskSettlementOrder();
+ 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[];
}
}
@@ -322,6 +409,7 @@
code: form.code,
settlementUserCount: form.settlementTaskUsers.length,
actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: form.settlementAccess,
});
}
@@ -337,25 +425,47 @@
code: '',
settlementUserCount: 0,
actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
},
});
async function handleSettle() {
+ sureTaskSettlementOrder();
+}
+
+async function sureTaskSettlementOrder() {
try {
let params: API.SureTaskSettlementCommand = {
- taskInfoId: settleEditForm.id,
+ taskInfoId: id,
};
- console.log('params: ', params);
- // let res = await taskServices.sureTaskSettlement(params);
- // if (res) {
- // Message.successMessage('鎿嶄綔鎴愬姛');
- // eventContext.emit('sureTaskSettlementOrder');
- // handleBack();
- // }
+ let res = await taskServices.sureTaskSettlement(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ eventContext.emit('sureTaskSettlementOrder');
+ handleBack();
+ }
} catch (error) {}
}
-function handleDownload() {}
+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, {
--
Gitblit v1.9.1