From b331f884097a2dc5086c8cf043c8c8f52e7640fe Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:34:39 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 134 +++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 45 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 5c3e3c1..b697403 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -21,7 +21,7 @@
@change="getList()"
/>
</QueryFilterItem>
- <QueryFilterItem>
+ <!-- <QueryFilterItem>
<FieldDatePicker
v-model="extraParamState.time"
type="daterange"
@@ -32,7 +32,7 @@
@change="getList()"
tooltipContent="鍒涘缓鏃堕棿"
></FieldDatePicker>
- </QueryFilterItem>
+ </QueryFilterItem> -->
<QueryFilterItem>
<SearchInput
v-model="extraParamState.keywords"
@@ -47,7 +47,7 @@
<template #btn>
<el-button type="primary" link @click="handleDownloadTemplate()">缁撶畻鍗曟ā鏉�</el-button>
<el-button type="primary" @click="handleAdd()">涓婁紶缁撶畻鍗�</el-button>
- <el-button type="primary" @click="handleDownloadTemplate()">瀵煎嚭</el-button>
+ <!-- <el-button type="primary" @click="handleDownloadTemplate()">瀵煎嚭</el-button> -->
</template>
</ProTableQueryFilterBar>
<ProTableV2
@@ -55,7 +55,7 @@
:columns="ServiceChargeManageColumns"
:operationBtns="operationBtns"
>
- <template #operationBtn-uploadBtn="{ row }">
+ <!-- <template #operationBtn-uploadBtn="{ row }">
<BlFileUpload
v-model:file-url="editForm.settlementUrl"
ref="uploadRef"
@@ -84,11 +84,12 @@
>
<el-button text type="primary" class="pro-table-operation-btn">閲嶆柊涓婁紶</el-button>
</BlFileUpload>
- </template>
+ </template> -->
</ProTableV2>
</AppContainer>
<UploadStatementDialog v-bind="dialogProps" />
<SettleDetailDialog v-bind="dialogSettleProps" />
+ <RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
</LoadingLayout>
</template>
@@ -115,11 +116,12 @@
EnumTaskSettlementOrderStatus,
EnumTaskSettlementStatus,
} from '@/constants';
-import { downloadFileByUrl } from '@/utils';
+import { downloadFileByUrl, setOssFileName } from '@/utils';
import * as taskServices from '@/services/api/task';
import { ModelValueType } from 'element-plus';
import UploadStatementDialog from './components/UploadStatementDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
+import RechargeEnterpriseWalletDialog from './components/RechargeEnterpriseWalletDialog.vue';
import { Message } from '@bole-core/core';
defineOptions({
@@ -127,36 +129,36 @@
});
const operationBtns = defineOperationBtns([
- {
- data: {
- enCode: 'uploadBtn',
- name: '涓婁紶',
- },
- extraProps: {
- hide: (row: API.GetSettlementTasksQueryResultItem) =>
- row.settlementOrderStatus !== EnumTaskSettlementOrderStatus.Wait,
- },
- },
- {
- data: {
- enCode: 'reUploadBtn',
- name: '閲嶆柊涓婁紶',
- },
- extraProps: {
- hide: (row: API.GetSettlementTasksQueryResultItem) =>
- !(
- row.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
- row.settlementStatus === EnumTaskSettlementStatus.Wait
- ),
- },
- },
+ // {
+ // data: {
+ // enCode: 'uploadBtn',
+ // name: '涓婁紶',
+ // },
+ // extraProps: {
+ // hide: (row: API.GetSettlementTasksQueryResultItem) =>
+ // row.settlementOrderStatus !== EnumTaskSettlementOrderStatus.Wait,
+ // },
+ // },
+ // {
+ // data: {
+ // enCode: 'reUploadBtn',
+ // name: '閲嶆柊涓婁紶',
+ // },
+ // extraProps: {
+ // hide: (row: API.GetSettlementTasksQueryResultItem) =>
+ // !(
+ // row.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
+ // row.settlementStatus === EnumTaskSettlementStatus.Wait
+ // ),
+ // },
+ // },
{
data: {
enCode: 'settleBtn',
name: '缁撶畻',
},
emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => openSettleDialog(role),
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role, 'settlement'),
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
@@ -185,7 +187,7 @@
name: '璇︽儏',
},
emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role),
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
@@ -201,12 +203,14 @@
onClick: (role) => handleExport(role),
},
extraProps: {
- hide: () => false,
+ hide: () => true,
},
},
]);
const router = useRouter();
+
+const { userDetail } = useUser();
const eventContext = useGlobalEventContext();
@@ -269,6 +273,10 @@
settlementAmount: { type: 'money' },
settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
settlementOrderTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ settlementOrderName: {
+ formatter: (row: API.GetSettlementTasksQueryResultItem) =>
+ row.settlementOrderName && setOssFileName(row.settlementOrderName),
+ },
},
}
);
@@ -284,7 +292,7 @@
});
async function handleAddOrEdit() {
- goDetail(editForm.id, editForm.settlementUrl[0]?.url);
+ goSettlementDetail(editForm.id, editForm.settlementUrl[0]?.path);
}
const {
@@ -298,7 +306,7 @@
name: '',
code: '',
settlementUserCount: 0,
- settlementAmount: 0,
+ actualSettlementAmount: 0,
},
});
@@ -307,27 +315,45 @@
let params: API.SureTaskSettlementCommand = {
taskInfoId: settleEditForm.id,
};
- let res = await taskServices.sureTaskSettlement(params);
+ let res = await taskServices.sureTaskSettlement(params, {
+ skipErrorHandler: true,
+ });
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
getList(paginationState.pageIndex);
}
- } catch (error) {}
+ } catch (error) {
+ if (error?.info?.errorCode == 's510') {
+ handleRechargeAdd();
+ }
+ }
}
+
+const {
+ dialogProps: dialogRechargeProps,
+ handleAdd: handleRechargeAdd,
+ editForm: rechargeEditForm,
+} = useFormDialog({
+ defaultFormParams: {
+ access: EnumEnterpriseWalletAccess.Alipay,
+ amount: null as number,
+ remark: '',
+ },
+});
function openSettleDialog(row: API.GetSettlementTasksQueryResultItem) {
handleSettleEdit({
id: row.id,
name: row.name,
code: row.code,
- settlementUserCount: row.settlementUserCount,
- settlementAmount: row.settlementAmount,
+ settlementUserCount: row.settlementUserCount ?? 0,
+ actualSettlementAmount: row.actualSettlementAmount ?? 0,
});
}
async function handleRecall(row: API.GetSettlementTasksQueryResultItem) {
try {
- Message.tipMessage('纭瑕佹挙鍥炲悧锛�');
+ await Message.tipMessage('纭瑕佹挙鍥炲悧锛�');
let params: API.RevokeTaskSettlementOrderCommand = {
taskInfoId: row.id,
};
@@ -343,17 +369,32 @@
response: UploadUserFile & { file: File & { uid: number } },
row: API.GetSettlementTasksQueryResultItem
) {
- if (response.url) {
- goDetail(row.id, response.url);
+ if (response.path) {
+ goSettlementDetail(row.id, response.path);
}
}
-function goDetail(id: string, url?: string) {
+async function goSettlementDetail(id: string, url?: string) {
+ await router.push({
+ name: 'ServiceChargeDetail',
+ params: {
+ id: id,
+ },
+ query: {
+ url: url ? url : '',
+ },
+ });
+ editForm.settlementUrl = [] as UploadUserFile[];
+}
+
+function goDetail(row: API.GetSettlementTasksQueryResultItem, settlement?: string) {
router.push({
name: 'ServiceChargeDetail',
+ params: {
+ id: row?.id ?? '',
+ },
query: {
- id: id,
- url: url ? url : '',
+ settlement: settlement ? settlement : '',
},
});
}
@@ -363,6 +404,9 @@
}
function handleDownloadTemplate() {
- downloadFileByUrl('', '缁撶畻鍗曟ā鏉�');
+ downloadFileByUrl(
+ 'https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/FlexJob/temp/%E7%BB%93%E7%AE%97%E5%8D%95%E6%A8%A1%E6%9D%BF.xlsx',
+ '缁撶畻鍗曟ā鏉�'
+ );
}
</script>
--
Gitblit v1.9.1