From 84581333b74d8ac1b0867e5b8c276f6fc332e4eb Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 19 九月 2025 14:06:21 +0800
Subject: [PATCH] fix: bug
---
src/views/TaskManage/components/TaskDetailView.vue | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/src/views/TaskManage/components/TaskDetailView.vue b/src/views/TaskManage/components/TaskDetailView.vue
index ab2fac9..7972264 100644
--- a/src/views/TaskManage/components/TaskDetailView.vue
+++ b/src/views/TaskManage/components/TaskDetailView.vue
@@ -43,13 +43,28 @@
</ProFormColItem>
</ProFormCol>
<ProFormCol>
+ <ProFormColItem :span="12" class="settlement-cycle-date-form-item">
+ <ProFormItemV2
+ 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="benefits">
<ProFormCheckbox
v-model="form.benefits"
:value-enum="welfareList"
- enumLabelKey="name"
- enum-value-key="code"
></ProFormCheckbox>
</ProFormItemV2>
</ProFormColItem>
@@ -59,17 +74,18 @@
<ProFormItemV2 label="骞撮緞鑼冨洿:" prop="ageRange" class="form-age-range">
<ProFormInputNumber
:controls="false"
- :min="0"
+ :min="16"
v-model="form.ageMinLimit"
placeholder="璇疯緭鍏�"
></ProFormInputNumber>
<div class="form-input-separator">鑷�</div>
<ProFormInputNumber
:controls="false"
- :min="0"
+ :min="16"
v-model="form.ageMaxLimit"
placeholder="璇疯緭鍏�"
></ProFormInputNumber>
+ 宀�
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -90,8 +106,6 @@
<ProFormCheckbox
v-model="form.credentialLimits"
:value-enum="certificateTypeList"
- enumLabelKey="name"
- enum-value-key="code"
></ProFormCheckbox>
</ProFormItemV2>
</ProFormColItem>
@@ -99,7 +113,11 @@
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2 label="浠诲姟鍦扮偣:" prop="weMapInfo">
- <WeMap v-model="form.weMapInfo" />
+ {{
+ `${form.weMapInfo.provinceName ?? ''}${form.weMapInfo.cityName ?? ''}${
+ form.weMapInfo.addressName ?? ''
+ }`
+ }}
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -146,6 +164,7 @@
ProFormRadio,
ProFormDatePicker,
ProFormCheckbox,
+ ProFormSelect,
} from '@bole-core/components';
import { useQuery } from '@tanstack/vue-query';
import * as taskServices from '@/services/api/task';
@@ -154,6 +173,9 @@
EnumBillingMethodText,
EnumBillingMethodUnitText,
EnumSettlementCycleText,
+ EnumSettlementCycleDateText,
+ EnumSettlementCycleDateMonthArray,
+ EnumSettlementCycleDateWeekArray,
} from '@/constants';
import { ModelValueType } from 'element-plus';
import { format } from '@/utils';
@@ -172,15 +194,26 @@
categoryCode: CategoryCode.CertificateType,
});
+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: '' as any as EnumUserGender,
+ genderLimit: 0 as any as EnumUserGender,
credentialLimits: [] as string[],
time: [] as unknown as ModelValueType,
weMapInfo: {} as WeMapModel,
@@ -203,11 +236,12 @@
form.billingMethod = data.billingMethod;
form.serviceFee = data.serviceFee;
form.settlementCycle = data.settlementCycle;
- form.benefits = data.benefits?.map((x) => x.code) ?? [];
+ 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.code) ?? [];
+ 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'),
@@ -215,8 +249,8 @@
form.weMapInfo = {
latitude: data.latitude,
longitude: data.longitude,
- provinceName: data.provinceName,
- cityName: data.cityName,
+ provinceName: data.provinceContent,
+ cityName: data.cityContent,
provinceCode: data.provinceCode,
cityCode: data.cityCode,
addressName: data.addressName,
@@ -235,4 +269,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