From fd8ce5686b0f132cd5fa0922c12e367383d542c3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 07 十一月 2025 15:11:32 +0800
Subject: [PATCH] fix: s
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 5ad7f08..5f5c344 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -50,11 +50,11 @@
</nut-radio-group>
</nut-form-item>
<nut-form-item
- v-if="form.billingMethod !== EnumBillingMethod.Face"
label=" "
class="bole-form-item"
prop="serviceFee"
label-width="0"
+ v-if="form.billingMethod !== EnumBillingMethod.Face"
>
<div class="bole-form-input-wrapper">
<NumberInput
@@ -69,12 +69,7 @@
<div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
</div>
</nut-form-item>
- <template
- v-if="
- form.billingMethod === EnumBillingMethod.Hour ||
- form.billingMethod === EnumBillingMethod.Day
- "
- >
+ <template v-if="form.billingMethod === EnumBillingMethod.Hour">
<nut-form-item
label="鏍稿畾宸ユ椂:"
class="bole-form-item"
@@ -118,12 +113,12 @@
v-if="form.billingMethod === EnumBillingMethod.Piece"
label="鎬讳欢鏁�:"
class="bole-form-item"
- prop="totalPieces"
+ prop="totalPieceQuantity"
label-width="90"
>
<div class="bole-form-input-wrapper">
<NumberInput
- v-model.trim="form.totalPieces"
+ v-model.trim="form.totalPieceQuantity"
class="nut-input-text bole-input-text"
placeholder="璇疯緭鍏ヤ换鍔℃�讳欢鏁�"
:min="0"
@@ -304,8 +299,12 @@
>{{ val }}</BlRadio
>
</nut-radio-group> -->
- <nut-checkbox-group v-model="form.checkReceiveMethod">
- <nut-checkbox v-for="(val, key) in EnumTaskCheckReceiveMethodText" :key="key">
+ <nut-checkbox-group v-model="form.checkReceiveMethods">
+ <nut-checkbox
+ v-for="(val, key) in EnumTaskCheckReceiveMethodText"
+ :key="key"
+ :label="Number(key) as any"
+ >
{{ val }}
</nut-checkbox>
</nut-checkbox-group>
@@ -323,6 +322,14 @@
:value-enum="settlementAccessList"
:disabled="isEdit"
/>
+ </nut-form-item>
+ <nut-form-item
+ label="棰勮鏈嶅姟璐规�婚:"
+ class="bole-form-item"
+ prop="totalServiceFee"
+ label-width="110px"
+ >
+ {{ form.totalServiceFee }}
</nut-form-item>
</nut-form>
</ContentScrollView>
@@ -435,18 +442,20 @@
verifyWorkHours: null as number,
timeoutServiceFee: null as number,
description: '',
- checkReceiveMethod: [EnumTaskCheckReceiveMethod.CheckIn],
+ checkReceiveMethods: [] as EnumTaskCheckReceiveMethod[],
applyBeginTime: '',
applyEndTime: '',
settlementAccess: '' as any as EnumEnterpriseWalletAccess,
- totalPieces: '' as any as number,
+ totalPieceQuantity: '' as any as number,
+
+ totalServiceFee: null as number,
});
const rules = reactive<FormRules>({
supplierEnterpriseId: [{ required: true, message: '璇烽�夋嫨渚涘簲鍟�' }],
name: [{ required: true, message: '璇疯緭鍏ヤ换鍔″悕绉�' }],
needPeopleNumber: [{ required: true, message: '璇疯緭鍏ラ渶姹備汉鏁�' }],
- totalPieces: [{ required: true, message: '璇疯緭鍏ヤ换鍔℃�讳欢鏁�' }],
+ totalPieceQuantity: [{ required: true, message: '璇疯緭鍏ヤ换鍔℃�讳欢鏁�' }],
verifyWorkHours: [{ required: true, message: '璇疯緭鍏ユ牳瀹氬伐鏃�' }],
timeoutServiceFee: [{ required: true, message: '璇疯緭鍏ヨ秴鏃舵湇鍔¤垂' }],
genderLimit: [{ required: true, message: '璇烽�夋嫨鎬у埆瑕佹眰' }],
@@ -503,6 +512,12 @@
message: '璇烽�夋嫨缁撴潫鏃ユ湡',
validator(value) {
if (!value) return Promise.reject('璇烽�夋嫨缁撴潫鏃ユ湡');
+ if (form.billingMethod === EnumBillingMethod.Month) {
+ if (dayjs(form.endTime).isBefore(dayjs(form.beginTime).add(1, 'month'))) {
+ return Promise.reject('鎸夋湀鏈嶅姟璐癸紝浠诲姟鏃堕暱闇�澶т簬涓�涓湀');
+ }
+ return Promise.resolve(true);
+ }
if (dayjs(value).isBefore(dayjs(form.beginTime)))
return Promise.reject('缁撴潫鏃ユ湡闇�澶т簬寮�濮嬫棩鏈�');
return Promise.resolve(true);
@@ -564,6 +579,7 @@
form.needPeopleNumber = data.needPeopleNumber;
form.billingMethod = data.billingMethod;
form.serviceFee = data.serviceFee;
+ form.totalPieceQuantity = data.totalPieceQuantity;
form.settlementCycle = data.settlementCycle;
form.settlementDate = data.settlementDate;
form.benefits = (data.benefits ?? []).map((item) => item.benefitCode);
@@ -586,7 +602,7 @@
form.description = data.description;
form.verifyWorkHours = data.verifyWorkHours;
form.timeoutServiceFee = data.timeoutServiceFee;
- form.checkReceiveMethod = data.checkReceiveMethod;
+ form.checkReceiveMethods = data.checkReceiveMethods;
form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
form.settlementAccess = data.settlementAccess;
@@ -605,12 +621,17 @@
async function confirm() {
try {
+ // await Message.confirm({
+ // message: `鎮ㄥ綋鍓嶈处鎴蜂綑棰濅笉瓒筹紝鏆傛椂鏃犳硶鍙戝竷浠诲姟锛岃鐧诲綍瀹㈡埛绔悗鍙板厖鍊煎悗鎿嶄綔`,
+ // showCancelBtn: false,
+ // });
let params: API.SaveTaskInfoCommand = {
supplierEnterpriseId: form.supplierEnterpriseId,
name: form.name,
needPeopleNumber: form.needPeopleNumber,
billingMethod: form.billingMethod,
serviceFee: form.serviceFee,
+ totalPieceQuantity: form.totalPieceQuantity,
settlementCycle: form.settlementCycle,
settlementDate: form.settlementDate ? form.settlementDate : 0,
benefits: form.benefits,
@@ -629,7 +650,7 @@
description: form.description,
verifyWorkHours: form.verifyWorkHours,
timeoutServiceFee: form.timeoutServiceFee,
- checkReceiveMethod: form.checkReceiveMethod,
+ checkReceiveMethods: form.checkReceiveMethods,
applyBeginTime: dayjs(form.applyBeginTime).format('YYYY-MM-DD 00:00:00'),
applyEndTime: dayjs(form.applyEndTime).format('YYYY-MM-DD 23:59:59'),
settlementAccess: form.settlementAccess,
--
Gitblit v1.9.1