From fbb9fdb5b11cd5ecd3ff19f41738bbd3b0afb82c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 07 十一月 2025 11:04:21 +0800
Subject: [PATCH] fix: s
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 153 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 143 insertions(+), 10 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index a29def6..5ad7f08 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="鏈嶅姟璐�:"
@@ -18,7 +49,13 @@
}}</BlRadio>
</nut-radio-group>
</nut-form-item>
- <nut-form-item label=" " class="bole-form-item" prop="serviceFee" label-width="0">
+ <nut-form-item
+ v-if="form.billingMethod !== EnumBillingMethod.Face"
+ label=" "
+ class="bole-form-item"
+ prop="serviceFee"
+ label-width="0"
+ >
<div class="bole-form-input-wrapper">
<NumberInput
v-model.trim="form.serviceFee"
@@ -32,7 +69,12 @@
<div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
</div>
</nut-form-item>
- <template v-if="form.billingMethod === EnumBillingMethod.Hour">
+ <template
+ v-if="
+ form.billingMethod === EnumBillingMethod.Hour ||
+ form.billingMethod === EnumBillingMethod.Day
+ "
+ >
<nut-form-item
label="鏍稿畾宸ユ椂:"
class="bole-form-item"
@@ -72,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"
@@ -194,6 +256,7 @@
v-model="form.beginTime"
:minDate="nowDate"
placeholder="璇烽�夋嫨浠诲姟寮�濮嬫棩鏈�"
+ @change="timeChange"
></ChooseInputWithDatePicker>
</nut-form-item>
<nut-form-item label="浠诲姟缁撴潫鏃ユ湡:" class="bole-form-item" prop="endTime" label-width="90px">
@@ -211,7 +274,7 @@
>
<ChooseInputWithDatePicker
v-model="form.applyBeginTime"
- :minDate="form.beginTime ? dayjs(form.beginTime).toDate() : nowDate"
+ :minDate="nowDate"
placeholder="璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�"
></ChooseInputWithDatePicker>
</nut-form-item>
@@ -223,7 +286,7 @@
>
<ChooseInputWithDatePicker
v-model="form.applyEndTime"
- :max-date="form.endTime ? dayjs(form.endTime).toDate() : nowDate"
+ :minDate="form.applyBeginTime ? dayjs(form.applyBeginTime).toDate() : nowDate"
placeholder="璇烽�夋嫨鎶ュ悕缁撴潫鏃ユ湡"
></ChooseInputWithDatePicker>
</nut-form-item>
@@ -233,14 +296,19 @@
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.checkReceiveMethod">
+ <nut-checkbox v-for="(val, key) in EnumTaskCheckReceiveMethodText" :key="key">
+ {{ val }}
+ </nut-checkbox>
+ </nut-checkbox-group>
</nut-form-item>
<nut-form-item
label="缁撶畻鏂瑰紡:"
@@ -252,7 +320,7 @@
<ChooseInputWithPicker
v-model="form.settlementAccess"
placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
- :value-enum="EnumEnterpriseWalletAccessText"
+ :value-enum="settlementAccessList"
:disabled="isEdit"
/>
</nut-form-item>
@@ -297,7 +365,12 @@
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import Taro from '@tarojs/taro';
import { goBack } from '@/utils';
-import { useAllAreaList, useDictionaryDataSelect } from '@12333/hooks';
+import {
+ useAllAreaList,
+ useDictionaryDataSelect,
+ useEnterpriseWalletAccessSelect,
+ useGetSupplierEnterpriseSelect,
+} from '@12333/hooks';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
@@ -307,12 +380,21 @@
const { userDetail } = useUser();
const { findAreaNameFromCode } = useAllAreaList();
+
+const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
const isCopy = router.params?.isCopy === 'true';
const nowDate = dayjs().toDate();
+const applyBeginTimeMinDate = computed(() => {
+ return form.applyBeginTime
+ ? dayjs(form.applyBeginTime).toDate()
+ : form.beginTime
+ ? dayjs(form.beginTime).toDate()
+ : nowDate;
+});
const { dictionaryDataList: WelfareTypeList } = useDictionaryDataSelect({
categoryCode: CategoryCode.Welfare,
@@ -332,7 +414,9 @@
});
const form = reactive({
+ supplierEnterpriseId: '',
name: '',
+ needPeopleNumber: '' as any as number,
billingMethod: EnumBillingMethod.Day,
serviceFee: '' as any as number,
settlementCycle: EnumSettlementCycle.Day,
@@ -351,14 +435,20 @@
verifyWorkHours: null as number,
timeoutServiceFee: null as number,
description: '',
- checkReceiveMethod: EnumTaskCheckReceiveMethod.CheckIn,
+ checkReceiveMethod: [EnumTaskCheckReceiveMethod.CheckIn],
applyBeginTime: '',
applyEndTime: '',
settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ totalPieces: '' as any 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: '璇烽�夋嫨缁撶畻鏂瑰紡' }],
@@ -371,7 +461,7 @@
if (!form.billingMethod) {
return Promise.reject('璇烽�夋嫨鏈嶅姟璐圭被鍨�');
}
- if (!form.serviceFee) {
+ if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
return Promise.reject('璇疯緭鍏ユ湇鍔¤垂');
}
return Promise.resolve(true);
@@ -419,6 +509,36 @@
},
},
],
+ applyBeginTime: [
+ {
+ required: true,
+ message: '璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�',
+ validator(value) {
+ if (!value) return Promise.reject('璇烽�夋嫨鎶ュ悕寮�濮嬫棩鏈�');
+ if (dayjs(value).isAfter(dayjs(form.endTime)))
+ return Promise.reject('鎶ュ悕寮�濮嬫棩鏈熼渶灏忎簬浠诲姟缁撴潫鏃ユ湡');
+ return Promise.resolve(true);
+ },
+ },
+ ],
+ applyEndTime: [
+ {
+ required: true,
+ message: '璇烽�夋嫨鎶ュ悕缁撴潫鏃ユ湡',
+ validator(value) {
+ if (!value) return Promise.reject('璇烽�夋嫨鎶ュ悕缁撴潫鏃ユ湡');
+ if (dayjs(value).isBefore(dayjs(form.applyBeginTime)))
+ return Promise.reject('鎶ュ悕缁撴潫鏃ユ湡闇�澶т簬鎶ュ悕寮�濮嬫棩鏈�');
+ if (dayjs(value).isAfter(dayjs(form.endTime)))
+ return Promise.reject('鎶ュ悕缁撴潫鏃ユ湡闇�灏忎簬浠诲姟缁撴潫鏃ユ湡');
+ return Promise.resolve(true);
+ },
+ },
+ ],
+});
+
+const { settlementAccessList } = useEnterpriseWalletAccessSelect({
+ supplierEnterpriseId: computed(() => form.supplierEnterpriseId),
});
const {
@@ -439,7 +559,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;
@@ -484,7 +606,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,
@@ -527,6 +651,15 @@
} catch (error) {}
}
+function timeChange() {
+ form.applyBeginTime = '';
+ form.applyEndTime = '';
+}
+
+function applyTimeChange() {
+ form.applyEndTime = '';
+}
+
function settleTypeChange() {
form.settlementDate = null as number;
}
--
Gitblit v1.9.1