From 1138cd0ece8fda7dda4508e8cf4bf050f53c0f0a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 十一月 2025 14:07:47 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 252 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 223 insertions(+), 29 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index e2d71ef..6d0d3e3 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -1,8 +1,41 @@
<template>
<ContentScrollView :paddingH="false">
<nut-form :model-value="form" ref="formRef" :rules="rules">
+ <nut-form-item
+ label="渚涘簲鍟�:"
+ class="bole-form-item"
+ prop="supplierEnterpriseId"
+ label-width="90px"
+ required
+ >
+ <ChooseInputWithPicker
+ v-model="form.supplierEnterpriseId"
+ placeholder="璇烽�夋嫨渚涘簲鍟�"
+ :value-enum="supplierEnterpriseSelect"
+ :disabled="isEdit"
+ />
+ </nut-form-item>
<nut-form-item label="浠诲姟鍚嶇О:" class="bole-form-item" prop="name" label-width="90px">
<nut-input v-model="form.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�"> </nut-input>
+ </nut-form-item>
+ <nut-form-item
+ label="闇�姹備汉鏁�:"
+ class="bole-form-item"
+ prop="needPeopleNumber"
+ label-width="90px"
+ >
+ <div class="bole-form-input-wrapper">
+ <NumberInput
+ v-model.trim="form.needPeopleNumber"
+ class="nut-input-text bole-input-text"
+ placeholder="璇疯緭鍏ラ渶姹備汉鏁�"
+ :min="0"
+ :max="999999999999"
+ :precision="0"
+ @change="calcTaskTotalServiceFee"
+ />
+ <div class="form-input-unit">浜�</div>
+ </div>
</nut-form-item>
<nut-form-item
label="鏈嶅姟璐�:"
@@ -12,13 +45,27 @@
label-width="90px"
label-position="top"
>
- <nut-radio-group v-model="form.billingMethod" direction="horizontal">
- <BlRadio :label="Number(key)" v-for="(val, key) in EnumBillingMethodText" :key="key">{{
- val
- }}</BlRadio>
+ <nut-radio-group
+ v-model="form.billingMethod"
+ direction="horizontal"
+ @change="calcTaskTotalServiceFee"
+ >
+ <BlRadio
+ :label="Number(key)"
+ v-for="(val, key) in EnumBillingMethodText"
+ :key="key"
+ :disabled="feeCannotEdit"
+ >{{ val }}</BlRadio
+ >
</nut-radio-group>
</nut-form-item>
- <nut-form-item label=" " class="bole-form-item" prop="serviceFee" label-width="0">
+ <nut-form-item
+ label=" "
+ class="bole-form-item"
+ prop="serviceFee"
+ label-width="0"
+ v-if="form.billingMethod !== EnumBillingMethod.Face"
+ >
<div class="bole-form-input-wrapper">
<NumberInput
v-model.trim="form.serviceFee"
@@ -28,16 +75,13 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
+ @change="calcTaskTotalServiceFee"
/>
<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"
@@ -53,6 +97,8 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
+ @change="calcTaskTotalServiceFee"
/>
<div class="form-input-unit">{{ '灏忔椂/澶�' }}</div>
</div>
@@ -72,11 +118,34 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
/>
<div class="form-input-unit">{{ '鍏�/灏忔椂' }}</div>
</div>
</nut-form-item>
</template>
+ <nut-form-item
+ v-if="form.billingMethod === EnumBillingMethod.Piece"
+ label="鎬讳欢鏁�:"
+ class="bole-form-item"
+ prop="totalPieceQuantity"
+ label-width="90"
+ >
+ <div class="bole-form-input-wrapper">
+ <NumberInput
+ v-model.trim="form.totalPieceQuantity"
+ class="nut-input-text bole-input-text"
+ placeholder="璇疯緭鍏ヤ换鍔℃�讳欢鏁�"
+ :min="0"
+ :max="999999999999"
+ :precision="2"
+ type="text"
+ :disabled="feeCannotEdit"
+ @change="calcTaskTotalServiceFee"
+ />
+ <div class="form-input-unit">{{ '浠�' }}</div>
+ </div>
+ </nut-form-item>
<nut-form-item
label="缁撶畻鏂瑰紡:"
class="bole-form-item"
@@ -89,9 +158,13 @@
direction="horizontal"
@change="settleTypeChange"
>
- <BlRadio :label="Number(key)" v-for="(val, key) in EnumSettlementCycleText" :key="key">{{
- val
- }}</BlRadio>
+ <BlRadio
+ :label="Number(key)"
+ v-for="(val, key) in EnumSettlementCycleText"
+ :key="key"
+ :disabled="feeCannotEdit"
+ >{{ val }}</BlRadio
+ >
</nut-radio-group>
</nut-form-item>
<nut-form-item
@@ -207,6 +280,7 @@
v-model="form.endTime"
:minDate="nowDate"
placeholder="璇烽�夋嫨浠诲姟缁撴潫鏃ユ湡"
+ @change="calcTaskTotalServiceFee()"
></ChooseInputWithDatePicker>
</nut-form-item>
<nut-form-item
@@ -217,7 +291,7 @@
>
<ChooseInputWithDatePicker
v-model="form.applyBeginTime"
- :minDate="form.beginTime ? dayjs(form.beginTime).toDate() : nowDate"
+ :minDate="nowDate"
placeholder="璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�"
></ChooseInputWithDatePicker>
</nut-form-item>
@@ -229,24 +303,34 @@
>
<ChooseInputWithDatePicker
v-model="form.applyEndTime"
- :minDate="form.beginTime ? dayjs(form.beginTime).toDate() : nowDate"
+ :minDate="form.applyBeginTime ? dayjs(form.applyBeginTime).toDate() : nowDate"
placeholder="璇烽�夋嫨鎶ュ悕缁撴潫鏃ユ湡"
></ChooseInputWithDatePicker>
</nut-form-item>
<nut-form-item
label="楠屾敹鏂瑰紡:"
class="bole-form-item"
- prop="checkReceiveMethod"
+ prop="checkReceiveMethods"
label-width="90px"
>
- <nut-radio-group v-model="form.checkReceiveMethod" direction="horizontal">
+ <!-- <nut-radio-group v-model="form.checkReceiveMethod" direction="horizontal">
<BlRadio
:label="Number(key)"
v-for="(val, key) in EnumTaskCheckReceiveMethodText"
:key="key"
>{{ val }}</BlRadio
>
- </nut-radio-group>
+ </nut-radio-group> -->
+ <nut-checkbox-group v-model="form.checkReceiveMethods">
+ <nut-checkbox
+ :disabled="isEdit"
+ v-for="(val, key) in EnumTaskCheckReceiveMethodText"
+ :key="key"
+ :label="Number(key) as any"
+ >
+ {{ val }}
+ </nut-checkbox>
+ </nut-checkbox-group>
</nut-form-item>
<nut-form-item
label="缁撶畻鏂瑰紡:"
@@ -261,6 +345,14 @@
:value-enum="settlementAccessList"
:disabled="isEdit"
/>
+ </nut-form-item>
+ <nut-form-item
+ label="棰勮鏈嶅姟璐规�婚:"
+ class="bole-form-item"
+ prop="totalServiceFee"
+ label-width="110px"
+ >
+ {{ `${toThousand(totalServiceFee)}鍏僠 }}
</nut-form-item>
</nut-form>
</ContentScrollView>
@@ -298,7 +390,7 @@
ChooseInputWithAreaPicker,
ChooseInputWithCheckbox,
} from '@12333/components';
-import { FormValidator, Message } from '@12333/utils';
+import { FormValidator, Message, toThousand } from '@12333/utils';
import * as taskServices from '@12333/services/apiV2/task';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import Taro from '@tarojs/taro';
@@ -307,6 +399,7 @@
useAllAreaList,
useDictionaryDataSelect,
useEnterpriseWalletAccessSelect,
+ useGetSupplierEnterpriseSelect,
} from '@12333/hooks';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
@@ -317,7 +410,8 @@
const { userDetail } = useUser();
const { findAreaNameFromCode } = useAllAreaList();
-const { settlementAccessList } = useEnterpriseWalletAccessSelect();
+
+const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
@@ -330,6 +424,10 @@
: form.beginTime
? dayjs(form.beginTime).toDate()
: nowDate;
+});
+
+const feeCannotEdit = computed(() => {
+ return dayjs().isAfter(form.beginTime, 'second') && isEdit;
});
const { dictionaryDataList: WelfareTypeList } = useDictionaryDataSelect({
@@ -350,7 +448,9 @@
});
const form = reactive({
+ supplierEnterpriseId: '',
name: '',
+ needPeopleNumber: '' as any as number,
billingMethod: EnumBillingMethod.Day,
serviceFee: '' as any as number,
settlementCycle: EnumSettlementCycle.Day,
@@ -369,14 +469,22 @@
verifyWorkHours: null as number,
timeoutServiceFee: null as number,
description: '',
- checkReceiveMethod: EnumTaskCheckReceiveMethod.CheckIn,
+ checkReceiveMethods: [] as EnumTaskCheckReceiveMethod[],
applyBeginTime: '',
applyEndTime: '',
settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ 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: '璇疯緭鍏ラ渶姹備汉鏁�' }],
+ totalPieceQuantity: [{ required: true, message: '璇疯緭鍏ヤ换鍔℃�讳欢鏁�' }],
+ verifyWorkHours: [{ required: true, message: '璇疯緭鍏ユ牳瀹氬伐鏃�' }],
+ timeoutServiceFee: [{ required: true, message: '璇疯緭鍏ヨ秴鏃舵湇鍔¤垂' }],
genderLimit: [{ required: true, message: '璇烽�夋嫨鎬у埆瑕佹眰' }],
settlementCycleDate: [{ required: true, message: '璇疯缃粨绠楁棩鏈�' }],
settlementAccess: [{ required: true, message: '璇烽�夋嫨缁撶畻鏂瑰紡' }],
@@ -389,7 +497,7 @@
if (!form.billingMethod) {
return Promise.reject('璇烽�夋嫨鏈嶅姟璐圭被鍨�');
}
- if (!form.serviceFee) {
+ if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
return Promise.reject('璇疯緭鍏ユ湇鍔¤垂');
}
return Promise.resolve(true);
@@ -431,6 +539,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);
@@ -443,8 +557,6 @@
message: '璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�',
validator(value) {
if (!value) return Promise.reject('璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�');
- if (dayjs(value).isBefore(dayjs(form.beginTime)))
- return Promise.reject('鎶ュ悕寮�濮嬫棩鏈熼渶澶т簬浠诲姟寮�濮嬫棩鏈�');
if (dayjs(value).isAfter(dayjs(form.endTime)))
return Promise.reject('鎶ュ悕寮�濮嬫棩鏈熼渶灏忎簬浠诲姟缁撴潫鏃ユ湡');
return Promise.resolve(true);
@@ -465,6 +577,20 @@
},
},
],
+ checkReceiveMethods: [
+ {
+ required: true,
+ message: '璇烽�夋嫨楠屾敹鏂瑰紡',
+ validator(value) {
+ if (!value?.length) return Promise.reject('璇烽�夋嫨楠屾敹鏂瑰紡');
+ return Promise.resolve(true);
+ },
+ },
+ ],
+});
+
+const { settlementAccessList } = useEnterpriseWalletAccessSelect({
+ supplierEnterpriseId: computed(() => form.supplierEnterpriseId),
});
const {
@@ -485,9 +611,12 @@
placeholderData: () => ({} as API.GetTaskInfoQueryResult),
enabled: isEdit,
onSuccess(data) {
+ form.supplierEnterpriseId = data.supplierEnterpriseId;
form.name = data.name;
+ 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);
@@ -506,15 +635,65 @@
latitude: data.latitude,
longitude: data.longitude,
addressName: data.addressName,
+ address: data.addressName,
};
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;
+
+ if (!!data.timeoutServiceFee) {
+ calcTaskTotalServiceFee();
+ }
},
+});
+
+async function calcTaskTotalServiceFee() {
+ try {
+ if (!form.beginTime || !form.endTime) {
+ return;
+ }
+ if (form.billingMethod !== EnumBillingMethod.Piece && !form.needPeopleNumber) {
+ return;
+ }
+ let params: API.CalcTaskTotalServiceFeeCommand = {
+ billingMethod: form.billingMethod,
+ serviceFee: form.serviceFee,
+ verifyWorkHours: form.verifyWorkHours,
+ totalPieceQuantity: form.totalPieceQuantity,
+ needPeopleNumber: form.needPeopleNumber,
+ beginTime: dayjs(form.beginTime).format('YYYY-MM-DD 00:00:00'),
+ endTime: dayjs(form.endTime).format('YYYY-MM-DD 23:59:59'),
+ };
+ let res = await taskServices.calcTaskTotalServiceFee(params, { showLoading: false });
+ if (res) {
+ form.totalServiceFee = res.totalServiceFee;
+ }
+ } catch (error) {}
+}
+
+const totalServiceFee = computed(() => {
+ if (!form.beginTime || !form.endTime) {
+ return 0;
+ }
+ var days = dayjs(form.endTime).diff(dayjs(form.beginTime), 'day') + 1;
+ const serviceFee = form.serviceFee || 0;
+ const needPeopleNumber = form.needPeopleNumber || 0;
+ switch (form.billingMethod) {
+ case EnumBillingMethod.Month:
+ return serviceFee * Math.round(days / 30) * needPeopleNumber;
+ case EnumBillingMethod.Day:
+ return serviceFee * days * needPeopleNumber;
+ case EnumBillingMethod.Hour:
+ return serviceFee * (form.verifyWorkHours || 0) * days * needPeopleNumber;
+ case EnumBillingMethod.Piece:
+ return serviceFee * (form.totalPieceQuantity || 0);
+ default:
+ return 0;
+ }
});
const formRef = ref<any>(null);
@@ -529,10 +708,15 @@
async function confirm() {
try {
+ await calcTaskTotalServiceFee();
+
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,
@@ -551,7 +735,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,
@@ -562,7 +746,7 @@
if (isCopy) {
params.id = '';
}
- let res = await taskServices.saveTaskInfo(params);
+ let res = await taskServices.saveTaskInfo(params, { skipErrorHandler: true });
if (res) {
Message.success(isEdit && !isCopy ? '缂栬緫鎴愬姛' : '鍙戝竷鎴愬姛', {
onClosed() {
@@ -570,12 +754,22 @@
},
});
}
- } catch (error) {}
+ } catch (error) {
+ if (error?.info?.errorCode == 'BalanceNotEnough') {
+ await Message.confirm({
+ message: `鎮ㄥ綋鍓嶈处鎴蜂綑棰濅笉瓒筹紝鏆傛椂鏃犳硶鍙戝竷浠诲姟锛岃鐧诲綍瀹㈡埛绔悗鍙板厖鍊煎悗鎿嶄綔`,
+ showCancelBtn: false,
+ });
+ } else {
+ Message.error(error);
+ }
+ }
}
function timeChange() {
form.applyBeginTime = '';
form.applyEndTime = '';
+ calcTaskTotalServiceFee();
}
function applyTimeChange() {
--
Gitblit v1.9.1