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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index c85f0b2..affb651 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -38,7 +38,7 @@
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>
@@ -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
),
},
},
@@ -179,8 +179,8 @@
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
!(
- role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
- role.settlementStatus === EnumTaskSettlementStatus.InProcess
+ role.settlementStatus === EnumTaskSettlementStatus.InProcess &&
+ role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
),
},
},
--
Gitblit v1.9.1