From e9e51e1418443b816e8b00a83035d92768653933 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期六, 08 十一月 2025 14:42:41 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 147 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 124 insertions(+), 23 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 969eace..7a91f45 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">
@@ -30,7 +31,7 @@
placeholder="璇疯緭鍏ラ渶姹備汉鏁�"
:min="0"
:max="999999999999"
- type="text"
+ :precision="0"
/>
<div class="form-input-unit">浜�</div>
</div>
@@ -44,17 +45,21 @@
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>
+ <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
- 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
@@ -65,16 +70,12 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
/>
<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"
@@ -90,6 +91,7 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
/>
<div class="form-input-unit">{{ '灏忔椂/澶�' }}</div>
</div>
@@ -109,11 +111,33 @@
: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"
+ />
+ <div class="form-input-unit">{{ '浠�' }}</div>
+ </div>
+ </nut-form-item>
<nut-form-item
label="缁撶畻鏂瑰紡:"
class="bole-form-item"
@@ -126,9 +150,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
@@ -273,17 +301,27 @@
<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="缁撶畻鏂瑰紡:"
@@ -298,6 +336,14 @@
:value-enum="settlementAccessList"
:disabled="isEdit"
/>
+ </nut-form-item>
+ <nut-form-item
+ label="棰勮鏈嶅姟璐规�婚:"
+ class="bole-form-item"
+ prop="totalServiceFee"
+ label-width="110px"
+ >
+ {{ `${toThousand(form.totalServiceFee)}鍏僠 }}
</nut-form-item>
</nut-form>
</ContentScrollView>
@@ -335,7 +381,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';
@@ -369,6 +415,10 @@
: form.beginTime
? dayjs(form.beginTime).toDate()
: nowDate;
+});
+
+const feeCannotEdit = computed(() => {
+ return dayjs().isAfter(form.beginTime, 'second') && isEdit;
});
const { dictionaryDataList: WelfareTypeList } = useDictionaryDataSelect({
@@ -410,16 +460,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: '璇烽�夋嫨缁撶畻鏂瑰紡' }],
@@ -474,6 +530,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);
@@ -506,6 +568,12 @@
},
},
],
+ checkReceiveMethods: [
+ {
+ required: true,
+ message: '璇烽�夋嫨楠屾敹鏂瑰紡',
+ },
+ ],
});
const { settlementAccessList } = useEnterpriseWalletAccessSelect({
@@ -535,6 +603,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);
@@ -557,12 +626,32 @@
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;
+
+ calcTaskTotalServiceFee();
},
});
+
+async function calcTaskTotalServiceFee() {
+ try {
+ 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);
+ if (res) {
+ form.totalServiceFee = res.totalServiceFee;
+ }
+ } catch (error) {}
+}
const formRef = ref<any>(null);
function handleConfirm() {
@@ -576,12 +665,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,
@@ -600,7 +692,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,
@@ -611,7 +703,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() {
@@ -619,7 +711,16 @@
},
});
}
- } catch (error) {}
+ } catch (error) {
+ if (error?.info?.errorCode == 'BalanceNotEnough') {
+ await Message.confirm({
+ message: `鎮ㄥ綋鍓嶈处鎴蜂綑棰濅笉瓒筹紝鏆傛椂鏃犳硶鍙戝竷浠诲姟锛岃鐧诲綍瀹㈡埛绔悗鍙板厖鍊煎悗鎿嶄綔`,
+ showCancelBtn: false,
+ });
+ } else {
+ Message.error(error);
+ }
+ }
}
function timeChange() {
--
Gitblit v1.9.1