From 2ead0564b60f70c4e19ab3567698c202c10c316d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 07 十一月 2025 10:44:57 +0800
Subject: [PATCH] feat: 1.3.0.1
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 2a76e28..929c777 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -1,8 +1,39 @@
<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"
+ />
+ </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"
+ />
+ <div class="form-input-unit">浜�</div>
+ </div>
</nut-form-item>
<nut-form-item
label="鏈嶅姟璐�:"
@@ -19,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
@@ -83,6 +114,26 @@
</div>
</nut-form-item>
</template>
+ <nut-form-item
+ v-if="form.billingMethod === EnumBillingMethod.Piece"
+ label="鎬讳欢鏁�:"
+ class="bole-form-item"
+ prop="totalPieces"
+ label-width="90"
+ >
+ <div class="bole-form-input-wrapper">
+ <NumberInput
+ v-model.trim="form.totalPieces"
+ class="nut-input-text bole-input-text"
+ placeholder="璇疯緭鍏ヤ换鍔℃�讳欢鏁�"
+ :min="0"
+ :max="999999999999"
+ :precision="2"
+ type="text"
+ />
+ <div class="form-input-unit">{{ '浠�' }}</div>
+ </div>
+ </nut-form-item>
<nut-form-item
label="缁撶畻鏂瑰紡:"
class="bole-form-item"
@@ -223,7 +274,7 @@
>
<ChooseInputWithDatePicker
v-model="form.applyBeginTime"
- :minDate="form.beginTime ? dayjs(form.beginTime).toDate() : nowDate"
+ :minDate="nowDate"
placeholder="璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�"
></ChooseInputWithDatePicker>
</nut-form-item>
@@ -235,7 +286,7 @@
>
<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>
@@ -245,14 +296,23 @@
prop="checkReceiveMethod"
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
+ v-for="(val, key) in EnumTaskCheckReceiveMethodText"
+ :key="key"
+ :label="key as any"
+ >
+ {{ val }}
+ </nut-checkbox>
+ </nut-checkbox-group>
</nut-form-item>
<nut-form-item
label="缁撶畻鏂瑰紡:"
@@ -267,6 +327,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>
@@ -313,6 +381,7 @@
useAllAreaList,
useDictionaryDataSelect,
useEnterpriseWalletAccessSelect,
+ useGetSupplierEnterpriseSelect,
} from '@12333/hooks';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
@@ -323,7 +392,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;
@@ -356,7 +426,9 @@
});
const form = reactive({
+ supplierEnterpriseId: '',
name: '',
+ needPeopleNumber: '' as any as number,
billingMethod: EnumBillingMethod.Day,
serviceFee: '' as any as number,
settlementCycle: EnumSettlementCycle.Day,
@@ -375,14 +447,22 @@
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,
+
+ totalServiceFee: null as number,
});
const rules = reactive<FormRules>({
+ supplierEnterpriseId: [{ required: true, message: '璇烽�夋嫨渚涘簲鍟�' }],
name: [{ required: true, message: '璇疯緭鍏ヤ换鍔″悕绉�' }],
+ needPeopleNumber: [{ required: true, message: '璇疯緭鍏ラ渶姹備汉鏁�' }],
+ totalPieces: [{ required: true, message: '璇疯緭鍏ヤ换鍔℃�讳欢鏁�' }],
+ verifyWorkHours: [{ required: true, message: '璇疯緭鍏ユ牳瀹氬伐鏃�' }],
+ timeoutServiceFee: [{ required: true, message: '璇疯緭鍏ヨ秴鏃舵湇鍔¤垂' }],
genderLimit: [{ required: true, message: '璇烽�夋嫨鎬у埆瑕佹眰' }],
settlementCycleDate: [{ required: true, message: '璇疯缃粨绠楁棩鏈�' }],
settlementAccess: [{ required: true, message: '璇烽�夋嫨缁撶畻鏂瑰紡' }],
@@ -395,7 +475,7 @@
if (!form.billingMethod) {
return Promise.reject('璇烽�夋嫨鏈嶅姟璐圭被鍨�');
}
- if (!form.serviceFee) {
+ if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
return Promise.reject('璇疯緭鍏ユ湇鍔¤垂');
}
return Promise.resolve(true);
@@ -437,6 +517,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);
@@ -449,8 +535,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);
@@ -473,6 +557,10 @@
],
});
+const { settlementAccessList } = useEnterpriseWalletAccessSelect({
+ supplierEnterpriseId: computed(() => form.supplierEnterpriseId),
+});
+
const {
isLoading,
isError,
@@ -491,7 +579,9 @@
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.settlementCycle = data.settlementCycle;
@@ -516,7 +606,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;
@@ -536,7 +626,9 @@
async function confirm() {
try {
let params: API.SaveTaskInfoCommand = {
+ supplierEnterpriseId: form.supplierEnterpriseId,
name: form.name,
+ needPeopleNumber: form.needPeopleNumber,
billingMethod: form.billingMethod,
serviceFee: form.serviceFee,
settlementCycle: form.settlementCycle,
@@ -557,7 +649,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