From 0cb324779727155effffcbca13c5b11409c8211c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 07 十一月 2025 11:06:40 +0800
Subject: [PATCH] feat: 1.3.0.1
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 214 insertions(+), 14 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index fdb4e19..86883c6 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -3,6 +3,17 @@
<AppContainer>
<PageFormLayout title="鍩烘湰淇℃伅">
<ProForm :model="form" ref="productFormRef" label-width="110px" :is-read="isDetail">
+ <ProFormItemV2
+ label="渚涘簲鍟�:"
+ prop="supplierEnterpriseId"
+ :check-rules="[{ message: '璇烽�夋嫨渚涘簲鍟�' }]"
+ >
+ <ProFormSelect
+ v-model="form.supplierEnterpriseId"
+ :value-enum="supplierEnterpriseSelect"
+ placeholder="璇烽�夋嫨渚涘簲鍟�"
+ ></ProFormSelect>
+ </ProFormItemV2>
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2
@@ -17,6 +28,25 @@
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2
+ label="闇�姹備汉鏁�:"
+ prop="needPeopleNumber"
+ :check-rules="[{ message: '璇疯緭鍏ラ渶姹備汉鏁�' }]"
+ >
+ <ProFormInputNumber
+ :controls="false"
+ v-model="form.needPeopleNumber"
+ placeholder="璇疯緭鍏ラ渶姹備汉鏁�"
+ :min="0"
+ :max="999999999999"
+ :precision="0"
+ unit="浜�"
+ ></ProFormInputNumber>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2
label="鏈嶅姟璐�:"
prop="billingMethod"
:check-rules="[
@@ -25,7 +55,7 @@
if (!form.billingMethod) {
callback(new Error('璇烽�夋嫨鏈嶅姟璐圭被鍨�'));
}
- if (!form.serviceFee) {
+ if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
callback(new Error('璇疯緭鍏ユ湇鍔¤垂'));
}
callback();
@@ -38,15 +68,18 @@
:value-enum="EnumBillingMethodText"
:showExtra="true"
:button-style="false"
+ :disabled="feeCannotEdit"
>
<template #extra>
<ProFormInputNumber
+ v-if="form.billingMethod !== EnumBillingMethod.Face"
:controls="false"
v-model="form.serviceFee"
placeholder="璇疯緭鍏�"
:min="0"
:max="999999999999"
:unit="EnumBillingMethodUnitText[form.billingMethod]"
+ :disabled="feeCannotEdit"
></ProFormInputNumber>
</template>
</RadioWithExtra>
@@ -56,34 +89,66 @@
<template v-if="form.billingMethod === EnumBillingMethod.Hour">
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="name">
+ <ProFormItemV2
+ label="鏍稿畾宸ユ椂:"
+ prop="verifyWorkHours"
+ :check-rules="[{ message: '璇疯緭鍏ユ牳瀹氬伐鏃�' }]"
+ >
+ <span v-if="isDetail && !form.verifyWorkHours"></span>
<ProFormInputNumber
+ v-else
:controls="false"
- v-model="form.serviceFee"
+ v-model="form.verifyWorkHours"
placeholder="璇疯緭鍏ユ牳瀹氬伐鏃�"
:min="0"
:max="999999999999"
unit="灏忔椂/澶�"
+ :disabled="feeCannotEdit"
></ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="瓒呮椂鏈嶅姟璐�:" prop="name">
+ <ProFormItemV2
+ label="瓒呮椂鏈嶅姟璐�:"
+ prop="timeoutServiceFee"
+ :check-rules="[{ message: '璇疯緭鍏ヨ秴鏃舵湇鍔¤垂' }]"
+ >
+ <span v-if="isDetail && !form.timeoutServiceFee"></span>
<ProFormInputNumber
+ v-else
:controls="false"
- v-model="form.serviceFee"
+ v-model="form.timeoutServiceFee"
placeholder="璇疯緭鍏ヨ秴鏃舵湇鍔¤垂"
:min="0"
:max="999999999999"
unit="鍏�/灏忔椂"
+ :disabled="feeCannotEdit"
></ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
</template>
-
+ <ProFormCol v-if="form.billingMethod === EnumBillingMethod.Piece">
+ <ProFormColItem :span="12">
+ <ProFormItemV2
+ label="鎬讳欢鏁�:"
+ prop="totalPieceQuantity"
+ :check-rules="[{ message: '璇疯緭鍏ヤ换鍔℃�讳欢鏁�' }]"
+ >
+ <ProFormInputNumber
+ :controls="false"
+ v-model="form.totalPieceQuantity"
+ placeholder="璇疯緭鍏ヤ换鍔℃�讳欢鏁�"
+ :min="0"
+ :max="999999999999"
+ unit="浠�"
+ :disabled="feeCannotEdit"
+ ></ProFormInputNumber>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2
@@ -96,6 +161,7 @@
:value-enum="EnumSettlementCycleText"
:button-style="false"
@change="handleSettlementCycleChange"
+ :disabled="feeCannotEdit"
></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
@@ -237,10 +303,10 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鎻忚堪:" prop="addressDetail">
+ <ProFormItemV2 label="浠诲姟鎻忚堪:" prop="description">
<ProFormTextArea
:rows="4"
- v-model.trim="form.addressDetail"
+ v-model.trim="form.description"
placeholder="璇疯緭鍏ヤ换鍔℃弿杩�"
/>
</ProFormItemV2>
@@ -251,7 +317,20 @@
<ProFormItemV2
label="浠诲姟鏃堕棿:"
prop="time"
- :check-rules="[{ message: '璇烽�夋嫨浠诲姟鏃堕棿', type: 'array' }]"
+ :check-rules="[
+ { message: '璇烽�夋嫨浠诲姟鏃堕棿', type: 'array' },
+ {
+ validator: (rule, value, callback) => {
+ if (form.billingMethod === EnumBillingMethod.Month) {
+ if (dayjs(form.time[1]).diff(dayjs(form.time[0]), 'month') < 1) {
+ callback(new Error('鏈堢粨浠诲姟鏃朵换鍔℃椂闂撮渶澶т簬涓�涓湀'));
+ }
+ callback();
+ }
+ callback();
+ },
+ },
+ ]"
>
<ProFormDatePicker
v-model="form.time"
@@ -260,6 +339,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:disabled-date="disabledDate"
+ @change="handleTimeChange"
></ProFormDatePicker>
</ProFormItemV2>
</ProFormColItem>
@@ -268,16 +348,16 @@
<ProFormColItem :span="12">
<ProFormItemV2
label="鎶ュ悕鏃堕棿:"
- prop="time"
+ prop="applyTime"
:check-rules="[{ message: '璇烽�夋嫨鎶ュ悕鏃堕棿', type: 'array' }]"
>
<ProFormDatePicker
- v-model="form.time"
+ v-model="form.applyTime"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
- :disabled-date="disabledDate"
+ :disabled-date="disabledapplyDate"
></ProFormDatePicker>
</ProFormItemV2>
</ProFormColItem>
@@ -286,13 +366,28 @@
<ProFormColItem :span="12">
<ProFormItemV2
label="楠屾敹鏂瑰紡:"
- prop="genderLimit"
+ prop="checkReceiveMethods"
:check-rules="[{ message: '璇烽�夋嫨楠屾敹鏂瑰紡' }]"
>
- <ProFormRadio v-model="form.genderLimit" :value-enum="[]"></ProFormRadio>
+ <ProFormCheckbox
+ v-model="form.checkReceiveMethods"
+ :value-enum="EnumTaskCheckReceiveMethodText"
+ ></ProFormCheckbox>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
+ <ProFormItemV2
+ label="缁撶畻鏂瑰紡:"
+ prop="settlementAccess"
+ :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏂瑰紡' }]"
+ >
+ <ProFormSelect
+ v-model="form.settlementAccess"
+ :value-enum="settlementAccessList"
+ :disabled="isEdit"
+ placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
+ ></ProFormSelect>
+ </ProFormItemV2>
</ProForm>
<template #footer>
<el-button @click="handleBack()">鍏抽棴</el-button>
@@ -334,6 +429,8 @@
EnumSettlementCycleDateMonthArray,
EnumSettlementCycleDateWeekArray,
EnumSettlementCycle,
+ EnumTaskCheckReceiveMethodText,
+ EnumEnterpriseWalletAccessText,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -346,12 +443,23 @@
};
defineProps<Props>();
const route = useRoute();
+const router = useRouter();
const id = route.params.id as string;
const isEdit = !!id;
+
+const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
function disabledDate(time: Date) {
return dayjs(time).isBefore(dayjs(), 'day');
}
+
+function disabledapplyDate(time: Date) {
+ return dayjs(time).isAfter(dayjs(form.time[1]), 'day') || dayjs(time).isBefore(dayjs(), 'day');
+}
+
+const feeCannotEdit = computed(() => {
+ return dayjs().isAfter(form.time[0], 'second') && isEdit;
+});
const eventContext = useGlobalEventContext();
@@ -382,9 +490,12 @@
});
const form = reactive({
+ supplierEnterpriseId: '',
name: '',
+ needPeopleNumber: null as number,
billingMethod: EnumBillingMethod.Day,
serviceFee: null,
+ totalPieceQuantity: null as number,
settlementCycle: EnumSettlementCycle.Day,
settlementDate: null as number,
benefits: [] as string[],
@@ -395,6 +506,16 @@
time: [] as unknown as ModelValueType,
weMapInfo: {} as WeMapModel,
addressDetail: '',
+ verifyWorkHours: null as number,
+ timeoutServiceFee: null as number,
+ description: '',
+ checkReceiveMethods: [] as any as EnumTaskCheckReceiveMethod[],
+ applyTime: [] as unknown as ModelValueType,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+});
+
+const { settlementAccessList } = useEnterpriseWalletAccessSelect({
+ supplierEnterpriseId: computed(() => form.supplierEnterpriseId),
});
const { isLoading } = useQuery({
@@ -409,8 +530,11 @@
},
placeholderData: () => ({} as API.GetTaskInfoQueryResult),
onSuccess(data) {
+ form.supplierEnterpriseId = data.supplierEnterpriseId;
form.name = data.name;
+ form.needPeopleNumber = data.needPeopleNumber;
form.billingMethod = data.billingMethod;
+ form.totalPieceQuantity = data.totalPieceQuantity;
form.serviceFee = data.serviceFee;
form.settlementCycle = data.settlementCycle;
form.settlementDate = data.settlementDate;
@@ -423,6 +547,10 @@
format(data.beginTime, 'YYYY-MM-DD 00:00:00'),
format(data.endTime, 'YYYY-MM-DD 23:59:59'),
];
+ form.applyTime = [
+ format(data.applyBeginTime, 'YYYY-MM-DD 00:00:00'),
+ format(data.applyEndTime, 'YYYY-MM-DD 23:59:59'),
+ ];
form.weMapInfo = {
latitude: data.latitude,
longitude: data.longitude,
@@ -433,6 +561,15 @@
addressName: data.addressName,
};
form.addressDetail = data.addressDetail;
+ form.verifyWorkHours = data.verifyWorkHours;
+ form.timeoutServiceFee = data.timeoutServiceFee;
+ form.description = data.description;
+ form.checkReceiveMethods = data.checkReceiveMethods;
+ form.applyTime = [
+ format(data.applyBeginTime, 'YYYY-MM-DD 00:00:00'),
+ format(data.applyEndTime, 'YYYY-MM-DD 23:59:59'),
+ ];
+ form.settlementAccess = data.settlementAccess;
},
enabled: isEdit,
});
@@ -441,11 +578,43 @@
form.settlementDate = null as number;
}
+function handleTimeChange() {
+ form.applyTime = [] as unknown as ModelValueType;
+}
+
function handleBack() {
closeViewPush(route, {
name: 'TaskManageList',
});
}
+
+function calculateMonthInterval(startDate, endDate) {
+ const diffInDays = dayjs(endDate).diff(startDate, 'day');
+ const monthInterval = Math.ceil(diffInDays / 30);
+ return monthInterval > 15 ? Math.ceil(monthInterval / 30) : monthInterval;
+}
+
+function calculateServicesFee(
+ billingMethod: EnumBillingMethod,
+ serviceFee: number,
+ time: ModelValueType,
+ needPeopleNumber: number,
+ verifyWorkHours: number
+) {
+ const monthInterval = calculateMonthInterval(time[0], time[1]);
+ const dayInterval = dayjs(time[1]).diff(time[0], 'day');
+ switch (billingMethod) {
+ case EnumBillingMethod.Month:
+ return monthInterval * serviceFee * needPeopleNumber;
+ case EnumBillingMethod.Day:
+ return serviceFee * dayInterval * needPeopleNumber;
+ case EnumBillingMethod.Hour:
+ return serviceFee * dayInterval * needPeopleNumber * verifyWorkHours;
+ case EnumBillingMethod.Piece:
+ return serviceFee * needPeopleNumber;
+ }
+}
+
const productFormRef = ref<FormInstance>();
function handleConfirm() {
if (!productFormRef.value) return;
@@ -459,9 +628,33 @@
}
async function submit() {
try {
+ // const estimateServicesFee = calculateServicesFee(
+ // form.billingMethod,
+ // form.serviceFee,
+ // form.time,
+ // form.needPeopleNumber,
+ // form.verifyWorkHours
+ // );
+ // if (estimateServicesFee > 10000) {
+ // Message.tipMessage('鎮ㄥ綋鍓嶈处鎴蜂綑棰濅笉瓒筹紝鏆傛椂鏃犳硶鍙戝竷浠诲姟锛岃鍏呭�煎悗鎿嶄綔', {
+ // confirmButtonText: '绔嬪嵆鍏呭��',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning',
+ // callback: (action) => {
+ // if (action === 'confirm') {
+ // router.push({
+ // name: 'BalanceManageV2',
+ // });
+ // }
+ // },
+ // });
+ // }
let params: API.SaveTaskInfoCommand = {
+ supplierEnterpriseId: form.supplierEnterpriseId,
name: form.name,
+ needPeopleNumber: form.needPeopleNumber,
billingMethod: form.billingMethod,
+ totalPieceQuantity: form.totalPieceQuantity,
serviceFee: form.serviceFee,
settlementCycle: form.settlementCycle,
settlementDate: form.settlementDate ? form.settlementDate : 0,
@@ -478,6 +671,13 @@
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'),
+ applyBeginTime: dayjs(form.applyTime[0]).format('YYYY-MM-DD 00:00:00'),
+ applyEndTime: dayjs(form.applyTime[1]).format('YYYY-MM-DD 23:59:59'),
+ verifyWorkHours: form.verifyWorkHours,
+ timeoutServiceFee: form.timeoutServiceFee,
+ description: form.description,
+ checkReceiveMethods: form.checkReceiveMethods,
+ settlementAccess: form.settlementAccess,
};
if (isEdit) {
params.id = id;
--
Gitblit v1.9.1