From 21b5e8493c08bc62b77e4314c1ad9f641c947267 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 17:24:53 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/views/ServiceChargeManage/components/SettleDetailDialog.vue | 11 +----------
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 4 +++-
src/views/ServiceChargeManage/components/SettlMethodDialog.vue | 11 +----------
src/hooks/settlement.ts | 11 ++++++++++-
4 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/src/hooks/settlement.ts b/src/hooks/settlement.ts
index 4417b29..05f61d9 100644
--- a/src/hooks/settlement.ts
+++ b/src/hooks/settlement.ts
@@ -41,5 +41,14 @@
const enterpriseWalletAccessSelect = computed(() => data.value?.map((x) => x.data));
- return { enterpriseWalletAccessSelect };
+ const settlementAccessList = computed(() => {
+ return enterpriseWalletAccessSelect.value?.length > 0
+ ? enterpriseWalletAccessSelect.value.map((x) => ({
+ label: EnumEnterpriseWalletAccessTextForSettle[x.access],
+ value: x.access,
+ }))
+ : [];
+ });
+
+ return { settlementAccessList };
}
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index f5f4079..4368f34 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -304,7 +304,7 @@
>
<ProFormSelect
v-model="form.settlementAccess"
- :value-enum="EnumEnterpriseWalletAccessText"
+ :value-enum="settlementAccessList"
:disabled="isEdit"
placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
></ProFormSelect>
@@ -367,6 +367,8 @@
const id = route.params.id as string;
const isEdit = !!id;
+const { settlementAccessList } = useEnterpriseWalletAccessSelect();
+
function disabledDate(time: Date) {
return dayjs(time).isBefore(dayjs(), 'day');
}
diff --git a/src/views/ServiceChargeManage/components/SettlMethodDialog.vue b/src/views/ServiceChargeManage/components/SettlMethodDialog.vue
index c89d8aa..1d11da0 100644
--- a/src/views/ServiceChargeManage/components/SettlMethodDialog.vue
+++ b/src/views/ServiceChargeManage/components/SettlMethodDialog.vue
@@ -41,16 +41,7 @@
settlementAccess: EnumEnterpriseWalletAccess;
};
-const { enterpriseWalletAccessSelect } = useEnterpriseWalletAccessSelect();
-
-const settlementAccessList = computed(() => {
- return enterpriseWalletAccessSelect.value?.length > 0
- ? enterpriseWalletAccessSelect.value.map((x) => ({
- label: EnumEnterpriseWalletAccessTextForSettle[x.access],
- value: x.access,
- }))
- : [];
-});
+const { settlementAccessList } = useEnterpriseWalletAccessSelect();
const visible = defineModel({ type: Boolean });
diff --git a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
index 2876584..8449452 100644
--- a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
+++ b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -66,16 +66,7 @@
settlementAccess: EnumEnterpriseWalletAccess;
};
-const { enterpriseWalletAccessSelect } = useEnterpriseWalletAccessSelect();
-
-const settlementAccessList = computed(() => {
- return enterpriseWalletAccessSelect.value?.length > 0
- ? enterpriseWalletAccessSelect.value.map((x) => ({
- label: EnumEnterpriseWalletAccessTextForSettle[x.access],
- value: x.access,
- }))
- : [];
-});
+const { settlementAccessList } = useEnterpriseWalletAccessSelect();
const visible = defineModel({ type: Boolean });
--
Gitblit v1.9.1