From 796e039b932c3de815814b2868b8e17fd0b3e4a5 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期五, 19 九月 2025 14:03:24 +0800 Subject: [PATCH] fix: bug --- src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 47 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue index f251903..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> @@ -62,25 +64,26 @@ v-model="form.settlementCycle" :value-enum="EnumSettlementCycleText" :button-style="false" + @change="handleSettlementCycleChange" ></ProFormRadio> </ProFormItemV2> </ProFormColItem> </ProFormCol> <ProFormCol> - <ProFormColItem :span="12"> + <ProFormColItem :span="12" class="settlement-cycle-date-form-item"> <ProFormItemV2 + v-if="form.settlementCycle !== EnumSettlementCycle.Day" label="缁撶畻鏃ユ湡:" prop="settlementCycle" :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏃ユ湡' }]" - class="settlement-cycle-date-form-item" > {{ EnumSettlementCycleDateText[form.settlementCycle] }} <ProFormSelect - v-model="form.settlementCycle" - :value-enum="[]" + v-model="form.settlementDate" + :value-enum="settlementDateList" :button-style="false" ></ProFormSelect> - {{ '鏃ョ粨绠�' }} + {{ '缁撶畻' }} </ProFormItemV2> </ProFormColItem> </ProFormCol> @@ -128,17 +131,18 @@ > <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> + 宀� </ProFormItemV2> </ProFormColItem> </ProFormCol> @@ -258,6 +262,9 @@ EnumBillingMethodUnitText, EnumSettlementCycleText, EnumSettlementCycleDateText, + EnumSettlementCycleDateMonthArray, + EnumSettlementCycleDateWeekArray, + EnumSettlementCycle, } from '@/constants'; import { format, FormValidator } from '@/utils'; import dayjs from 'dayjs'; @@ -287,6 +294,16 @@ categoryCode: CategoryCode.CertificateType, }); +const settlementDateList = computed(() => { + if (form.settlementCycle === EnumSettlementCycle.Month) { + return EnumSettlementCycleDateMonthArray; + } + if (form.settlementCycle === EnumSettlementCycle.Week) { + return EnumSettlementCycleDateWeekArray; + } + return []; +}); + const state = reactive({ checkBenefitsAll: false, isBenefitsIndeterminate: false, @@ -297,9 +314,10 @@ const form = reactive({ name: '', - billingMethod: EnumBillingMethod.Month, + billingMethod: EnumBillingMethod.Day, serviceFee: null, - settlementCycle: EnumSettlementCycle.Month, + settlementCycle: EnumSettlementCycle.Day, + settlementDate: null as number, benefits: [] as string[], ageMinLimit: null, ageMaxLimit: null, @@ -326,6 +344,7 @@ form.billingMethod = data.billingMethod; form.serviceFee = data.serviceFee; form.settlementCycle = data.settlementCycle; + form.settlementDate = data.settlementDate; form.benefits = data.benefits?.map((x) => x.benefitCode) ?? []; form.ageMinLimit = data.ageMinLimit; form.ageMaxLimit = data.ageMaxLimit; @@ -349,6 +368,10 @@ enabled: isEdit, }); +function handleSettlementCycleChange() { + form.settlementDate = null as number; +} + function handleBack() { closeViewPush(route, { name: 'TaskManageList', @@ -367,12 +390,12 @@ } async function submit() { try { - console.log('form.weMapInfo: ', form.weMapInfo); let params: API.SaveTaskInfoCommand = { name: form.name, billingMethod: form.billingMethod, serviceFee: form.serviceFee, settlementCycle: form.settlementCycle, + settlementDate: form.settlementDate ? form.settlementDate : 0, benefits: form.benefits, ageMinLimit: form.ageMinLimit, ageMaxLimit: form.ageMaxLimit, @@ -456,6 +479,10 @@ min-width: 0; flex: 1; } + + .pro-from-item-read-content-wrapper { + width: auto; + } } } } -- Gitblit v1.9.1