From bcc758429cc2f438765246a973ccff9f33668315 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 15 四月 2025 14:00:52 +0800
Subject: [PATCH] fix: bug
---
src/views/Reward/RewardGrant.vue | 116 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 81 insertions(+), 35 deletions(-)
diff --git a/src/views/Reward/RewardGrant.vue b/src/views/Reward/RewardGrant.vue
index 1d4c97c..4b04fb9 100644
--- a/src/views/Reward/RewardGrant.vue
+++ b/src/views/Reward/RewardGrant.vue
@@ -5,7 +5,7 @@
<template #query>
<QueryFilterItem tip-content="鐢虫姤鏃ユ湡">
<FieldDatePicker
- v-model="extraParamState.date"
+ v-model="extraParamState.creationTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -16,7 +16,7 @@
</QueryFilterItem>
<QueryFilterItem tip-content="鍙戞斁鏃ユ湡">
<FieldDatePicker
- v-model="extraParamState.date"
+ v-model="extraParamState.settleTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -27,8 +27,8 @@
</QueryFilterItem>
<QueryFilterItem>
<FieldRadio
- v-model="extraParamState.showStatus"
- :value-enum="DataRangeEnumText"
+ v-model="extraParamState.settleStatus"
+ :value-enum="SettleStatusEnumText"
buttonStyle
showAllBtn
@change="getList()"
@@ -36,7 +36,7 @@
</QueryFilterItem>
<QueryFilterItem>
<SearchInput
- v-model="extraParamState.keyword"
+ v-model="extraParamState.batchNo"
style="width: 200px"
placeholder="鎵规鍙�"
@on-click-search="getList"
@@ -47,8 +47,14 @@
</ProTableQueryFilterBar>
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
+ <template #operationBtn-checkBtn="{ data, row }">
+ <PreviewBtnV2
+ class="pro-table-operation-btn"
+ :url="convertApi2FormUrlBySeparator(row.settleFileUrl ?? '')"
+ preview-btn-text="鏌ョ湅鍑瘉"
+ />
+ </template>
</ProTableV2>
-
<RewardGrantDialog v-bind="dialogProps"></RewardGrantDialog>
</AppContainer>
</LoadingLayout>
@@ -68,14 +74,21 @@
FieldDatePicker,
useFormDialog,
UploadUserFile,
+ PreviewBtnV2,
} from '@bole-core/components';
-import { OrderInputType } from '@bole-core/core';
-import { convertApi2FormUrlOnlyOne, format } from '@/utils';
-import { DataRangeEnum, DataRangeEnumText } from '@/constants';
-import * as informationServices from '@/services/api/Information';
+import { Message, OrderInputType } from '@bole-core/core';
+import {
+ convertApi2FormUrl,
+ convertApi2FormUrlBySeparator,
+ downloadFileByUrl,
+ format,
+} from '@/utils';
+import { SettleStatusEnum, SettleStatusEnumText } from '@/constants';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import RewardGrantDialog from './components/RewardGrantDialog.vue';
import _ from 'lodash';
import { ModelValueType } from 'element-plus';
+import { useQueryClient } from '@tanstack/vue-query';
defineOptions({
name: 'RewardGrant',
@@ -84,42 +97,42 @@
const column: API.CustomModuleColumnDto[] = [
{
id: '1',
- enCode: 'changeFlag',
+ enCode: 'batchNo',
name: '鐢宠鎵规鍙�',
},
{
id: '2',
- enCode: 'name',
+ enCode: 'parkName',
name: '鐢宠鍥尯',
},
{
id: '3',
- enCode: 'idNumber',
+ enCode: 'parkTypeName',
name: '鍥尯绫诲瀷',
},
{
id: '4',
- enCode: 'workType',
+ enCode: 'applyMonth',
name: '鐢宠濂栧姳閲戞湀浠�',
},
{
id: '5',
- enCode: 'gender',
+ enCode: 'applySumAmount',
name: '濂栧姳閲戞眹鎬婚噾棰濓紙鍏冿級',
},
{
id: '6',
- enCode: 'age',
+ enCode: 'creationTime',
name: '鐢虫姤鏃ユ湡',
},
{
id: '7',
- enCode: 'phoneNumber',
+ enCode: 'settleStatus',
name: '鍙戞斁鐘舵��',
},
{
id: '8',
- enCode: 'phoneNumber',
+ enCode: 'settleTime',
name: '鍙戞斁鏃ユ湡',
},
];
@@ -142,14 +155,19 @@
emits: {
onClick: (role) => openDialog(role),
},
+ extraProps: {
+ hide: (row: API.GetParkBountyApplyListOutput) =>
+ row.settleStatus === SettleStatusEnum.HasSettle,
+ },
},
{
data: {
- enCode: 'previewBtn',
+ enCode: 'checkBtn',
name: '鏌ョ湅鍑瘉',
},
- emits: {
- onClick: (role) => handlePreview(role),
+ extraProps: {
+ hide: (row: API.GetParkBountyApplyListOutput) =>
+ row.settleStatus === SettleStatusEnum.WaitForSettle,
},
},
]);
@@ -175,16 +193,20 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetInformationForManageInput = {
+ let params: API.GetParkBountyApplyListInput = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- publishStartDate: format(extraParamState.date?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- publishEndDate: format(extraParamState.date?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ batchNo: extraParamState.batchNo,
+ settleStatus: extraParamState.settleStatus,
+ creationTimeBegin: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ creationTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ settleTimeBegin: format(extraParamState.settleTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ settleTimeEnd: format(extraParamState.settleTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
};
- let res = await informationServices.getInformationForManage(params, {
+ let res = await parkBountyApplyServices.getParkBountyApplyList(params, {
showLoading: !state.loading,
});
return res;
@@ -192,10 +214,18 @@
},
{
defaultExtraParams: {
- keyword: '',
- showStatus: '' as any as DataRangeEnum,
- date: [] as unknown as ModelValueType,
+ batchNo: '',
+ settleStatus: '' as any as SettleStatusEnum,
+ creationTime: [] as unknown as ModelValueType,
+ settleTime: [] as unknown as ModelValueType,
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
+ },
+ columnsRenderProps: {
+ applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
+ creationTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ settleTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ applySumAmount: { type: 'money' },
+ settleStatus: { type: 'enum', valueEnum: SettleStatusEnumText },
},
}
);
@@ -210,20 +240,36 @@
}
const { dialogProps, handleAdd, handleEdit, editForm } = useFormDialog({
+ onConfirm: handleAddOrEdit,
defaultFormParams: {
- id: '',
- url: [] as UploadUserFile[],
+ parkBountyApplyId: '',
+ settleFileUrl: [] as UploadUserFile[],
},
});
-function openDialog(row?: API.IncentivePaymentsManageListOutput) {
+function openDialog(row?: API.GetParkBountyApplyListOutput) {
handleEdit({
- id: row.enterpriseName,
- url: convertApi2FormUrlOnlyOne(row.issueVouchersUrl),
+ parkBountyApplyId: row.id,
+ settleFileUrl: [] as UploadUserFile[],
});
}
-
-function handlePreview(row?: API.IncentivePaymentsManageListOutput) {}
+const queryClient = useQueryClient();
+async function handleAddOrEdit() {
+ try {
+ let params: API.ParkBountyApplySettleInput = {
+ parkBountyApplyId: editForm.parkBountyApplyId,
+ settleFileUrl: editForm.settleFileUrl.map((x) => x.path).join('|'),
+ };
+ let res = await parkBountyApplyServices.parkBountyApplySettle(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList(paginationState.pageIndex);
+ queryClient.invalidateQueries({
+ queryKey: ['parkBountyApplyServices/getGoverDataBoard'],
+ });
+ }
+ } catch (error) {}
+}
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.1