From 27652573ea8a58d5593791e27b4d326f84187093 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 十二月 2025 21:37:30 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 95 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 27 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index c651ec1..2999743 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -13,6 +13,7 @@
placeholder="璇烽�夋嫨渚涘簲鍟�"
:value-enum="supplierEnterpriseSelect"
:disabled="isEdit"
+ @change="supplierEnterpriseChange"
/>
</nut-form-item>
<nut-form-item label="浠诲姟鍚嶇О:" class="bole-form-item" prop="name" label-width="90px">
@@ -335,14 +336,19 @@
<nut-form-item
label="淇濋櫓浜у搧:"
class="bole-form-item"
- prop="supplierEnterpriseId"
+ prop="insuranceProductId"
label-width="90px"
required
+ v-if="
+ form.checkReceiveMethods.includes(EnumTaskCheckReceiveMethod.CheckIn) &&
+ form.isConfiguredInsurance
+ "
>
<ChooseInputWithPicker
- v-model="form.supplierEnterpriseId"
+ v-model="form.insuranceProductId"
placeholder="璇烽�夋嫨淇濋櫓浜у搧"
- :value-enum="supplierEnterpriseSelect"
+ :value-enum="enterpriseInsuranceProductSelect"
+ @change="calcTaskTotalServiceFee()"
/>
</nut-form-item>
<nut-form-item
@@ -365,7 +371,7 @@
prop="totalServiceFee"
label-width="110px"
>
- {{ `${toThousand(totalServiceFee)}鍏僠 }}
+ {{ `${toThousand(form.totalServiceFee)}鍏僠 }}
</nut-form-item>
</nut-form>
</ContentScrollView>
@@ -411,6 +417,7 @@
import {
useAllAreaList,
useDictionaryDataSelect,
+ useEnterpriseInsuranceProductSelect,
useEnterpriseWalletAccessSelect,
useGetSupplierEnterpriseSelect,
} from '@12333/hooks';
@@ -425,6 +432,7 @@
const { findAreaNameFromCode } = useAllAreaList();
const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
+
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const isCopy = router.params?.isCopy === 'true';
@@ -489,6 +497,8 @@
totalPieceQuantity: '' as any as number,
totalServiceFee: null as number,
+ insuranceProductId: '',
+ isConfiguredInsurance: false,
});
const rules = reactive<FormRules>({
@@ -600,10 +610,25 @@
},
},
],
+ insuranceProductId: [
+ {
+ required: true,
+ message: '璇烽�夋嫨淇濋櫓浜у搧',
+ validator(value) {
+ if (!value?.length) return Promise.reject('璇烽�夋嫨淇濋櫓浜у搧');
+ return Promise.resolve(true);
+ },
+ },
+ ],
});
const { settlementAccessList } = useEnterpriseWalletAccessSelect({
supplierEnterpriseId: computed(() => form.supplierEnterpriseId),
+});
+
+const { enterpriseInsuranceProductSelect } = useEnterpriseInsuranceProductSelect({
+ supplierEnterpriseId: computed(() => form.supplierEnterpriseId),
+ isConfiguredInsurance: computed(() => form.isConfiguredInsurance),
});
const {
@@ -657,7 +682,10 @@
form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
form.settlementAccess = data.settlementAccess;
+ form.insuranceProductId = data.insuranceProductId;
+ form.totalServiceFee = data.estimatedServiceFee;
+ supplierEnterpriseChange();
if (!!data.timeoutServiceFee) {
calcTaskTotalServiceFee();
}
@@ -666,21 +694,25 @@
async function calcTaskTotalServiceFee() {
try {
+ console.log();
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,
+ needPeopleNumber: form.needPeopleNumber ? form.needPeopleNumber : 0,
beginTime: dayjs(form.beginTime).format('YYYY-MM-DD 00:00:00'),
endTime: dayjs(form.endTime).format('YYYY-MM-DD 23:59:59'),
+ supplierEnterpriseId: form.supplierEnterpriseId,
+ checkReceiveMethods: form.checkReceiveMethods,
};
+ if (form.insuranceProductId) {
+ params.insuranceProductId = form.insuranceProductId;
+ }
let res = await taskServices.calcTaskTotalServiceFee(params, { showLoading: false });
if (res) {
form.totalServiceFee = res.totalServiceFee;
@@ -688,26 +720,34 @@
} catch (error) {}
}
-const totalServiceFee = computed(() => {
- if (!form.beginTime || !form.endTime) {
- return 0;
+function supplierEnterpriseChange() {
+ if (form.supplierEnterpriseId) {
+ form.isConfiguredInsurance = supplierEnterpriseSelect.value?.find(
+ (item) => item.value === form.supplierEnterpriseId
+ )?.data?.isConfiguredInsurance;
}
- 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 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() {
@@ -752,6 +792,7 @@
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,
+ insuranceProductId: form.insuranceProductId ? form.insuranceProductId : null,
};
if (form.billingMethod !== EnumBillingMethod.Face) {
params.serviceFee = form.serviceFee;
--
Gitblit v1.9.1