fix: bug

zhengyiming

7 天以前 891a1ad22fdca6bf9ea2433377afd2a0e438c72f

 apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue

@@ -1,34 +1,88 @@
<template>
  <ContentScrollView :paddingH="false">
    <nut-form :model-value="form" ref="formRef" :rules="rules">
      <nut-form-item label="任务名称:" class="bole-form-item" prop="taskName" label-width="90px">
        <nut-input v-model="form.taskName" placeholder="请输入任务名称"> </nut-input>
      <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 alignTop"
        prop="feeType"
        prop="billingMethod"
        required
        label-width="90px"
        label-position="top"
      >
        <nut-radio-group v-model="form.feeType" direction="horizontal">
          <BlRadio :label="Number(key)" v-for="(val, key) in FlexTaskFeeTypeEnumText" :key="key">{{
        <nut-radio-group v-model="form.billingMethod" direction="horizontal">
          <BlRadio :label="Number(key)" v-for="(val, key) in EnumBillingMethodText" :key="key">{{
            val
          }}</BlRadio>
        </nut-radio-group>
      </nut-form-item>
      <nut-form-item label=" " class="bole-form-item" prop="fee" 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">
          <nut-input
            v-model.trim="form.fee"
          <NumberInput
            v-model.trim="form.serviceFee"
            class="nut-input-text bole-input-text"
            placeholder="请输入服务费"
            :min="0"
            :max="999999999999"
            :precision="2"
            type="text"
          />
          <div class="form-input-unit">{{ SalaryTimeTypeEnumUnit[form.feeType] }}</div>
          <div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
        </div>
      </nut-form-item>
      <template
        v-if="
          form.billingMethod === EnumBillingMethod.Hour ||
          form.billingMethod === EnumBillingMethod.Day
        "
      >
        <nut-form-item
          label="核定工时:"
          class="bole-form-item"
          prop="verifyWorkHours"
          label-width="90"
        >
          <div class="bole-form-input-wrapper">
            <NumberInput
              v-model.trim="form.verifyWorkHours"
              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"
          prop="timeoutServiceFee"
          label-width="90"
        >
          <div class="bole-form-input-wrapper">
            <NumberInput
              v-model.trim="form.timeoutServiceFee"
              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>
      </template>
      <nut-form-item
        label="结算方式:"
        class="bole-form-item"
@@ -36,18 +90,33 @@
        required
        label-width="90px"
      >
        <nut-radio-group v-model="form.settleType" direction="horizontal">
          <BlRadio
            :label="Number(key)"
            v-for="(val, key) in FlexTaskSettleTypeEnumText"
            :key="key"
            >{{ val }}</BlRadio
          >
        <nut-radio-group
          v-model="form.settlementCycle"
          direction="horizontal"
          @change="settleTypeChange"
        >
          <BlRadio :label="Number(key)" v-for="(val, key) in EnumSettlementCycleText" :key="key">{{
            val
          }}</BlRadio>
        </nut-radio-group>
      </nut-form-item>
      <nut-form-item label="福利:" class="bole-form-item" prop="settleType" label-width="90px">
      <nut-form-item
        label="结算日期:"
        class="bole-form-item"
        prop="settlementDate"
        label-width="90px"
        required
        v-if="form.settlementCycle !== EnumSettlementCycle.Day"
      >
        <ChooseInputWithPicker
          v-model="form.settlementDate"
          placeholder="请设置结算日期"
          :value-enum="settlementDateList"
        />
      </nut-form-item>
      <nut-form-item label="福利:" class="bole-form-item" prop="benefits" label-width="90px">
        <ChooseInputWithCheckbox
          v-model="form.listAideIds"
          v-model="form.benefits"
          title="请选择福利"
          :columns="WelfareTypeList"
          placeholder="请选择福利"
@@ -56,62 +125,148 @@
      <nut-form-item
        label="年龄范围:"
        class="bole-form-item"
        prop="minAge"
        prop="ageMinLimit"
        required
        label-width="90px"
      >
        <div class="bole-form-input-wrapper">
          <NumberInput
            v-model.trim="form.minAge"
            v-model.trim="form.ageMinLimit"
            class="nut-input-text bole-input-text"
            placeholder="请选择年龄范围"
            :min="1"
            :min="16"
          />
          <div class="form-input-separator">至</div>
          <NumberInput
            v-model.trim="form.maxAge"
            v-model.trim="form.ageMaxLimit"
            class="nut-input-text bole-input-text"
            placeholder="请选择年龄范围"
            :min="1"
            :min="16"
          />
        </div>
      </nut-form-item>
      <nut-form-item label="性别:" class="bole-form-item" prop="sexType" label-width="90px">
      <nut-form-item
        label="性别要求:"
        class="bole-form-item"
        prop="genderLimit"
        label-width="90px"
        required
      >
        <ChooseInputWithPicker
          v-model="form.sexType"
          v-model="form.genderLimit"
          placeholder="请选择性别要求"
          :value-enum="GenderText"
          :value-enum="EnumUserGenderTextOptions"
        />
      </nut-form-item>
      <nut-form-item label="资格证书:" class="bole-form-item" prop="settleType" label-width="90px">
      <nut-form-item
        label="资格证书:"
        class="bole-form-item"
        prop="credentialLimits"
        label-width="90px"
      >
        <ChooseInputWithCheckbox
          v-model="form.listCertionIds"
          v-model="form.credentialLimits"
          title="请选择资格证书"
          :columns="CertificateTypeList"
          placeholder="请选择资格证书"
        />
      </nut-form-item>
      <nut-form-item label="任务地点" class="bole-form-item" prop="areaList" required>
        <!-- <ChooseLocationInput placeholder="请选择任务所在地" v-model="form.weMapInfo" /> -->
        <ChooseInputWithAreaPicker
          :columns="areaTreeList"
          v-model="form.areaList"
          placeholder="请选择所在地区"
        ></ChooseInputWithAreaPicker>
      <nut-form-item
        label="任务地点"
        label-width="90px"
        class="bole-form-item"
        prop="weMapInfo"
        required
      >
        <ChooseLocationInput
          inputAlign="left"
          placeholder="请选择任务地点"
          v-model="form.weMapInfo"
        />
      </nut-form-item>
      <nut-form-item label="详细地址:" class="bole-form-item" prop="address" label-width="90px">
        <nut-input v-model="form.address" placeholder="请输入详细地址"> </nut-input>
      <nut-form-item
        label="地点说明:"
        class="bole-form-item"
        prop="addressDetail"
        label-width="90px"
      >
        <nut-input v-model="form.addressDetail" placeholder="请输入地点说明"> </nut-input>
      </nut-form-item>
      <nut-form-item label="任务说明:" class="bole-form-item" prop="description" label-width="90px">
        <nut-textarea v-model="form.description" placeholder="请输入任务说明"> </nut-textarea>
      </nut-form-item>
      <nut-form-item
        label="任务开始日期:"
        class="bole-form-item"
        prop="startDate"
        prop="beginTime"
        label-width="90px"
      >
        <ChooseInputWithDatePicker v-model="form.startDate"></ChooseInputWithDatePicker>
        <ChooseInputWithDatePicker
          v-model="form.beginTime"
          :minDate="nowDate"
          placeholder="请选择任务开始日期"
          @change="timeChange"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item label="任务结束日期:" class="bole-form-item" prop="endDate" label-width="90px">
        <ChooseInputWithDatePicker v-model="form.endDate"></ChooseInputWithDatePicker>
      <nut-form-item label="任务结束日期:" class="bole-form-item" prop="endTime" label-width="90px">
        <ChooseInputWithDatePicker
          v-model="form.endTime"
          :minDate="nowDate"
          placeholder="请选择任务结束日期"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
        label="报名开始日期:"
        class="bole-form-item"
        prop="applyBeginTime"
        label-width="90px"
      >
        <ChooseInputWithDatePicker
          v-model="form.applyBeginTime"
          :minDate="nowDate"
          placeholder="请选择报名开始日期"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
        label="报名结束日期:"
        class="bole-form-item"
        prop="applyEndTime"
        label-width="90px"
      >
        <ChooseInputWithDatePicker
          v-model="form.applyEndTime"
          :minDate="form.applyBeginTime ? dayjs(form.applyBeginTime).toDate() : nowDate"
          placeholder="请选择报名结束日期"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
        label="验收方式:"
        class="bole-form-item"
        prop="checkReceiveMethod"
        label-width="90px"
      >
        <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-form-item>
      <nut-form-item
        label="结算方式:"
        class="bole-form-item"
        prop="settlementAccess"
        label-width="90px"
        required
      >
        <ChooseInputWithPicker
          v-model="form.settlementAccess"
          placeholder="请选择结算方式"
          :value-enum="settlementAccessList"
          :disabled="isEdit"
        />
      </nut-form-item>
    </nut-form>
  </ContentScrollView>
@@ -124,11 +279,21 @@
<script setup lang="ts">
import { useUser } from '@/hooks';
import {
  FlexTaskSettleTypeEnum,
  FlexTaskSettleTypeEnumText,
  FlexTaskFeeTypeEnum,
  FlexTaskFeeTypeEnumText,
  SalaryTimeTypeEnumUnit,
  CategoryCode,
  EnumBillingMethod,
  EnumSettlementCycle,
  EnumUserGender,
  EnumBillingMethodText,
  EnumUserGenderText,
  EnumSettlementCycleText,
  BillingMethodEnumUnit,
  EnumUserGenderTextOptions,
  EnumSettlementCycleDateWeekArray,
  EnumSettlementCycleDateMonthArray,
  EnumTaskCheckReceiveMethod,
  EnumTaskCheckReceiveMethodText,
  EnumEnterpriseWalletAccess,
  EnumEnterpriseWalletAccessText,
} from '@12333/constants';
import {
  ChooseInputWithPicker,
@@ -140,12 +305,15 @@
  ChooseInputWithCheckbox,
} from '@12333/components';
import { FormValidator, Message } from '@12333/utils';
import * as flexWorkerServices from '@12333/services/api/FlexWorker';
import * as taskServices from '@12333/services/apiV2/task';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import Taro from '@tarojs/taro';
import { goBack } from '@/utils';
import { Gender, GenderText, SearchType } from '@12333/constants';
import { useAllAreaList, useSearchSettingType } from '@12333/hooks';
import {
  useAllAreaList,
  useDictionaryDataSelect,
  useEnterpriseWalletAccessSelect,
} from '@12333/hooks';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';

@@ -154,56 +322,102 @@
});

