From 01e7edf41912e62d4a1b5a137d30cebf5609303d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 16 九月 2025 15:06:36 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index b697403..affb651 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"
@@ -30,15 +30,15 @@
end-placeholder="鎴鏃ユ湡"
clearable
@change="getList()"
- tooltipContent="鍒涘缓鏃堕棿"
+ tooltipContent="缁撶畻鏃堕棿"
></FieldDatePicker>
- </QueryFilterItem> -->
+ </QueryFilterItem>
<QueryFilterItem>
<SearchInput
v-model="extraParamState.keywords"
style="width: 250px"
placeholder="浠诲姟鍚嶇О"
- @on-click-search="getList"
+ @on-click-search="getList()"
@keyup.enter="getList()"
>
</SearchInput>
@@ -46,7 +46,7 @@
</template>
<template #btn>
<el-button type="primary" link @click="handleDownloadTemplate()">缁撶畻鍗曟ā鏉�</el-button>
- <el-button type="primary" @click="handleAdd()">涓婁紶缁撶畻鍗�</el-button>
+ <!-- <el-button type="primary" @click="handleAdd()">涓婁紶缁撶畻鍗�</el-button> -->
<!-- <el-button type="primary" @click="handleDownloadTemplate()">瀵煎嚭</el-button> -->
</template>
</ProTableQueryFilterBar>
@@ -116,7 +116,7 @@
EnumTaskSettlementOrderStatus,
EnumTaskSettlementStatus,
} from '@/constants';
-import { downloadFileByUrl, setOssFileName } from '@/utils';
+import { downloadFileByUrl, format, setOssFileName } from '@/utils';
import * as taskServices from '@/services/api/task';
import { ModelValueType } from 'element-plus';
import UploadStatementDialog from './components/UploadStatementDialog.vue';
@@ -163,8 +163,8 @@
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
!(
- role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
- role.settlementStatus === EnumTaskSettlementStatus.Wait
+ role.settlementStatus === EnumTaskSettlementStatus.Wait &&
+ role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
),
},
},
@@ -178,7 +178,10 @@
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
- role.settlementStatus !== EnumTaskSettlementStatus.InProcess,
+ !(
+ role.settlementStatus === EnumTaskSettlementStatus.InProcess &&
+ role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
+ ),
},
},
{
@@ -189,10 +192,10 @@
emits: {
onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role),
},
- extraProps: {
- hide: (role: API.GetSettlementTasksQueryResultItem) =>
- role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
- },
+ // extraProps: {
+ // hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ // role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
+ // },
},
{
data: {
@@ -247,6 +250,8 @@
keywords: extraParamState.keywords,
settlementOrderStatus: extraParamState.settlementOrderStatus,
settlementStatus: extraParamState.settlementStatus,
+ settlementTimeBegin: format(extraParamState.time?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ settlementTimeEnd: format(extraParamState.time?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
};
let res = await taskServices.getSettlementTasks(params, {
@@ -269,9 +274,11 @@
columnsRenderProps: {
settlementOrderStatus: { type: 'enum', valueEnum: EnumTaskSettlementOrderStatusText },
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
+ checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
actualSettlementAmount: { type: 'money' },
settlementAmount: { type: 'money' },
settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ createdTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
settlementOrderTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
settlementOrderName: {
formatter: (row: API.GetSettlementTasksQueryResultItem) =>
@@ -292,7 +299,16 @@
});
async function handleAddOrEdit() {
- goSettlementDetail(editForm.id, editForm.settlementUrl[0]?.path);
+ try {
+ let params: API.ImportTaskSettlementOrderRostersCommand = {
+ id: editForm.id,
+ url: editForm.settlementUrl[0]?.path,
+ };
+ let res = await taskServices.importTaskSettlementOrderRosters(params);
+ if (res) {
+ goSettlementDetail(editForm.id, editForm.settlementUrl[0]?.path);
+ }
+ } catch (error) {}
}
const {
@@ -379,9 +395,6 @@
name: 'ServiceChargeDetail',
params: {
id: id,
- },
- query: {
- url: url ? url : '',
},
});
editForm.settlementUrl = [] as UploadUserFile[];
--
Gitblit v1.9.1