From b331f884097a2dc5086c8cf043c8c8f52e7640fe Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:34:39 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index 7704888..c46c0de 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -68,6 +68,24 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
+ <ProFormItemV2
+ label="缁撶畻鏃ユ湡:"
+ prop="settlementCycle"
+ :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏃ユ湡' }]"
+ class="settlement-cycle-date-form-item"
+ >
+ {{ EnumSettlementCycleDateText[form.settlementCycle] }}
+ <ProFormSelect
+ v-model="form.settlementCycle"
+ :value-enum="[]"
+ :button-style="false"
+ ></ProFormSelect>
+ {{ '鏃ョ粨绠�' }}
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
<ProFormItemV2 label="绂忓埄:" prop="benefits">
<el-checkbox
v-if="!isDetail"
@@ -110,14 +128,14 @@
>
<ProFormInputNumber
:controls="false"
- :min="1"
+ :min="0"
v-model="form.ageMinLimit"
placeholder="璇疯緭鍏�"
></ProFormInputNumber>
<div class="form-input-separator">鑷�</div>
<ProFormInputNumber
:controls="false"
- :min="1"
+ :min="0"
v-model="form.ageMaxLimit"
placeholder="璇疯緭鍏�"
></ProFormInputNumber>
@@ -162,9 +180,7 @@
<ProFormItemV2
label="浠诲姟鍦扮偣:"
prop="weMapInfo"
- :check-rules="[
- { message: '璇烽�夋嫨浠诲姟鍦扮偣', validator: FormValidator.validatorWeMap },
- ]"
+ :check-rules="[{ message: '璇烽�夋嫨浠诲姟鍦扮偣', type: 'weMap' }]"
>
<WeMap v-if="!isDetail" v-model="form.weMapInfo" />
<div v-else>
@@ -229,6 +245,7 @@
ProFormRadio,
ProFormDatePicker,
ProFormCheckbox,
+ ProFormSelect,
} from '@bole-core/components';
import { FormInstance, ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
@@ -240,6 +257,7 @@
EnumBillingMethodText,
EnumBillingMethodUnitText,
EnumSettlementCycleText,
+ EnumSettlementCycleDateText,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -279,12 +297,12 @@
const form = reactive({
name: '',
- billingMethod: EnumBillingMethod.Month,
- serviceFee: 0,
- settlementCycle: EnumSettlementCycle.Month,
+ billingMethod: EnumBillingMethod.Day,
+ serviceFee: null,
+ settlementCycle: EnumSettlementCycle.Day,
benefits: [] as string[],
- ageMinLimit: 0,
- ageMaxLimit: 0,
+ ageMinLimit: null,
+ ageMaxLimit: null,
genderLimit: 0 as any as EnumUserGender,
credentialLimits: [] as string[],
time: [] as unknown as ModelValueType,
@@ -425,5 +443,20 @@
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;
+ }
+ }
+ }
}
</style>
--
Gitblit v1.9.1