From b267cf72173eb068293832f0c9b16b58e36729e2 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 17 十月 2025 18:30:04 +0800
Subject: [PATCH] fix: s
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 153 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 142 insertions(+), 11 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index b08731a..fdb4e19 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>
@@ -51,6 +53,37 @@
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
+ <template v-if="form.billingMethod === EnumBillingMethod.Hour">
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="name">
+ <ProFormInputNumber
+ :controls="false"
+ v-model="form.serviceFee"
+ placeholder="璇疯緭鍏ユ牳瀹氬伐鏃�"
+ :min="0"
+ :max="999999999999"
+ unit="灏忔椂/澶�"
+ ></ProFormInputNumber>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="瓒呮椂鏈嶅姟璐�:" prop="name">
+ <ProFormInputNumber
+ :controls="false"
+ v-model="form.serviceFee"
+ placeholder="璇疯緭鍏ヨ秴鏃舵湇鍔¤垂"
+ :min="0"
+ :max="999999999999"
+ unit="鍏�/灏忔椂"
+ ></ProFormInputNumber>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ </template>
+
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2
@@ -62,7 +95,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 +162,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>
@@ -177,12 +230,19 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2
- label="璇︾粏鍦板潃:"
- prop="addressDetail"
- :check-rules="[{ message: '璇疯緭鍏ヨ缁嗗湴鍧�' }]"
- >
- <ProFormText v-model.trim="form.addressDetail" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" />
+ <ProFormItemV2 label="鍦扮偣璇存槑:" prop="addressDetail">
+ <ProFormText v-model.trim="form.addressDetail" placeholder="璇疯緭鍏ュ湴鐐硅鏄�" />
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="浠诲姟鎻忚堪:" prop="addressDetail">
+ <ProFormTextArea
+ :rows="4"
+ v-model.trim="form.addressDetail"
+ placeholder="璇疯緭鍏ヤ换鍔℃弿杩�"
+ />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -201,6 +261,35 @@
end-placeholder="缁撴潫鏃ユ湡"
:disabled-date="disabledDate"
></ProFormDatePicker>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <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>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2
+ label="楠屾敹鏂瑰紡:"
+ prop="genderLimit"
+ :check-rules="[{ message: '璇烽�夋嫨楠屾敹鏂瑰紡' }]"
+ >
+ <ProFormRadio v-model="form.genderLimit" :value-enum="[]"></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -227,6 +316,8 @@
ProFormRadio,
ProFormDatePicker,
ProFormCheckbox,
+ ProFormSelect,
+ ProFormTextArea,
} from '@bole-core/components';
import { FormInstance, ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
@@ -235,9 +326,14 @@
import * as taskServices from '@/services/api/task';
import {
EnumUserGenderTextForEdit,
+ EnumBillingMethod,
EnumBillingMethodText,
EnumBillingMethodUnitText,
EnumSettlementCycleText,
+ EnumSettlementCycleDateText,
+ EnumSettlementCycleDateMonthArray,
+ EnumSettlementCycleDateWeekArray,
+ EnumSettlementCycle,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -267,6 +363,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,
@@ -277,9 +383,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,
@@ -306,6 +413,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 +437,10 @@
enabled: isEdit,
});
+function handleSettlementCycleChange() {
+ form.settlementDate = null as number;
+}
+
function handleBack() {
closeViewPush(route, {
name: 'TaskManageList',
@@ -347,12 +459,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 +535,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