From 56eeb2671661ac45fc8d3129951dad96a5bd1f9b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 15:24:16 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue b/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
index b097271..ff4d2bc 100644
--- a/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
+++ b/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
@@ -8,22 +8,44 @@
:width="700"
>
<ProForm :model="form" ref="dialogForm" label-width="120px">
- <ProFormItemV2 label="鎵�灞為摱琛岋細" prop="bank" :check-rules="[{ message: '璇疯緭鍏ユ墍灞為摱琛�' }]">
- <ProFormText placeholder="璇疯緭鍏ユ墍灞為摱琛�" v-model.trim="form.bank"></ProFormText>
- </ProFormItemV2>
- <!-- <ProFormItemV2
+ <template v-if="form.settlementAccess !== EnumEnterpriseWalletAccess.WeChatPay">
+ <ProFormItemV2
+ label="鎵�灞為摱琛岋細"
+ prop="bank"
+ :check-rules="[{ message: '璇疯緭鍏ユ墍灞為摱琛�' }]"
+ >
+ <ProFormText placeholder="璇疯緭鍏ユ墍灞為摱琛�" v-model.trim="form.bank"></ProFormText>
+ </ProFormItemV2>
+ <!-- <ProFormItemV2
label="寮�鎴锋敮琛岋細"
prop="bankBranch"
:check-rules="[{ message: '璇疯緭鍏ュ紑鎴锋敮琛�' }]"
>
<ProFormText placeholder="璇疯緭鍏ュ紑鎴锋敮琛�" v-model.trim="form.bankBranch"></ProFormText>
</ProFormItemV2> -->
+ <ProFormItemV2
+ label="鏀舵璐︽埛锛�"
+ prop="receiveAccount"
+ :check-rules="[{ message: '璇疯緭鍏ユ敹娆捐处鎴�' }]"
+ >
+ <ProFormText
+ placeholder="璇疯緭鍏ユ敹娆捐处鎴�"
+ v-model.trim="form.receiveAccount"
+ ></ProFormText>
+ </ProFormItemV2>
+ </template>
+
<ProFormItemV2
- label="鏀舵璐︽埛锛�"
- prop="receiveAccount"
- :check-rules="[{ message: '璇疯緭鍏ユ敹娆捐处鎴�', pattern: /^\S*$/ }]"
+ label="璋冩暣宸ユ椂锛�"
+ prop="totalWorkHours"
+ :check-rules="[{ message: '璇疯緭鍏ヨ皟鏁村伐鏃�' }]"
>
- <ProFormText placeholder="璇疯緭鍏ユ敹娆捐处鎴�" v-model.trim="form.receiveAccount"></ProFormText>
+ <ProFormInputNumber
+ placeholder="璇疯緭鍏ヨ皟鏁村伐鏃�"
+ v-model.trim="form.totalWorkHours"
+ :controls="false"
+ :min="0"
+ ></ProFormInputNumber>
</ProFormItemV2>
<ProFormItemV2
label="缁撶畻閲戦锛�"
@@ -69,6 +91,7 @@
ProFormText,
UploadUserFile,
} from '@bole-core/components';
+import { EnumEnterpriseWalletAccess } from '@/constants';
defineOptions({
name: 'EditAccountInfoDialog',
@@ -78,10 +101,12 @@
title?: string;
id?: string;
settlementAmount: number;
+ totalWorkHours: number;
actualSettlementAmount: number;
receiveAccount: string;
bank: string;
bankBranch?: string;
+ settlementAccess: EnumEnterpriseWalletAccess;
};
const visible = defineModel({ type: Boolean });
--
Gitblit v1.9.1