From bc9c1ab46dc7fdd6936df480303e295a9cb110da Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 28 九月 2025 15:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index dd76add..c2ea175 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -44,6 +44,8 @@
:controls="false"
v-model="form.serviceFee"
placeholder="璇疯緭鍏�"
+ :min="0"
+ :max="999999999999"
:unit="EnumBillingMethodUnitText[form.billingMethod]"
></ProFormInputNumber>
</template>
@@ -70,6 +72,7 @@
<ProFormCol>
<ProFormColItem :span="12" class="settlement-cycle-date-form-item">
<ProFormItemV2
+ v-if="form.settlementCycle !== EnumSettlementCycle.Day"
label="缁撶畻鏃ユ湡:"
prop="settlementCycle"
:check-rules="[{ message: '璇烽�夋嫨缁撶畻鏃ユ湡' }]"
@@ -128,14 +131,14 @@
>
<ProFormInputNumber
:controls="false"
- :min="0"
+ :min="16"
v-model="form.ageMinLimit"
placeholder="璇疯緭鍏�"
></ProFormInputNumber>
<div class="form-input-separator">鑷�</div>
<ProFormInputNumber
:controls="false"
- :min="0"
+ :min="16"
v-model="form.ageMaxLimit"
placeholder="璇疯緭鍏�"
></ProFormInputNumber>
@@ -261,6 +264,7 @@
EnumSettlementCycleDateText,
EnumSettlementCycleDateMonthArray,
EnumSettlementCycleDateWeekArray,
+ EnumSettlementCycle,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -391,7 +395,7 @@
billingMethod: form.billingMethod,
serviceFee: form.serviceFee,
settlementCycle: form.settlementCycle,
- settlementDate: form.settlementDate,
+ settlementDate: form.settlementDate ? form.settlementDate : 0,
benefits: form.benefits,
ageMinLimit: form.ageMinLimit,
ageMaxLimit: form.ageMaxLimit,
--
Gitblit v1.9.1