From 5eb708efd67798bb5b0dccd45d932b98b85462d3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 13 十月 2025 13:55:08 +0800
Subject: [PATCH] Merge branch 'dev-1.1.2' of http://120.26.58.240:8888/r/flexJobAdmin into dev-1.1.2
---
src/views/TaskManage/components/TaskDetailView.vue | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 259 insertions(+), 11 deletions(-)
diff --git a/src/views/TaskManage/components/TaskDetailView.vue b/src/views/TaskManage/components/TaskDetailView.vue
index 02f366f..f939b41 100644
--- a/src/views/TaskManage/components/TaskDetailView.vue
+++ b/src/views/TaskManage/components/TaskDetailView.vue
@@ -2,20 +2,150 @@
<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?.name" />
+ <ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鍚嶇О:" prop="name"> </ProFormItemV2>
+ <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>
+ <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="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="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="time">
+ <ProFormDatePicker
+ v-model="form.time"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></ProFormDatePicker>
+ </ProFormItemV2>
</ProFormColItem>
</ProFormCol>
</ProForm>
+ <template #footer>
+ <el-button @click="handleBack">鍏抽棴</el-button>
+ </template>
</PageFormLayout>
</AppContainer>
</LoadingLayout>
@@ -32,8 +162,25 @@
ProFormItemV2,
ProFormText,
ProFormInputNumber,
+ ProFormRadio,
+ ProFormDatePicker,
+ ProFormCheckbox,
+ ProFormSelect,
} from '@bole-core/components';
import { useQuery } from '@tanstack/vue-query';
+import * as taskServices from '@/services/api/task';
+import {
+ EnumUserGenderText,
+ EnumBillingMethodText,
+ EnumBillingMethodUnitText,
+ EnumSettlementCycle,
+ EnumSettlementCycleText,
+ EnumSettlementCycleDateText,
+ EnumSettlementCycleDateMonthArray,
+ EnumSettlementCycleDateWeekArray,
+} from '@/constants';
+import { ModelValueType } from 'element-plus';
+import { format } from '@/utils';
defineOptions({
name: 'TaskDetailView',
@@ -41,17 +188,118 @@
const route = useRoute();
const id = route.params?.id as string;
-
-const { data: detail, isLoading } = useQuery({
- // queryKey: ['customerServices/getParkCustomerManageBaseDetail', id],
- // queryFn: async () => {
- // return await customerServices.getParkCustomerManageBaseDetail({ id: id });
- // },
- placeholderData: () => ({}),
- // enabled: !!id,
+const { closeViewPush } = useRouteView();
+const { dictionaryDataList: welfareList } = useDictionaryDataSelect({
+ categoryCode: CategoryCode.Welfare,
});
+const { dictionaryDataList: certificateTypeList } = useDictionaryDataSelect({
+ 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: 0 as any as EnumUserGender,
+ credentialLimits: [] as string[],
+ time: [] as unknown as ModelValueType,
+ weMapInfo: {} as WeMapModel,
+ addressDetail: '',
+});
+
+const { isLoading } = useQuery({
+ queryKey: ['taskServices/getTaskInfo', id],
+ queryFn: async () => {
+ return await taskServices.getTaskInfo(
+ { id: id },
+ {
+ showLoading: false,
+ }
+ );
+ },
+ 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;
+ },
+ enabled: computed(() => !!id),
+});
+
+function handleBack() {
+ closeViewPush(route, {
+ name: 'TaskManageList',
+ });
+}
</script>
<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