From 1237645ff3c7889dd1345705cf4617f5cfd23abe Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 20 十月 2025 16:24:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient
---
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index 4a8aa94..31a7f8c 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -38,6 +38,7 @@
:value-enum="EnumBillingMethodText"
:showExtra="true"
:button-style="false"
+ :disabled="feeCannotEdit"
>
<template #extra>
<ProFormInputNumber
@@ -47,16 +48,26 @@
:min="0"
:max="999999999999"
:unit="EnumBillingMethodUnitText[form.billingMethod]"
+ :disabled="feeCannotEdit"
></ProFormInputNumber>
</template>
</RadioWithExtra>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
- <template v-if="form.billingMethod === EnumBillingMethod.Hour || form.billingMethod === EnumBillingMethod.Day">
+ <template
+ v-if="
+ form.billingMethod === EnumBillingMethod.Hour ||
+ form.billingMethod === EnumBillingMethod.Day
+ "
+ >
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="verifyWorkHours">
+ <ProFormItemV2
+ label="鏍稿畾宸ユ椂:"
+ prop="verifyWorkHours"
+ :check-rules="[{ message: '璇疯緭鍏ユ牳瀹氬伐鏃�' }]"
+ >
<ProFormInputNumber
:controls="false"
v-model="form.verifyWorkHours"
@@ -64,13 +75,18 @@
:min="0"
:max="999999999999"
unit="灏忔椂/澶�"
+ :disabled="feeCannotEdit"
></ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="瓒呮椂鏈嶅姟璐�:" prop="timeoutServiceFee">
+ <ProFormItemV2
+ label="瓒呮椂鏈嶅姟璐�:"
+ prop="timeoutServiceFee"
+ :check-rules="[{ message: '璇疯緭鍏ヨ秴鏃舵湇鍔¤垂' }]"
+ >
<ProFormInputNumber
:controls="false"
v-model="form.timeoutServiceFee"
@@ -78,6 +94,7 @@
:min="0"
:max="999999999999"
unit="鍏�/灏忔椂"
+ :disabled="feeCannotEdit"
></ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
@@ -96,6 +113,7 @@
:value-enum="EnumSettlementCycleText"
:button-style="false"
@change="handleSettlementCycleChange"
+ :disabled="feeCannotEdit"
></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
@@ -374,9 +392,13 @@
}
function disabledapplyDate(time: Date) {
- return dayjs(time).isBefore(form.time[0], 'day');
+ 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();
const { closeViewPush } = useRouteView();
--
Gitblit v1.9.1