From f95d3066203612a450e462edd679eb5a4973f35c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 十一月 2025 16:59:29 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 100 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 86 insertions(+), 14 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 9a21840..66120ad 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -12,6 +12,7 @@
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">
@@ -31,6 +32,7 @@
:min="0"
:max="999999999999"
:precision="0"
+ @change="calcTaskTotalServiceFee"
/>
<div class="form-input-unit">浜�</div>
</div>
@@ -43,10 +45,18 @@
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
@@ -65,6 +75,8 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
+ @change="calcTaskTotalServiceFee"
/>
<div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
</div>
@@ -85,6 +97,8 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
+ @change="calcTaskTotalServiceFee"
/>
<div class="form-input-unit">{{ '灏忔椂/澶�' }}</div>
</div>
@@ -104,6 +118,7 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
/>
<div class="form-input-unit">{{ '鍏�/灏忔椂' }}</div>
</div>
@@ -125,6 +140,8 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
+ @change="calcTaskTotalServiceFee"
/>
<div class="form-input-unit">{{ '浠�' }}</div>
</div>
@@ -141,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
@@ -259,6 +280,7 @@
v-model="form.endTime"
:minDate="nowDate"
placeholder="璇烽�夋嫨浠诲姟缁撴潫鏃ユ湡"
+ @change="calcTaskTotalServiceFee()"
></ChooseInputWithDatePicker>
</nut-form-item>
<nut-form-item
@@ -288,7 +310,7 @@
<nut-form-item
label="楠屾敹鏂瑰紡:"
class="bole-form-item"
- prop="checkReceiveMethod"
+ prop="checkReceiveMethods"
label-width="90px"
>
<!-- <nut-radio-group v-model="form.checkReceiveMethod" direction="horizontal">
@@ -301,6 +323,7 @@
</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"
@@ -329,7 +352,7 @@
prop="totalServiceFee"
label-width="110px"
>
- {{ form.totalServiceFee }}
+ {{ `${toThousand(totalServiceFee)}鍏僠 }}
</nut-form-item>
</nut-form>
</ContentScrollView>
@@ -367,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';
@@ -391,8 +414,8 @@
const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
-const isEdit = !!taskId;
const isCopy = router.params?.isCopy === 'true';
+const isEdit = !!taskId && !isCopy;
const nowDate = dayjs().toDate();
const applyBeginTimeMinDate = computed(() => {
@@ -401,6 +424,10 @@
: form.beginTime
? dayjs(form.beginTime).toDate()
: nowDate;
+});
+
+const feeCannotEdit = computed(() => {
+ return dayjs().isAfter(form.beginTime, 'second') && isEdit;
});
const { dictionaryDataList: WelfareTypeList } = useDictionaryDataSelect({
@@ -550,6 +577,16 @@
},
},
],
+ checkReceiveMethods: [
+ {
+ required: true,
+ message: '璇烽�夋嫨楠屾敹鏂瑰紡',
+ validator(value) {
+ if (!value?.length) return Promise.reject('璇烽�夋嫨楠屾敹鏂瑰紡');
+ return Promise.resolve(true);
+ },
+ },
+ ],
});
const { settlementAccessList } = useEnterpriseWalletAccessSelect({
@@ -572,7 +609,7 @@
);
},
placeholderData: () => ({} as API.GetTaskInfoQueryResult),
- enabled: isEdit,
+ enabled: isEdit || isCopy,
onSuccess(data) {
form.supplierEnterpriseId = data.supplierEnterpriseId;
form.name = data.name;
@@ -598,6 +635,7 @@
latitude: data.latitude,
longitude: data.longitude,
addressName: data.addressName,
+ address: data.addressName,
};
form.description = data.description;
form.verifyWorkHours = data.verifyWorkHours;
@@ -606,11 +644,21 @@
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,
@@ -620,10 +668,33 @@
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);
- return res;
+ 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);
function handleConfirm() {
@@ -698,6 +769,7 @@
function timeChange() {
form.applyBeginTime = '';
form.applyEndTime = '';
+ calcTaskTotalServiceFee();
}
function applyTimeChange() {
--
Gitblit v1.9.1