From c41e0d0abff2a4b7b22ea1e276aa18493359c9c8 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 20 十月 2025 16:34:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 7889c48..bd8b274 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -1,6 +1,6 @@
<template>
<LoadingLayout :loading="isLoading">
- <AppContainer>
+ <AppScrollContainer>
<ChunkCell title="缁撶畻鍗曡鎯�">
<ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
<ProFormCol>
@@ -84,7 +84,7 @@
:auto-height="false"
ref="proTable"
:tableProps="{
- maxHeight: '250px',
+ maxHeight: '400px',
}"
>
</ProTableV2>
@@ -93,7 +93,7 @@
<el-button
v-if="
isSettlement &&
- (!!form.auditStatus || form.auditStatus === EnumTaskSettlementAuditStatus.Fail)
+ (!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
"
class="chuck-add-or-edit-actions"
type="primary"
@@ -109,7 +109,7 @@
>
</div>
</ChunkCell>
- </AppContainer>
+ </AppScrollContainer>
<EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog>
<SettleDetailDialog v-bind="dialogSettleProps" />
</LoadingLayout>
@@ -118,6 +118,7 @@
import {
LoadingLayout,
AppContainer,
+ AppScrollContainer,
ChunkCell,
ProForm,
ProFormItemV2,
@@ -326,7 +327,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 ?? '',
});
@@ -485,6 +486,10 @@
}
}
}
+
+.chuck-add-or-edit-actions {
+ margin-bottom: 20px;
+}
</style>
<style lang="scss">
.text-over-tooltip-content {
--
Gitblit v1.9.1