From f4ea49cc84ef592d043184142cf5edd5d971133d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 24 十月 2025 18:18:38 +0800
Subject: [PATCH] fix: bug
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index 31a7f8c..d2e82ea 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -25,7 +25,7 @@
if (!form.billingMethod) {
callback(new Error('璇烽�夋嫨鏈嶅姟璐圭被鍨�'));
}
- if (!form.serviceFee) {
+ if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
callback(new Error('璇疯緭鍏ユ湇鍔¤垂'));
}
callback();
@@ -42,6 +42,7 @@
>
<template #extra>
<ProFormInputNumber
+ v-if="form.billingMethod !== EnumBillingMethod.Face"
:controls="false"
v-model="form.serviceFee"
placeholder="璇疯緭鍏�"
@@ -68,7 +69,9 @@
prop="verifyWorkHours"
:check-rules="[{ message: '璇疯緭鍏ユ牳瀹氬伐鏃�' }]"
>
+ <span v-if="isDetail && !form.verifyWorkHours"></span>
<ProFormInputNumber
+ v-else
:controls="false"
v-model="form.verifyWorkHours"
placeholder="璇疯緭鍏ユ牳瀹氬伐鏃�"
@@ -87,7 +90,9 @@
prop="timeoutServiceFee"
:check-rules="[{ message: '璇疯緭鍏ヨ秴鏃舵湇鍔¤垂' }]"
>
+ <span v-if="isDetail && !form.timeoutServiceFee"></span>
<ProFormInputNumber
+ v-else
:controls="false"
v-model="form.timeoutServiceFee"
placeholder="璇疯緭鍏ヨ秴鏃舵湇鍔¤垂"
@@ -278,6 +283,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:disabled-date="disabledDate"
+ @change="handleTimeChange"
></ProFormDatePicker>
</ProFormItemV2>
</ProFormColItem>
@@ -392,11 +398,11 @@
}
function disabledapplyDate(time: Date) {
- return dayjs(time).isBefore(form.time[0], 'day') || dayjs(time).isAfter(form.time[1], 'day');
+ return dayjs(time).isAfter(dayjs(form.time[1]), 'day') || dayjs(time).isBefore(dayjs(), 'day');
}
const feeCannotEdit = computed(() => {
- return dayjs(form.time[0]).isBefore(dayjs(), 'day');
+ return dayjs().isAfter(form.time[0], 'second') && isEdit;
});
const eventContext = useGlobalEventContext();
@@ -506,6 +512,10 @@
form.settlementDate = null as number;
}
+function handleTimeChange() {
+ form.applyTime = [] as unknown as ModelValueType;
+}
+
function handleBack() {
closeViewPush(route, {
name: 'TaskManageList',
--
Gitblit v1.9.1