From 17511a0d3d2635723c3d0e1c9da6db75996253d9 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 17 十月 2025 20:06:12 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index fdb4e19..a883928 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -56,10 +56,10 @@
<template v-if="form.billingMethod === EnumBillingMethod.Hour">
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="name">
+ <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="verifyWorkHours">
<ProFormInputNumber
:controls="false"
- v-model="form.serviceFee"
+ v-model="form.verifyWorkHours"
placeholder="璇疯緭鍏ユ牳瀹氬伐鏃�"
:min="0"
:max="999999999999"
@@ -70,10 +70,10 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="瓒呮椂鏈嶅姟璐�:" prop="name">
+ <ProFormItemV2 label="瓒呮椂鏈嶅姟璐�:" prop="timeoutServiceFee">
<ProFormInputNumber
:controls="false"
- v-model="form.serviceFee"
+ v-model="form.timeoutServiceFee"
placeholder="璇疯緭鍏ヨ秴鏃舵湇鍔¤垂"
:min="0"
:max="999999999999"
@@ -237,10 +237,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>
@@ -268,16 +268,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,10 +286,14 @@
<ProFormColItem :span="12">
<ProFormItemV2
label="楠屾敹鏂瑰紡:"
- prop="genderLimit"
+ prop="checkReceiveMethod"
:check-rules="[{ message: '璇烽�夋嫨楠屾敹鏂瑰紡' }]"
>
- <ProFormRadio v-model="form.genderLimit" :value-enum="[]"></ProFormRadio>
+ <ProFormRadio
+ v-model="form.checkReceiveMethod"
+ :value-enum="EnumTaskCheckReceiveMethodText"
+ :button-style="false"
+ ></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -334,6 +338,7 @@
EnumSettlementCycleDateMonthArray,
EnumSettlementCycleDateWeekArray,
EnumSettlementCycle,
+ EnumTaskCheckReceiveMethodText,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -351,6 +356,10 @@
function disabledDate(time: Date) {
return dayjs(time).isBefore(dayjs(), 'day');
+}
+
+function disabledapplyDate(time: Date) {
+ return dayjs(time).isBefore(form.time[0], 'day');
}
const eventContext = useGlobalEventContext();
@@ -395,6 +404,11 @@
time: [] as unknown as ModelValueType,
weMapInfo: {} as WeMapModel,
addressDetail: '',
+ verifyWorkHours: null as number,
+ timeoutServiceFee: null as number,
+ description: '',
+ checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
+ applyTime: [] as unknown as ModelValueType,
});
const { isLoading } = useQuery({
@@ -423,6 +437,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 +451,10 @@
addressName: data.addressName,
};
form.addressDetail = data.addressDetail;
+ form.verifyWorkHours = data.verifyWorkHours;
+ form.timeoutServiceFee = data.timeoutServiceFee;
+ form.description = data.description;
+ form.checkReceiveMethod = data.checkReceiveMethod;
},
enabled: isEdit,
});
@@ -478,6 +500,12 @@
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,
+ checkReceiveMethod: form.checkReceiveMethod,
};
if (isEdit) {
params.id = id;
--
Gitblit v1.9.1