From 02aa28ba50c16658edfaff2e2e8ff19b355ab8f1 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 20:01:31 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 745a64d..e33940f 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -89,27 +89,26 @@
>
</ProTableV2>
<div class="chuck-add-or-edit-actions">
- <el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
+ <el-button class="chuck-add-or-edit-actions" @click="handleBack"
+ >鍙栨秷{{ !form.auditStatus
+ }}{{ form.auditStatus !== EnumTaskSettlementAuditStatus.Pass }}</el-button
+ >
<el-button
- v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait"
+ v-if="
+ isSettlement &&
+ (!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
+ "
class="chuck-add-or-edit-actions"
type="primary"
@click="handleSubmit()"
>缁撶畻鐢宠</el-button
>
<el-button
- v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+ v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
class="chuck-add-or-edit-actions"
type="primary"
@click="handleSubmit()"
>鎻愪氦缁撶畻</el-button
- >
- <el-button
- v-if="isSettlement"
- class="chuck-add-or-edit-actions"
- type="primary"
- @click="handleSubmit()"
- >缁撶畻</el-button
>
</div>
</ChunkCell>
@@ -330,7 +329,7 @@
actualSettlementAmount: row?.actualSettlementAmount ?? null,
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
- totalWorkHours: null as number,
+ totalWorkHours: row?.totalWorkHours ?? null,
settlementAccess: form.settlementAccess,
// bankBranch: row?.bankBranch ?? '',
});
@@ -409,6 +408,7 @@
code: form.code,
settlementUserCount: form.settlementTaskUsers.length,
actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: form.settlementAccess,
});
}
@@ -424,6 +424,7 @@
code: '',
settlementUserCount: 0,
actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
},
});
--
Gitblit v1.9.1