From 94f20f13dbb3b6392a7813a36953be038fea1916 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 05 九月 2025 14:47:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index f60c590..d543c3b 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
@@ -57,7 +57,6 @@
>
<template #operationBtn-uploadBtn="{ row }">
<BlFileUpload
- v-if="row.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait"
v-model:file-url="editForm.settlementUrl"
ref="uploadRef"
:showTip="false"
@@ -73,10 +72,6 @@
</template>
<template #operationBtn-reUploadBtn="{ data, row }">
<BlFileUpload
- v-if="
- row.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
- row.settlementStatus === EnumTaskSettlementStatus.Wait
- "
v-model:file-url="editForm.settlementUrl"
ref="uploadRef"
:showTip="false"
@@ -120,7 +115,7 @@
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';
@@ -134,14 +129,41 @@
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: 'settleBtn',
name: '缁撶畻',
},
emits: {
- onClick: (role) => openSettleDialog(role),
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => openSettleDialog(role),
},
extraProps: {
- hide: () => false,
+ hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ !(
+ role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
+ role.settlementStatus === EnumTaskSettlementStatus.Wait
+ ),
},
},
{
@@ -164,6 +186,10 @@
},
emits: {
onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
+ },
+ extraProps: {
+ hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
},
},
{
@@ -243,6 +269,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),
+ },
},
}
);
@@ -258,7 +288,8 @@
});
async function handleAddOrEdit() {
- goDetail(editForm.id, editForm.settlementUrl[0]?.url);
+ console.log('editForm: ', editForm);
+ goDetail(editForm.id, editForm.settlementUrl[0]?.path);
}
const {
@@ -294,14 +325,14 @@
id: row.id,
name: row.name,
code: row.code,
- settlementUserCount: row.settlementUserCount,
- settlementAmount: row.settlementAmount,
+ settlementUserCount: row.settlementUserCount ?? 0,
+ settlementAmount: row.settlementAmount ?? 0,
});
}
async function handleRecall(row: API.GetSettlementTasksQueryResultItem) {
try {
- Message.tipMessage('纭瑕佹挙鍥炲悧锛�');
+ await Message.tipMessage('纭瑕佹挙鍥炲悧锛�');
let params: API.RevokeTaskSettlementOrderCommand = {
taskInfoId: row.id,
};
@@ -317,19 +348,22 @@
response: UploadUserFile & { file: File & { uid: number } },
row: API.GetSettlementTasksQueryResultItem
) {
- if (response.url) {
- goDetail(row.id, response.url);
+ if (response.path) {
+ goDetail(row.id, response.path);
}
}
-function goDetail(id: string, url?: string) {
- router.push({
+async function goDetail(id: string, url?: string) {
+ await router.push({
name: 'ServiceChargeDetail',
- query: {
+ params: {
id: id,
+ },
+ query: {
url: url ? url : '',
},
});
+ editForm.settlementUrl = [] as UploadUserFile[];
}
function handleExport(val) {
@@ -337,6 +371,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