From 1cd0affba5f0d64c21669f0a57f1bf9c979a7644 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 21 十月 2025 19:06:31 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index f0a2eb6..cb1a33e 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -18,7 +18,13 @@
}}</BlRadio>
</nut-radio-group>
</nut-form-item>
- <nut-form-item label=" " class="bole-form-item" prop="serviceFee" label-width="0">
+ <nut-form-item
+ v-if="form.billingMethod !== EnumBillingMethod.Face"
+ label=" "
+ class="bole-form-item"
+ prop="serviceFee"
+ label-width="0"
+ >
<div class="bole-form-input-wrapper">
<NumberInput
v-model.trim="form.serviceFee"
@@ -32,7 +38,12 @@
<div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
</div>
</nut-form-item>
- <template v-if="form.billingMethod === EnumBillingMethod.Hour">
+ <template
+ v-if="
+ form.billingMethod === EnumBillingMethod.Hour ||
+ form.billingMethod === EnumBillingMethod.Day
+ "
+ >
<nut-form-item
label="鏍稿畾宸ユ椂:"
class="bole-form-item"
@@ -194,6 +205,7 @@
v-model="form.beginTime"
:minDate="nowDate"
placeholder="璇烽�夋嫨浠诲姟寮�濮嬫棩鏈�"
+ @change="timeChange"
></ChooseInputWithDatePicker>
</nut-form-item>
<nut-form-item label="浠诲姟缁撴潫鏃ユ湡:" class="bole-form-item" prop="endTime" label-width="90px">
@@ -211,7 +223,7 @@
>
<ChooseInputWithDatePicker
v-model="form.applyBeginTime"
- :minDate="form.beginTime ? dayjs(form.beginTime).toDate() : nowDate"
+ :minDate="nowDate"
placeholder="璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�"
></ChooseInputWithDatePicker>
</nut-form-item>
@@ -223,7 +235,7 @@
>
<ChooseInputWithDatePicker
v-model="form.applyEndTime"
- :max-date="form.endTime ? dayjs(form.endTime).toDate() : nowDate"
+ :minDate="form.beginTime ? dayjs(form.beginTime).toDate() : nowDate"
placeholder="璇烽�夋嫨鎶ュ悕缁撴潫鏃ユ湡"
></ChooseInputWithDatePicker>
</nut-form-item>
@@ -318,6 +330,13 @@
const isCopy = router.params?.isCopy === 'true';
const nowDate = dayjs().toDate();
+const applyBeginTimeMinDate = computed(() => {
+ return form.applyBeginTime
+ ? dayjs(form.applyBeginTime).toDate()
+ : form.beginTime
+ ? dayjs(form.beginTime).toDate()
+ : nowDate;
+});
const { dictionaryDataList: WelfareTypeList } = useDictionaryDataSelect({
categoryCode: CategoryCode.Welfare,
@@ -376,7 +395,7 @@
if (!form.billingMethod) {
return Promise.reject('璇烽�夋嫨鏈嶅姟璐圭被鍨�');
}
- if (!form.serviceFee) {
+ if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
return Promise.reject('璇疯緭鍏ユ湇鍔¤垂');
}
return Promise.resolve(true);
@@ -427,17 +446,25 @@
applyBeginTime: [
{
required: true,
- message: '璇烽�夋嫨浠诲姟寮�濮嬫棩鏈�',
+ message: '璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�',
+ validator(value) {
+ if (!value) return Promise.reject('璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�');
+ if (dayjs(value).isAfter(dayjs(form.endTime)))
+ return Promise.reject('鎶ュ悕寮�濮嬫棩鏈熼渶灏忎簬浠诲姟缁撴潫鏃ユ湡');
+ return Promise.resolve(true);
+ },
},
],
applyEndTime: [
{
required: true,
- message: '璇烽�夋嫨浠诲姟缁撴潫鏃ユ湡',
+ message: '璇烽�夋嫨鎶ュ悕缁撴潫鏃ユ湡',
validator(value) {
- if (!value) return Promise.reject('璇烽�夋嫨浠诲姟缁撴潫鏃ユ湡');
+ if (!value) return Promise.reject('璇烽�夋嫨鎶ュ悕缁撴潫鏃ユ湡');
if (dayjs(value).isBefore(dayjs(form.applyBeginTime)))
- return Promise.reject('浠诲姟缁撴潫鏃ユ湡闇�澶т簬浠诲姟寮�濮嬫棩鏈�');
+ return Promise.reject('鎶ュ悕缁撴潫鏃ユ湡闇�澶т簬鎶ュ悕寮�濮嬫棩鏈�');
+ if (dayjs(value).isAfter(dayjs(form.endTime)))
+ return Promise.reject('鎶ュ悕缁撴潫鏃ユ湡闇�灏忎簬浠诲姟缁撴潫鏃ユ湡');
return Promise.resolve(true);
},
},
@@ -550,6 +577,15 @@
} catch (error) {}
}
+function timeChange() {
+ form.applyBeginTime = '';
+ form.applyEndTime = '';
+}
+
+function applyTimeChange() {
+ form.applyEndTime = '';
+}
+
function settleTypeChange() {
form.settlementDate = null as number;
}
--
Gitblit v1.9.1