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 | 135 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 19 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index 3d0d1d1..c46c0de 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -5,14 +5,34 @@
<ProForm :model="form" ref="productFormRef" label-width="110px" :is-read="isDetail">
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鍚嶇О:" prop="name">
+ <ProFormItemV2
+ label="浠诲姟鍚嶇О:"
+ prop="name"
+ :check-rules="[{ message: '璇疯緭鍏ヤ换鍔″悕绉�' }]"
+ >
<ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鏈嶅姟璐�:" prop="billingMethod">
+ <ProFormItemV2
+ label="鏈嶅姟璐�:"
+ prop="billingMethod"
+ :check-rules="[
+ {
+ validator: (rule, value, callback) => {
+ if (!form.billingMethod) {
+ callback(new Error('璇烽�夋嫨鏈嶅姟璐圭被鍨�'));
+ }
+ if (!form.serviceFee) {
+ callback(new Error('璇疯緭鍏ユ湇鍔¤垂'));
+ }
+ callback();
+ },
+ },
+ ]"
+ >
<RadioWithExtra
v-model="form.billingMethod"
:value-enum="EnumBillingMethodText"
@@ -33,12 +53,34 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="缁撶畻鏂瑰紡:" prop="settlementCycle">
+ <ProFormItemV2
+ label="缁撶畻鏂瑰紡:"
+ prop="settlementCycle"
+ :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏂瑰紡' }]"
+ >
<ProFormRadio
v-model="form.settlementCycle"
:value-enum="EnumSettlementCycleText"
:button-style="false"
></ProFormRadio>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </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>
@@ -63,17 +105,37 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="骞撮緞鑼冨洿:" prop="ageRange" class="form-age-range">
+ <ProFormItemV2
+ label="骞撮緞鑼冨洿:"
+ prop="ageRange"
+ class="form-age-range"
+ :check-rules="[
+ {
+ validator: (rule, value, callback) => {
+ if (!form.ageMinLimit) {
+ callback(new Error('璇疯緭鍏ュ勾榫勮姹�'));
+ }
+ if (!form.ageMaxLimit) {
+ callback(new Error('璇疯緭鍏ュ勾榫勮姹�'));
+ }
+ if (Number(form.ageMaxLimit) <= Number(form.ageMinLimit)) {
+ callback(new Error('鏈�澶у勾榫勪笉鑳藉皬浜庢渶灏忓勾榫�'));
+ }
+ callback();
+ },
+ },
+ ]"
+ >
<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>
@@ -82,13 +144,14 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鎬у埆瑕佹眰:" prop="genderLimit">
+ <ProFormItemV2
+ label="鎬у埆瑕佹眰:"
+ prop="genderLimit"
+ :check-rules="[{ message: '璇烽�夋嫨鎬у埆瑕佹眰' }]"
+ >
<ProFormRadio
v-model="form.genderLimit"
:value-enum="EnumUserGenderTextForEdit"
- show-all-btn
- :all-btn-label="'涓嶉檺'"
- :allBtnValue="0"
></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
@@ -114,7 +177,11 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鍦扮偣:" prop="weMapInfo">
+ <ProFormItemV2
+ label="浠诲姟鍦扮偣:"
+ prop="weMapInfo"
+ :check-rules="[{ message: '璇烽�夋嫨浠诲姟鍦扮偣', type: 'weMap' }]"
+ >
<WeMap v-if="!isDetail" v-model="form.weMapInfo" />
<div v-else>
{{
@@ -128,20 +195,29 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="璇︾粏鍦板潃:" prop="addressDetail">
+ <ProFormItemV2
+ label="璇︾粏鍦板潃:"
+ prop="addressDetail"
+ :check-rules="[{ message: '璇疯緭鍏ヨ缁嗗湴鍧�' }]"
+ >
<ProFormText v-model.trim="form.addressDetail" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鏃堕棿:" prop="time">
+ <ProFormItemV2
+ label="浠诲姟鏃堕棿:"
+ prop="time"
+ :check-rules="[{ message: '璇烽�夋嫨浠诲姟鏃堕棿', type: 'array' }]"
+ >
<ProFormDatePicker
v-model="form.time"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ :disabled-date="disabledDate"
></ProFormDatePicker>
</ProFormItemV2>
</ProFormColItem>
@@ -169,6 +245,7 @@
ProFormRadio,
ProFormDatePicker,
ProFormCheckbox,
+ ProFormSelect,
} from '@bole-core/components';
import { FormInstance, ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
@@ -180,8 +257,9 @@
EnumBillingMethodText,
EnumBillingMethodUnitText,
EnumSettlementCycleText,
+ EnumSettlementCycleDateText,
} from '@/constants';
-import { format } from '@/utils';
+import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
defineOptions({
@@ -194,6 +272,10 @@
const route = useRoute();
const id = route.params.id as string;
const isEdit = !!id;
+
+function disabledDate(time: Date) {
+ return dayjs(time).isBefore(dayjs(), 'day');
+}
const eventContext = useGlobalEventContext();
@@ -215,12 +297,12 @@
const form = reactive({
name: '',
- billingMethod: '' as any as EnumBillingMethod,
- serviceFee: 0,
- settlementCycle: '' as any as EnumSettlementCycle,
+ 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,
@@ -361,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