From 5369a4b6f01a2a003734dc22855b1cc7d84a577f Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期三, 17 九月 2025 17:39:24 +0800 Subject: [PATCH] fix: bug --- src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 66 +++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 3 deletions(-) diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue index 58f278e..dbe9ced 100644 --- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue +++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue @@ -62,7 +62,26 @@ v-model="form.settlementCycle" :value-enum="EnumSettlementCycleText" :button-style="false" + @change="handleSettlementCycleChange" ></ProFormRadio> + </ProFormItemV2> + </ProFormColItem> + </ProFormCol> + <ProFormCol> + <ProFormColItem :span="12" class="settlement-cycle-date-form-item"> + <ProFormItemV2 + v-if="form.settlementCycle !== EnumSettlementCycle.Day" + label="缁撶畻鏃ユ湡:" + prop="settlementCycle" + :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏃ユ湡' }]" + > + {{ EnumSettlementCycleDateText[form.settlementCycle] }} + <ProFormSelect + v-model="form.settlementDate" + :value-enum="settlementDateList" + :button-style="false" + ></ProFormSelect> + {{ '缁撶畻' }} </ProFormItemV2> </ProFormColItem> </ProFormCol> @@ -110,17 +129,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> @@ -227,6 +247,7 @@ ProFormRadio, ProFormDatePicker, ProFormCheckbox, + ProFormSelect, } from '@bole-core/components'; import { FormInstance, ModelValueType } from 'element-plus'; import { Message } from '@bole-core/core'; @@ -238,6 +259,10 @@ EnumBillingMethodText, EnumBillingMethodUnitText, EnumSettlementCycleText, + EnumSettlementCycleDateText, + EnumSettlementCycleDateMonthArray, + EnumSettlementCycleDateWeekArray, + EnumSettlementCycle, } from '@/constants'; import { format, FormValidator } from '@/utils'; import dayjs from 'dayjs'; @@ -267,6 +292,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, @@ -280,6 +315,7 @@ billingMethod: EnumBillingMethod.Day, serviceFee: null, settlementCycle: EnumSettlementCycle.Day, + settlementDate: null as number, benefits: [] as string[], ageMinLimit: null, ageMaxLimit: null, @@ -306,6 +342,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; @@ -329,6 +366,10 @@ enabled: isEdit, }); +function handleSettlementCycleChange() { + form.settlementDate = null as number; +} + function handleBack() { closeViewPush(route, { name: 'TaskManageList', @@ -347,12 +388,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, @@ -423,5 +464,24 @@ width: auto; } } + + .settlement-cycle-date-form-item { + color: inherit; + + .el-form-item__content { + flex-wrap: nowrap; + + .el-select { + margin: 0 20px; + width: auto; + min-width: 0; + flex: 1; + } + + .pro-from-item-read-content-wrapper { + width: auto; + } + } + } } </style> -- Gitblit v1.9.1