From 5ec8805b2728d9b98383f2b2cdb3298ac3864286 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 11 八月 2025 17:46:12 +0800
Subject: [PATCH] feat: 接口
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 284 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 223 insertions(+), 61 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index d8ad705..47fdecc 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -5,31 +5,46 @@
<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="salaryType">
+ <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.salaryType"
- :value-enum="[
- { label: '鎸夋湀', value: 1 },
- { label: '鎸夋棩', value: 2 },
- ]"
+ v-model="form.billingMethod"
+ :value-enum="EnumBillingMethodText"
:showExtra="true"
:button-style="false"
>
<template #extra>
<ProFormInputNumber
:controls="false"
- :min="0"
- :max="999"
- v-model="form.name"
+ v-model="form.serviceFee"
placeholder="璇疯緭鍏�"
- :unit="form.salaryType === 1 ? '鍏�/鏈�' : '鍏�/澶�'"
+ :unit="EnumBillingMethodUnitText[form.billingMethod]"
></ProFormInputNumber>
</template>
</RadioWithExtra>
@@ -38,10 +53,14 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="缁撶畻鏂瑰紡:" prop="salaryType">
+ <ProFormItemV2
+ label="缁撶畻鏂瑰紡:"
+ prop="settlementCycle"
+ :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏂瑰紡' }]"
+ >
<ProFormRadio
- v-model="form.salaryType"
- :value-enum="[{ label: '鏄�', value: 1 }]"
+ v-model="form.settlementCycle"
+ :value-enum="EnumSettlementCycleText"
:button-style="false"
></ProFormRadio>
</ProFormItemV2>
@@ -51,7 +70,8 @@
<ProFormColItem :span="12">
<ProFormItemV2 label="绂忓埄:" prop="benefits">
<el-checkbox
- v-model="state.checBenefitskAll"
+ v-if="!isDetail"
+ v-model="state.checkBenefitsAll"
style="margin-right: 30px"
:indeterminate="state.isBenefitsIndeterminate"
@change="handleCheckBenefitsAllChange"
@@ -59,9 +79,7 @@
>
<ProFormCheckbox
v-model="form.benefits"
- :value-enum="[]"
- enumLabelKey="name"
- enum-value-key="id"
+ :value-enum="welfareList"
@change="handleCheckedBenefitsServicesChange"
></ProFormCheckbox>
</ProFormItemV2>
@@ -69,18 +87,38 @@
</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="0"
- v-model="form.ageStart"
+ :min="1"
+ v-model="form.ageMinLimit"
placeholder="璇疯緭鍏�"
></ProFormInputNumber>
<div class="form-input-separator">鑷�</div>
<ProFormInputNumber
:controls="false"
- :min="0"
- v-model="form.ageEnd"
+ :min="1"
+ v-model="form.ageMaxLimit"
placeholder="璇疯緭鍏�"
></ProFormInputNumber>
</ProFormItemV2>
@@ -88,46 +126,80 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鎬у埆瑕佹眰:" prop="sexRequirement" required>
+ <ProFormItemV2
+ label="鎬у埆瑕佹眰:"
+ prop="genderLimit"
+ :check-rules="[{ message: '璇烽�夋嫨鎬у埆瑕佹眰' }]"
+ >
<ProFormRadio
- v-model="form.sexRequirement"
- :value-enum="[{ label: '涓嶉檺', value: 1 }]"
+ v-model="form.genderLimit"
+ :value-enum="EnumUserGenderTextForEdit"
+ show-all-btn
+ :all-btn-label="'涓嶉檺'"
+ :allBtnValue="0"
></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="璧勬牸璇佷功:" prop="benefits">
+ <ProFormItemV2 label="璧勬牸璇佷功:" prop="credentialLimits">
<el-checkbox
- v-model="state.checBenefitskAll"
+ v-if="!isDetail"
+ v-model="state.checkCertificatesAll"
style="margin-right: 30px"
- :indeterminate="state.isBenefitsIndeterminate"
- @change="handleCheckBenefitsAllChange"
+ :indeterminate="state.isCertificatesIndeterminate"
+ @change="handleCheckCertificatesAllChange"
>鍏ㄩ��</el-checkbox
>
<ProFormCheckbox
- v-model="form.benefits"
- :value-enum="[]"
- enumLabelKey="name"
- enum-value-key="id"
- @change="handleCheckedBenefitsServicesChange"
+ v-model="form.credentialLimits"
+ :value-enum="certificateTypeList"
+ @change="handleCheckedCertificatesServicesChange"
></ProFormCheckbox>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鍦扮偣:" prop="areaList">
- <!-- <ProFromAddressSelect :areaList="form.areaList" :address="form.address" /> -->
+ <ProFormItemV2
+ label="浠诲姟鍦扮偣:"
+ prop="weMapInfo"
+ :check-rules="[
+ { message: '璇烽�夋嫨浠诲姟鍦扮偣', validator: FormValidator.validatorWeMap },
+ ]"
+ >
+ <WeMap v-if="!isDetail" v-model="form.weMapInfo" />
+ <div v-else>
+ {{
+ `${form.weMapInfo.provinceName ?? ''}${form.weMapInfo.cityName ?? ''}${
+ form.weMapInfo.addressName ?? ''
+ }`
+ }}
+ </div>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鏃堕棿:" prop="name">
+ <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"
+ :check-rules="[{ message: '璇烽�夋嫨浠诲姟鏃堕棿', type: 'array' }]"
+ >
<ProFormDatePicker
- v-model="form.name"
+ v-model="form.time"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -160,11 +232,19 @@
ProFormDatePicker,
ProFormCheckbox,
} from '@bole-core/components';
-import { FormInstance } from 'element-plus';
+import { FormInstance, ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
import { useQuery } from '@tanstack/vue-query';
import { useGlobalEventContext, useRouteView } from '@/hooks';
-import * as flexTaskServices from '@/services/api/FlexTask';
+import * as taskServices from '@/services/api/task';
+import {
+ EnumUserGenderTextForEdit,
+ EnumBillingMethodText,
+ EnumBillingMethodUnitText,
+ EnumSettlementCycleText,
+} from '@/constants';
+import { format, FormValidator } from '@/utils';
+import dayjs from 'dayjs';
defineOptions({
name: 'AddOrEditEmploymentView',
@@ -180,45 +260,78 @@
const eventContext = useGlobalEventContext();
const { closeViewPush } = useRouteView();
+const { dictionaryDataList: welfareList } = useDictionaryDataSelect({
+ categoryCode: CategoryCode.Welfare,
+});
+const { dictionaryDataList: certificateTypeList } = useDictionaryDataSelect({
+ categoryCode: CategoryCode.CertificateType,
+});
const state = reactive({
- checBenefitskAll: false,
+ checkBenefitsAll: false,
isBenefitsIndeterminate: false,
+
+ checkCertificatesAll: false,
+ isCertificatesIndeterminate: false,
});
const form = reactive({
name: '',
- salaryType: 1,
- ageStart: 0,
- ageEnd: 0,
- sexRequirement: 1,
- manNumber: 0,
- womanNumber: 0,
- benefits: [],
- areaList: [] as number[],
- address: '',
+ billingMethod: '' as any as EnumBillingMethod,
+ serviceFee: 0,
+ settlementCycle: '' as any as EnumSettlementCycle,
+ benefits: [] as string[],
+ ageMinLimit: 0,
+ ageMaxLimit: 0,
+ genderLimit: 0 as any as EnumUserGender,
+ credentialLimits: [] as string[],
+ time: [] as unknown as ModelValueType,
+ weMapInfo: {} as WeMapModel,
+ addressDetail: '',
});
const { isLoading } = useQuery({
- queryKey: ['flexTaskServices/getFlexTaskDetail', id],
+ queryKey: ['taskServices/getTaskInfo', id],
queryFn: async () => {
- return await flexTaskServices.getFlexTaskDetail(
+ return await taskServices.getTaskInfo(
{ id: id },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.GetFlexTaskDetailForBackOutput),
+ placeholderData: () => ({} as API.GetTaskInfoQueryResult),
onSuccess(data) {
- form.name = data.taskName;
+ form.name = data.name;
+ form.billingMethod = data.billingMethod;
+ form.serviceFee = data.serviceFee;
+ form.settlementCycle = data.settlementCycle;
+ form.benefits = data.benefits?.map((x) => x.benefitCode) ?? [];
+ form.ageMinLimit = data.ageMinLimit;
+ form.ageMaxLimit = data.ageMaxLimit;
+ form.genderLimit = data.genderLimit;
+ form.credentialLimits = data.credentialLimits?.map((x) => x.typeCode) ?? [];
+ form.time = [
+ format(data.beginTime, 'YYYY-MM-DD 00:00:00'),
+ format(data.endTime, 'YYYY-MM-DD 23:59:59'),
+ ];
+ form.weMapInfo = {
+ latitude: data.latitude,
+ longitude: data.longitude,
+ provinceName: data.provinceContent,
+ cityName: data.cityContent,
+ provinceCode: data.provinceCode,
+ cityCode: data.cityCode,
+ addressName: data.addressName,
+ };
+ form.addressDetail = data.addressDetail;
},
enabled: isEdit,
});
function handleBack() {
closeViewPush(route, {
- name: 'EmploymentManageList',
+ name: 'TaskManageList',
});
}
const productFormRef = ref<FormInstance>();
@@ -234,19 +347,68 @@
}
async function submit() {
try {
- let params = {};
- let res;
+ console.log('form.weMapInfo: ', form.weMapInfo);
+ let params: API.SaveTaskInfoCommand = {
+ name: form.name,
+ billingMethod: form.billingMethod,
+ serviceFee: form.serviceFee,
+ settlementCycle: form.settlementCycle,
+ benefits: form.benefits,
+ ageMinLimit: form.ageMinLimit,
+ ageMaxLimit: form.ageMaxLimit,
+ genderLimit: form.genderLimit,
+ credentialLimits: form.credentialLimits,
+ provinceCode: form.weMapInfo.provinceCode,
+ cityCode: form.weMapInfo.cityCode,
+ addressName: form.weMapInfo.addressName,
+ addressDetail: form.addressDetail,
+ longitude: form.weMapInfo.longitude,
+ latitude: form.weMapInfo.latitude,
+ beginTime: dayjs(form.time[0]).format('YYYY-MM-DD 00:00:00'),
+ endTime: dayjs(form.time[1]).format('YYYY-MM-DD 23:59:59'),
+ };
+ if (isEdit) {
+ params.id = id;
+ }
+ let res = await taskServices.saveTaskInfo(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
- eventContext.emit(isEdit ? 'employment:edit' : 'employment:add');
+ eventContext.emit(isEdit ? 'taskManage:edit' : 'taskManage:add');
handleBack();
}
} catch (error) {}
}
-function handleCheckBenefitsAllChange() {}
+function handleCheckBenefitsAllChange(val: boolean) {
+ form.benefits = val
+ ? welfareList.value.map((item) => {
+ return item.value;
+ })
+ : [];
+ state.isBenefitsIndeterminate = false;
+}
-function handleCheckedBenefitsServicesChange() {}
+function handleCheckedBenefitsServicesChange(value: string[]) {
+ const checkedCount = value.length;
+ state.checkBenefitsAll = checkedCount === welfareList.value.length;
+ state.isBenefitsIndeterminate = checkedCount > 0 && checkedCount < welfareList.value.length;
+}
+
+function handleCheckCertificatesAllChange(val: boolean) {
+ form.credentialLimits = val
+ ? certificateTypeList.value.map((item) => {
+ return item.value;
+ })
+ : [];
+ state.isCertificatesIndeterminate = false;
+}
+
+function handleCheckedCertificatesServicesChange(value: string[]) {
+ const checkedCount = value.length;
+ state.checkCertificatesAll = checkedCount === certificateTypeList.value.length;
+ state.isCertificatesIndeterminate =
+ checkedCount > 0 && checkedCount < certificateTypeList.value.length;
+}
</script>
<style lang="scss" scoped>
@use '@/style/common.scss' as *;
--
Gitblit v1.9.1