const { userDetail } = useUser();
const { areaTreeList } = useAllAreaList();
const { findAreaNameFromCode } = useAllAreaList();
const { settlementAccessList } = useEnterpriseWalletAccessSelect();
const router = Taro.useRouter();
const taskId = router.params?.taskId ?? '';
const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
const isCopy = router.params?.isCopy === 'true';
console.log('isCopy: ', router.params?.isCopy);

const WelfareTypeList = ref([]);
const CertificateTypeList = ref([]);
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,
});
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({
  taskName: '',
  feeType: FlexTaskFeeTypeEnum.OfMonth,
  fee: 0,
  settleType: FlexTaskSettleTypeEnum.OfMonth,
  listAideIds: [] as string[],
  minAge: 0,
  maxAge: 0,
  sexType: Gender.Male,
  listCertionIds: [] as string[],
  address: '',
  startDate: '',
  endDate: '',
  areaList: [] as number[],
  name: '',
  billingMethod: EnumBillingMethod.Day,
  serviceFee: '' as any as number,
  settlementCycle: EnumSettlementCycle.Day,
  benefits: [] as string[],
  ageMinLimit: '' as any as number,
  ageMaxLimit: '' as any as number,
  genderLimit: 0 as any as EnumUserGender,
  credentialLimits: [] as string[],
  beginTime: '',
  endTime: '',
  settlementDate: null as number,

  weMapInfo: {} as WeMapModel,
  addressDetail: '',

  verifyWorkHours: null as number,
  timeoutServiceFee: null as number,
  description: '',
  checkReceiveMethod: EnumTaskCheckReceiveMethod.CheckIn,
  applyBeginTime: '',
  applyEndTime: '',
  settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});

