From acea2270a55e045d15bef41585876abe0e536836 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 21 十月 2025 14:40:57 +0800
Subject: [PATCH] fix: bug
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 85 insertions(+), 12 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index fdb4e19..37f80f6 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -38,46 +38,64 @@
: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>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
- <template v-if="form.billingMethod === EnumBillingMethod.Hour">
+ <template
+ v-if="
+ form.billingMethod === EnumBillingMethod.Hour ||
+ form.billingMethod === EnumBillingMethod.Day
+ "
+ >
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="name">
+ <ProFormItemV2
+ label="鏍稿畾宸ユ椂:"
+ prop="verifyWorkHours"
+ :check-rules="[{ message: '璇疯緭鍏ユ牳瀹氬伐鏃�' }]"
+ >
<ProFormInputNumber
: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: '璇疯緭鍏ヨ秴鏃舵湇鍔¤垂' }]"
+ >
<ProFormInputNumber
:controls="false"
- v-model="form.serviceFee"
+ v-model="form.timeoutServiceFee"
placeholder="璇疯緭鍏ヨ秴鏃舵湇鍔¤垂"
:min="0"
:max="999999999999"
unit="鍏�/灏忔椂"
+ :disabled="feeCannotEdit"
></ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
@@ -96,6 +114,7 @@
:value-enum="EnumSettlementCycleText"
:button-style="false"
@change="handleSettlementCycleChange"
+ :disabled="feeCannotEdit"
></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
@@ -237,10 +256,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 +287,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 +305,29 @@
<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>
+ <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 +369,8 @@
EnumSettlementCycleDateMonthArray,
EnumSettlementCycleDateWeekArray,
EnumSettlementCycle,
+ EnumTaskCheckReceiveMethodText,
+ EnumEnterpriseWalletAccessText,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -349,9 +386,19 @@
const id = route.params.id as string;
const isEdit = !!id;
+const { settlementAccessList } = useEnterpriseWalletAccessSelect();
+
function disabledDate(time: Date) {
return dayjs(time).isBefore(dayjs(), 'day');
}
+
+function disabledapplyDate(time: Date) {
+ return dayjs(time).isBefore(form.time[0], 'day') || dayjs(time).isAfter(form.time[1], 'day');
+}
+
+const feeCannotEdit = computed(() => {
+ return dayjs(form.time[0]).isBefore(dayjs(), 'day');
+});
const eventContext = useGlobalEventContext();
@@ -395,6 +442,12 @@
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,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});
const { isLoading } = useQuery({
@@ -423,6 +476,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 +490,15 @@
addressName: data.addressName,
};
form.addressDetail = data.addressDetail;
+ form.verifyWorkHours = data.verifyWorkHours;
+ form.timeoutServiceFee = data.timeoutServiceFee;
+ form.description = data.description;
+ form.checkReceiveMethod = data.checkReceiveMethod;
+ 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,
});
@@ -478,6 +544,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,
+ checkReceiveMethod: form.checkReceiveMethod,
+ settlementAccess: form.settlementAccess,
};
if (isEdit) {
params.id = id;
--
Gitblit v1.9.1