From b2c8bbace3a81be94531a4d9b76848f28c25eab6 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 20 十月 2025 09:44:14 +0800
Subject: [PATCH] fix: bug
---
src/views/TaskManage/components/TaskDetailView.vue | 408 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 328 insertions(+), 80 deletions(-)
diff --git a/src/views/TaskManage/components/TaskDetailView.vue b/src/views/TaskManage/components/TaskDetailView.vue
index 668e441..38d55e3 100644
--- a/src/views/TaskManage/components/TaskDetailView.vue
+++ b/src/views/TaskManage/components/TaskDetailView.vue
@@ -2,99 +2,184 @@
<LoadingLayout :loading="isLoading">
<AppContainer>
<PageFormLayout>
- <ProForm :model="detail" ref="formRef" label-width="140px" is-read>
+ <ProForm :model="form" ref="productFormRef" label-width="110px" is-read>
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2 label="浠诲姟鍚嶇О:" prop="name">
- <ProFormText v-model.trim="detail.enterpriseName" />
+ <ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
- <ProFormItemV2 label="鏈嶅姟璐�:" prop="salaryType">
- <RadioWithExtra
- v-model="detail.enterpriseName"
- :value-enum="[
- { value: 1, text: '鎸夋湀' },
- { value: 2, text: '鎸夋棩' },
- ]"
- enumLabelKey="text"
- enum-value-key="value"
- :showExtra="true"
- >
- <template #extra>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="鏈嶅姟璐�:" prop="billingMethod">
+ <RadioWithExtra
+ v-model="form.billingMethod"
+ :value-enum="EnumBillingMethodText"
+ :showExtra="true"
+ :button-style="false"
+ >
+ <template #extra>
+ <ProFormInputNumber
+ :controls="false"
+ v-model="form.serviceFee"
+ placeholder="璇疯緭鍏�"
+ :unit="EnumBillingMethodUnitText[form.billingMethod]"
+ ></ProFormInputNumber>
+ </template>
+ </RadioWithExtra>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <template
+ v-if="
+ form.billingMethod === EnumBillingMethod.Hour ||
+ form.billingMethod === EnumBillingMethod.Day
+ "
+ >
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="verifyWorkHours">
<ProFormInputNumber
:controls="false"
- v-model="detail.enterpriseName"
- :unit="detail.enterpriseName === '' ? '鍏�/鏈�' : '鍏�/鏃�'"
+ v-model="form.verifyWorkHours"
+ placeholder="璇疯緭鍏ユ牳瀹氬伐鏃�"
+ :min="0"
+ :max="999999999999"
+ unit="灏忔椂/澶�"
></ProFormInputNumber>
- </template>
- </RadioWithExtra>
- </ProFormItemV2>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="瓒呮椂鏈嶅姟璐�:" prop="timeoutServiceFee">
+ <ProFormInputNumber
+ :controls="false"
+ v-model="form.timeoutServiceFee"
+ placeholder="璇疯緭鍏ヨ秴鏃舵湇鍔¤垂"
+ :min="0"
+ :max="999999999999"
+ unit="鍏�/灏忔椂"
+ ></ProFormInputNumber>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ </template>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="缁撶畻鏂瑰紡:" prop="settlementCycle">
+ <ProFormRadio
+ v-model="form.settlementCycle"
+ :value-enum="EnumSettlementCycleText"
+ :button-style="false"
+ ></ProFormRadio>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12" class="settlement-cycle-date-form-item">
+ <ProFormItemV2
+ v-if="form.settlementCycle !== EnumSettlementCycle.Day"
+ label="缁撶畻鏃ユ湡:"
+ prop="settlementCycle"
+ :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏃ユ湡' }]"
+ >
+ {{ EnumSettlementCycleDateText[form.settlementCycle] }}
+ <ProFormSelect
+ v-model="form.settlementDate"
+ :value-enum="settlementDateList"
+ :button-style="false"
+ ></ProFormSelect>
+ {{ '缁撶畻' }}
+ </ProFormItemV2>
+ </ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="缁撶畻鏂瑰紡:" prop="salaryType">
+ <ProFormItemV2 label="绂忓埄:" prop="benefits">
+ <ProFormCheckbox
+ v-model="form.benefits"
+ :value-enum="welfareList"
+ ></ProFormCheckbox>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="骞撮緞鑼冨洿:" prop="ageRange" class="form-age-range">
+ <ProFormInputNumber
+ :controls="false"
+ :min="16"
+ v-model="form.ageMinLimit"
+ placeholder="璇疯緭鍏�"
+ ></ProFormInputNumber>
+ <div class="form-input-separator">鑷�</div>
+ <ProFormInputNumber
+ :controls="false"
+ :min="16"
+ v-model="form.ageMaxLimit"
+ placeholder="璇疯緭鍏�"
+ ></ProFormInputNumber>
+ 宀�
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="鎬у埆瑕佹眰:" prop="genderLimit">
<ProFormRadio
- v-model="detail.enterpriseName"
- :value-enum="[
- { label: '鏈堢粨', value: 1 },
- { label: '鏃ョ粨', value: 2 },
- ]"
+ v-model="form.genderLimit"
+ :value-enum="EnumUserGenderText"
+ show-all-btn
+ ></ProFormRadio>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="璧勬牸璇佷功:" prop="credentialLimits">
+ <ProFormCheckbox
+ v-model="form.credentialLimits"
+ :value-enum="certificateTypeList"
+ ></ProFormCheckbox>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="浠诲姟鍦扮偣:" prop="weMapInfo">
+ {{
+ `${form.weMapInfo.provinceName ?? ''}${form.weMapInfo.cityName ?? ''}${
+ form.weMapInfo.addressName ?? ''
+ }`
+ }}
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="鍦扮偣璇存槑:" prop="addressDetail">
+ <ProFormText v-model.trim="form.addressDetail" placeholder="璇疯緭鍏ュ湴鐐硅鏄�" />
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="浠诲姟鎻忚堪:" prop="description">
+ <ProFormTextArea
+ :rows="4"
+ v-model.trim="form.description"
+ placeholder="璇疯緭鍏ヤ换鍔℃弿杩�"
/>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="绂忓埄:" prop="salaryType">
- <ProFormRadio v-model="detail.enterpriseName" :value-enum="dictionaryDataList" />
- </ProFormItemV2>
- </ProFormColItem>
- </ProFormCol>
- <ProFormCol>
- <ProFormColItem :span="12">
- <ProFormItemV2 label="骞撮緞鑼冨洿:" prop="ageRange">
- <ProFormInputNumber v-model="detail.enterpriseName"></ProFormInputNumber>
- </ProFormItemV2>
- </ProFormColItem>
- </ProFormCol>
- <ProFormCol>
- <ProFormColItem :span="12">
- <ProFormItemV2 label="鎬у埆闇�姹�:" prop="salaryType">
- <ProFormRadio
- v-model="detail.enterpriseName"
- :value-enum="[
- { label: '鐢�', value: 1 },
- { label: '濂�', value: 2 },
- ]"
- />
- </ProFormItemV2>
- </ProFormColItem>
- </ProFormCol>
- <ProFormCol>
- <ProFormColItem :span="12">
- <ProFormItemV2 label="璧勬牸璇佷功:" prop="salaryType">
- <ProFormRadio v-model="detail.enterpriseName" :value-enum="dictionaryDataList" />
- </ProFormItemV2>
- </ProFormColItem>
- </ProFormCol>
- <ProFormCol>
- <ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鍦扮偣:" prop="areaList">
- <!-- <ProFromAddressSelectV2
- v-model:areaList="detail.areaList"
- areaListPlaceholder="璇烽�夋嫨"
- :layer="AreaType.Area"
- /> -->
- </ProFormItemV2>
- </ProFormColItem>
- </ProFormCol>
- <ProFormCol>
- <ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鏃堕棿:" prop="creationTime" mode="read">
+ <ProFormItemV2 label="浠诲姟鏃堕棿:" prop="time">
<ProFormDatePicker
- v-model="detail.enterpriseName"
+ v-model="form.time"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
@@ -103,6 +188,49 @@
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2
+ label="鎶ュ悕鏃堕棿:"
+ prop="applyTime"
+ :check-rules="[{ message: '璇烽�夋嫨鎶ュ悕鏃堕棿', type: 'array' }]"
+ >
+ <ProFormDatePicker
+ v-model="form.applyTime"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></ProFormDatePicker>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2
+ label="楠屾敹鏂瑰紡:"
+ prop="checkReceiveMethod"
+ :check-rules="[{ message: '璇烽�夋嫨楠屾敹鏂瑰紡' }]"
+ >
+ <ProFormRadio
+ v-model="form.checkReceiveMethod"
+ :value-enum="EnumTaskCheckReceiveMethodText"
+ :button-style="false"
+ ></ProFormRadio>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormItemV2
+ label="缁撶畻鏂瑰紡:"
+ prop="settlementAccess"
+ :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏂瑰紡' }]"
+ >
+ <ProFormSelect
+ v-model="form.settlementAccess"
+ :value-enum="EnumEnterpriseWalletAccessTextForSettle"
+ placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
+ ></ProFormSelect>
+ </ProFormItemV2>
</ProForm>
<template #footer>
<el-button @click="handleBack">鍏抽棴</el-button>
@@ -125,10 +253,27 @@
ProFormInputNumber,
ProFormRadio,
ProFormDatePicker,
+ ProFormCheckbox,
+ ProFormSelect,
+ ProFormTextArea,
} from '@bole-core/components';
import { useQuery } from '@tanstack/vue-query';
-import { AreaType } from '@/constants';
-import * as enterpriseServices from '@/services/api/enterprise';
+import * as taskServices from '@/services/api/task';
+import {
+ EnumUserGenderText,
+ EnumBillingMethod,
+ EnumBillingMethodText,
+ EnumBillingMethodUnitText,
+ EnumSettlementCycle,
+ EnumSettlementCycleText,
+ EnumSettlementCycleDateText,
+ EnumSettlementCycleDateMonthArray,
+ EnumSettlementCycleDateWeekArray,
+ EnumTaskCheckReceiveMethodText,
+ EnumEnterpriseWalletAccessTextForSettle,
+} from '@/constants';
+import { ModelValueType } from 'element-plus';
+import { format } from '@/utils';
defineOptions({
name: 'TaskDetailView',
@@ -137,21 +282,93 @@
const route = useRoute();
const id = route.params?.id as string;
const { closeViewPush } = useRouteView();
-const { dictionaryDataList } = useDictionaryDataSelect({
- categoryCode: computed(() => CategoryCode.Welfare),
+const { dictionaryDataList: welfareList } = useDictionaryDataSelect({
+ categoryCode: CategoryCode.Welfare,
+});
+const { dictionaryDataList: certificateTypeList } = useDictionaryDataSelect({
+ categoryCode: CategoryCode.CertificateType,
});
-const { data: detail, isLoading } = useQuery({
- queryKey: ['enterpriseServices/getEnterprise', id],
+const settlementDateList = computed(() => {
+ if (form.settlementCycle === EnumSettlementCycle.Month) {
+ return EnumSettlementCycleDateMonthArray;
+ }
+ if (form.settlementCycle === EnumSettlementCycle.Week) {
+ return EnumSettlementCycleDateWeekArray;
+ }
+ return [];
+});
+
+const form = reactive({
+ name: '',
+ billingMethod: '' as any as EnumBillingMethod,
+ serviceFee: 0,
+ settlementCycle: '' as any as EnumSettlementCycle,
+ settlementDate: null as number,
+ benefits: [] as string[],
+ ageMinLimit: 0,
+ ageMaxLimit: 0,
+ genderLimit: 0 as any as EnumUserGender,
+ credentialLimits: [] as string[],
+ time: [] as unknown as ModelValueType,
+ weMapInfo: {} as WeMapModel,
+ addressDetail: '',
+
+ verifyWorkHours: null as number,
+ timeoutServiceFee: null as number,
+ description: '',
+ checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
+ applyTime: [] as unknown as ModelValueType,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+});
+
+const { isLoading } = useQuery({
+ queryKey: ['taskServices/getTaskInfo', id],
queryFn: async () => {
- return await enterpriseServices.getEnterprise(
+ return await taskServices.getTaskInfo(
{ id: id },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.GetEnterpriseQueryResult),
+ placeholderData: () => ({} as API.GetTaskInfoQueryResult),
+ onSuccess(data) {
+ form.name = data.name;
+ form.billingMethod = data.billingMethod;
+ form.serviceFee = data.serviceFee;
+ form.settlementCycle = data.settlementCycle;
+ form.settlementDate = data.settlementDate;
+ form.benefits = data.benefits?.map((x) => x.benefitCode) ?? [];
+ form.ageMinLimit = data.ageMinLimit;
+ form.ageMaxLimit = data.ageMaxLimit;
+ form.genderLimit = data.genderLimit;
+ form.credentialLimits = data.credentialLimits?.map((x) => x.typeCode) ?? [];
+ form.time = [
+ format(data.beginTime, 'YYYY-MM-DD 00:00:00'),
+ format(data.endTime, 'YYYY-MM-DD 23:59:59'),
+ ];
+ form.weMapInfo = {
+ latitude: data.latitude,
+ longitude: data.longitude,
+ provinceName: data.provinceContent,
+ cityName: data.cityContent,
+ provinceCode: data.provinceCode,
+ cityCode: data.cityCode,
+ addressName: data.addressName,
+ };
+ form.addressDetail = data.addressDetail;
+
+ form.verifyWorkHours = data.verifyWorkHours;
+ form.timeoutServiceFee = data.timeoutServiceFee;
+ form.description = data.description;
+ form.checkReceiveMethod = data.checkReceiveMethod;
+ form.applyTime = [
+ format(data.applyBeginTime, 'YYYY-MM-DD 00:00:00'),
+ format(data.applyEndTime, 'YYYY-MM-DD 23:59:59'),
+ ];
+ form.settlementAccess = data.settlementAccess;
+ },
enabled: computed(() => !!id),
});
@@ -164,4 +381,35 @@
<style lang="scss" scoped>
@use '@/style/common.scss' as *;
+
+:deep() {
+ .radio-with-input-extra-wrapper {
+ display: flex;
+ }
+
+ .form-age-range {
+ .pro-from-item-read-content-wrapper {
+ width: auto;
+ }
+ }
+
+ .settlement-cycle-date-form-item {
+ color: inherit;
+
+ .el-form-item__content {
+ flex-wrap: nowrap;
+
+ .el-select {
+ margin: 0 20px;
+ width: auto;
+ min-width: 0;
+ flex: 1;
+ }
+
+ .pro-from-item-read-content-wrapper {
+ width: auto;
+ }
+ }
+ }
+}
</style>
--
Gitblit v1.9.1