const rules = reactive<FormRules>({
  taskName: [{ required: true, message: '请输入任务名称' }],

  // weMapInfo: [
  //   { required: true, message: '请设置工作地点', validator: FormValidator.validatorWeMap },
  // ],
  areaList: [
    { required: true, message: '清添加工作地点', validator: FormValidator.validatorArray },
  name: [{ required: true, message: '请输入任务名称' }],
  genderLimit: [{ required: true, message: '请选择性别要求' }],
  settlementCycleDate: [{ required: true, message: '请设置结算日期' }],
  settlementAccess: [{ required: true, message: '请选择结算方式' }],
  // addressDetail: [{ required: true, message: '请输入详细地址' }],
  billingMethod: [
    {
      required: true,
      message: '请选择收费方式',
      validator: () => {
        if (!form.billingMethod) {
          return Promise.reject('请选择服务费类型');
        }
        if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
          return Promise.reject('请输入服务费');
        }
        return Promise.resolve(true);
      },
    },
  ],
  weMapInfo: [
    { required: true, message: '请设置工作地点', validator: FormValidator.validatorWeMap },
  ],

  minAge: [
  ageMinLimit: [
    {
      required: true,
      message: '请输入年龄要求',
      validator: () => {
        if (!form.minAge) {
        if (!form.ageMinLimit && form.ageMinLimit > 0) {
          return Promise.reject('请输入年龄要求');
        }
        if (!form.maxAge) {
        if (!form.ageMaxLimit && form.ageMaxLimit > 0) {
          return Promise.reject('请输入年龄要求');
        }
        if (Number(form.maxAge) <= Number(form.minAge)) {
        if (Number(form.ageMaxLimit) <= Number(form.ageMinLimit)) {
          return Promise.reject('最大年龄不能小于最小年龄');
        }
        return Promise.resolve(true);
@@ -211,19 +425,46 @@
    },
  ],

  startDate: [
  beginTime: [
    {
      required: true,
      message: '请选择开始日期',
    },
  ],
  endDate: [
  endTime: [
    {
      required: true,
      message: '请选择结束日期',
      validator(value) {
        if (!value) return Promise.reject('请选择结束日期');
        if (value <= form.startDate) return Promise.reject('结束日期不能小于开始日期');
        if (dayjs(value).isBefore(dayjs(form.beginTime)))
          return Promise.reject('结束日期需大于开始日期');
        return Promise.resolve(true);
      },
    },
  ],
  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);
      },
    },
@@ -236,32 +477,47 @@
  data: detail,
  refetch,
} = useQuery({
  queryKey: ['flexWorkerServices/getFlexTaskDto', taskId],
  queryKey: ['taskServices/getTaskInfo', taskId],
  queryFn: async () => {
    return await flexWorkerServices.getFlexTaskDto(
    return await taskServices.getTaskInfo(
      { id: taskId },
      {
        showLoading: false,
      }
    );
  },
  placeholderData: () => ({} as API.GetFlexTaskDtoOutput),
  placeholderData: () => ({} as API.GetTaskInfoQueryResult),
  enabled: isEdit,
  onSuccess(data) {
    form.taskName = data.taskName;
    form.feeType = data.feeType;
    form.fee = data.fee;
    form.settleType = data.settleType;
    form.listAideIds = data.taskWeals?.length > 0 ? data.taskWeals.map((item) => item.id) : [];
    form.minAge = data.minAge;
    form.maxAge = data.maxAge;
    form.sexType = data.sexType;
    form.listCertionIds = data.taskCerts?.length > 0 ? data.taskCerts.map((item) => item.id) : [];
    form.address = data.address;
    form.startDate = dayjs(data.startDate).format('YYYY-MM-DD');
    form.endDate = dayjs(data.endDate).format('YYYY-MM-DD');
    form.areaList = [data.provinceId, data.cityId, data.areaId];
    form.address = data.address;
    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((item) => item.benefitCode);
    form.ageMinLimit = data.ageMinLimit;
    form.ageMaxLimit = data.ageMaxLimit;
    form.genderLimit = data.genderLimit;
    form.credentialLimits = (data.credentialLimits ?? []).map((item) => item.typeCode);
    form.beginTime = dayjs(data.beginTime).format('YYYY-MM-DD');
    form.endTime = dayjs(data.endTime).format('YYYY-MM-DD');
    form.addressDetail = data.addressDetail;
    form.weMapInfo = {
      provinceName: data.provinceContent,
      cityName: data.cityContent,
      provinceCode: data.provinceCode,
      cityCode: data.cityCode,
      latitude: data.latitude,
      longitude: data.longitude,
      addressName: data.addressName,
    };
    form.description = data.description;
    form.verifyWorkHours = data.verifyWorkHours;
    form.timeoutServiceFee = data.timeoutServiceFee;
    form.checkReceiveMethod = data.checkReceiveMethod;
    form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
    form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
    form.settlementAccess = data.settlementAccess;
  },
});

@@ -277,32 +533,42 @@

async function confirm() {
  try {
    let params: API.AddEidtFlexTaskInput = {
      taskName: form.taskName,
      feeType: form.feeType,
      fee: form.fee,
      settleType: form.settleType,
      listAideIds: form.listAideIds,
      minAge: form.minAge,
      maxAge: form.maxAge,
      sexType: form.sexType,
      listCertionIds: form.listCertionIds,
      address: form.address,
      startDate: form.startDate,
      endDate: form.endDate,
      provinceId: form.areaList[0],
      cityId: form.areaList[1],
      areaId: form.areaList[2],
    let params: API.SaveTaskInfoCommand = {
      name: form.name,
      billingMethod: form.billingMethod,
      serviceFee: form.serviceFee,
      settlementCycle: form.settlementCycle,
      settlementDate: form.settlementDate ? form.settlementDate : 0,
      benefits: form.benefits,
      ageMinLimit: form.ageMinLimit,
      ageMaxLimit: form.ageMaxLimit,
      genderLimit: form.genderLimit,
      credentialLimits: form.credentialLimits,
      provinceCode: form.weMapInfo.provinceCode,
      cityCode: form.weMapInfo.cityCode,
      addressName: form.weMapInfo.addressName,
      addressDetail: form.addressDetail,
      longitude: form.weMapInfo.longitude,
      latitude: form.weMapInfo.latitude,
      beginTime: dayjs(form.beginTime).format('YYYY-MM-DD 00:00:00'),
      endTime: dayjs(form.endTime).format('YYYY-MM-DD 23:59:59'),
      description: form.description,
      verifyWorkHours: form.verifyWorkHours,
      timeoutServiceFee: form.timeoutServiceFee,
      checkReceiveMethod: form.checkReceiveMethod,
      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,
    };
    if (isEdit) {
      params.taskId = taskId;
      params.id = taskId;
    }
    if (isCopy) {
      params.taskId = '';
      params.id = '';
    }
    let res = await flexWorkerServices.addEidtFlexTask(params);
    let res = await taskServices.saveTaskInfo(params);
    if (res) {
      Message.success(isEdit ? '编辑成功' : '发布成功', {
      Message.success(isEdit && !isCopy ? '编辑成功' : '发布成功', {
        onClosed() {
          goBack();
        },
@@ -311,8 +577,21 @@
  } catch (error) {}
}

function timeChange() {
  form.applyBeginTime = '';
  form.applyEndTime = '';
}

function applyTimeChange() {
  form.applyEndTime = '';
}

function settleTypeChange() {
  form.settlementDate = null as number;
}

function handleCancel() {
  Taro.navigateBack();
  goBack();
}
</script>