fix: bug

zhengyiming

2 天以前 f95d3066203612a450e462edd679eb5a4973f35c

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

@@ -1,8 +1,41 @@
<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"
          :disabled="isEdit"
        />
      </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"
            @change="calcTaskTotalServiceFee"
          />
          <div class="form-input-unit">人</div>
        </div>
      </nut-form-item>
      <nut-form-item
        label="服务费:"
@@ -12,18 +45,26 @@
        label-width="90px"
        label-position="top"
      >
        <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
          v-model="form.billingMethod"
          direction="horizontal"
          @change="calcTaskTotalServiceFee"
        >
          <BlRadio
            :label="Number(key)"
            v-for="(val, key) in EnumBillingMethodText"
            :key="key"
            :disabled="feeCannotEdit"
            >{{ val }}</BlRadio
          >
        </nut-radio-group>
      </nut-form-item>
      <nut-form-item
        v-if="form.billingMethod !== EnumBillingMethod.Face"
        label=" "
        class="bole-form-item"
        prop="serviceFee"
        label-width="0"
        v-if="form.billingMethod !== EnumBillingMethod.Face"
      >
        <div class="bole-form-input-wrapper">
          <NumberInput
@@ -34,16 +75,13 @@
            :max="999999999999"
            :precision="2"
            type="text"
            :disabled="feeCannotEdit"
            @change="calcTaskTotalServiceFee"
          />
          <div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
        </div>
      </nut-form-item>
      <template
        v-if="
          form.billingMethod === EnumBillingMethod.Hour ||
          form.billingMethod === EnumBillingMethod.Day
        "
      >
      <template v-if="form.billingMethod === EnumBillingMethod.Hour">
        <nut-form-item
          label="核定工时:"
          class="bole-form-item"
@@ -59,6 +97,8 @@
              :max="999999999999"
              :precision="2"
              type="text"
              :disabled="feeCannotEdit"
              @change="calcTaskTotalServiceFee"
            />
            <div class="form-input-unit">{{ '小时/天' }}</div>
          </div>
@@ -78,11 +118,34 @@
              :max="999999999999"
              :precision="2"
              type="text"
              :disabled="feeCannotEdit"
            />
            <div class="form-input-unit">{{ '元/小时' }}</div>
          </div>
        </nut-form-item>
      </template>
      <nut-form-item
        v-if="form.billingMethod === EnumBillingMethod.Piece"
        label="总件数:"
        class="bole-form-item"
        prop="totalPieceQuantity"
        label-width="90"
      >
        <div class="bole-form-input-wrapper">
          <NumberInput
            v-model.trim="form.totalPieceQuantity"
            class="nut-input-text bole-input-text"
            placeholder="请输入任务总件数"
            :min="0"
            :max="999999999999"
            :precision="2"
            type="text"
            :disabled="feeCannotEdit"
            @change="calcTaskTotalServiceFee"
          />
          <div class="form-input-unit">{{ '件' }}</div>
        </div>
      </nut-form-item>
      <nut-form-item
        label="结算方式:"
        class="bole-form-item"
@@ -95,9 +158,13 @@
          direction="horizontal"
          @change="settleTypeChange"
        >
          <BlRadio :label="Number(key)" v-for="(val, key) in EnumSettlementCycleText" :key="key">{{
            val
          }}</BlRadio>
          <BlRadio
            :label="Number(key)"
            v-for="(val, key) in EnumSettlementCycleText"
            :key="key"
            :disabled="feeCannotEdit"
            >{{ val }}</BlRadio
          >
        </nut-radio-group>
      </nut-form-item>
      <nut-form-item
@@ -213,6 +280,7 @@
          v-model="form.endTime"
          :minDate="nowDate"
          placeholder="请选择任务结束日期"
          @change="calcTaskTotalServiceFee()"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
@@ -235,24 +303,34 @@
      >
        <ChooseInputWithDatePicker
          v-model="form.applyEndTime"
          :minDate="form.beginTime ? dayjs(form.beginTime).toDate() : nowDate"
          :minDate="form.applyBeginTime ? dayjs(form.applyBeginTime).toDate() : nowDate"
          placeholder="请选择报名结束日期"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
        label="验收方式:"
        class="bole-form-item"
        prop="checkReceiveMethod"
        prop="checkReceiveMethods"
        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.checkReceiveMethods">
          <nut-checkbox
            :disabled="isEdit"
            v-for="(val, key) in EnumTaskCheckReceiveMethodText"
            :key="key"
            :label="Number(key) as any"
          >
            {{ val }}
          </nut-checkbox>
        </nut-checkbox-group>
      </nut-form-item>
      <nut-form-item
        label="结算方式:"
@@ -267,6 +345,14 @@
          :value-enum="settlementAccessList"
          :disabled="isEdit"
        />
      </nut-form-item>
      <nut-form-item
        label="预计服务费总额:"
        class="bole-form-item"
        prop="totalServiceFee"
        label-width="110px"
      >
        {{ `${toThousand(totalServiceFee)}元` }}
      </nut-form-item>
    </nut-form>
  </ContentScrollView>
@@ -304,7 +390,7 @@
  ChooseInputWithAreaPicker,
  ChooseInputWithCheckbox,
} from '@12333/components';
import { FormValidator, Message } from '@12333/utils';
import { FormValidator, Message, toThousand } from '@12333/utils';
import * as taskServices from '@12333/services/apiV2/task';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import Taro from '@tarojs/taro';
@@ -313,6 +399,7 @@
  useAllAreaList,
  useDictionaryDataSelect,
  useEnterpriseWalletAccessSelect,
  useGetSupplierEnterpriseSelect,
} from '@12333/hooks';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
@@ -323,11 +410,12 @@

const { userDetail } = useUser();
const { findAreaNameFromCode } = useAllAreaList();
const { settlementAccessList } = useEnterpriseWalletAccessSelect();

const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
const isCopy = router.params?.isCopy === 'true';
const isEdit = !!taskId && !isCopy;

const nowDate = dayjs().toDate();
const applyBeginTimeMinDate = computed(() => {
@@ -336,6 +424,10 @@
    : form.beginTime
    ? dayjs(form.beginTime).toDate()
    : nowDate;
});

const feeCannotEdit = computed(() => {
  return dayjs().isAfter(form.beginTime, 'second') && isEdit;
});

const { dictionaryDataList: WelfareTypeList } = useDictionaryDataSelect({
@@ -356,7 +448,9 @@
});

const form = reactive({
  supplierEnterpriseId: '',
  name: '',
  needPeopleNumber: '' as any as number,
  billingMethod: EnumBillingMethod.Day,
  serviceFee: '' as any as number,
  settlementCycle: EnumSettlementCycle.Day,
@@ -375,14 +469,22 @@
  verifyWorkHours: null as number,
  timeoutServiceFee: null as number,
  description: '',
  checkReceiveMethod: EnumTaskCheckReceiveMethod.CheckIn,
  checkReceiveMethods: [] as EnumTaskCheckReceiveMethod[],
  applyBeginTime: '',
  applyEndTime: '',
  settlementAccess: '' as any as EnumEnterpriseWalletAccess,
  totalPieceQuantity: '' as any as number,

  totalServiceFee: null as number,
});

const rules = reactive<FormRules>({
  supplierEnterpriseId: [{ required: true, message: '请选择供应商' }],
  name: [{ required: true, message: '请输入任务名称' }],
  needPeopleNumber: [{ required: true, message: '请输入需求人数' }],
  totalPieceQuantity: [{ required: true, message: '请输入任务总件数' }],
  verifyWorkHours: [{ required: true, message: '请输入核定工时' }],
  timeoutServiceFee: [{ required: true, message: '请输入超时服务费' }],
  genderLimit: [{ required: true, message: '请选择性别要求' }],
  settlementCycleDate: [{ required: true, message: '请设置结算日期' }],
  settlementAccess: [{ required: true, message: '请选择结算方式' }],
@@ -395,7 +497,7 @@
        if (!form.billingMethod) {
          return Promise.reject('请选择服务费类型');
        }
        if (!form.serviceFee) {
        if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
          return Promise.reject('请输入服务费');
        }
        return Promise.resolve(true);
@@ -437,6 +539,12 @@
      message: '请选择结束日期',
      validator(value) {
        if (!value) return Promise.reject('请选择结束日期');
        if (form.billingMethod === EnumBillingMethod.Month) {
          if (dayjs(form.endTime).isBefore(dayjs(form.beginTime).add(1, 'month'))) {
            return Promise.reject('按月服务费，任务时长需大于一个月');
          }
          return Promise.resolve(true);
        }
        if (dayjs(value).isBefore(dayjs(form.beginTime)))
          return Promise.reject('结束日期需大于开始日期');
        return Promise.resolve(true);
@@ -469,6 +577,20 @@
      },
    },
  ],
  checkReceiveMethods: [
    {
      required: true,
      message: '请选择验收方式',
      validator(value) {
        if (!value?.length) return Promise.reject('请选择验收方式');
        return Promise.resolve(true);
      },
    },
  ],
});

const { settlementAccessList } = useEnterpriseWalletAccessSelect({
  supplierEnterpriseId: computed(() => form.supplierEnterpriseId),
});

const {
@@ -487,11 +609,14 @@
    );
  },
  placeholderData: () => ({} as API.GetTaskInfoQueryResult),
  enabled: isEdit,
  enabled: isEdit || isCopy,
  onSuccess(data) {
    form.supplierEnterpriseId = data.supplierEnterpriseId;
    form.name = data.name;
    form.needPeopleNumber = data.needPeopleNumber;
    form.billingMethod = data.billingMethod;
    form.serviceFee = data.serviceFee;
    form.totalPieceQuantity = data.totalPieceQuantity;
    form.settlementCycle = data.settlementCycle;
    form.settlementDate = data.settlementDate;
    form.benefits = (data.benefits ?? []).map((item) => item.benefitCode);
@@ -510,15 +635,65 @@
      latitude: data.latitude,
      longitude: data.longitude,
      addressName: data.addressName,
      address: data.addressName,
    };
    form.description = data.description;
    form.verifyWorkHours = data.verifyWorkHours;
    form.timeoutServiceFee = data.timeoutServiceFee;
    form.checkReceiveMethod = data.checkReceiveMethod;
    form.checkReceiveMethods = data.checkReceiveMethods;
    form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
    form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
    form.settlementAccess = data.settlementAccess;

    if (!!data.timeoutServiceFee) {
      calcTaskTotalServiceFee();
    }
  },
});

async function calcTaskTotalServiceFee() {
  try {
    if (!form.beginTime || !form.endTime) {
      return;
    }
    if (form.billingMethod !== EnumBillingMethod.Piece && !form.needPeopleNumber) {
      return;
    }
    let params: API.CalcTaskTotalServiceFeeCommand = {
      billingMethod: form.billingMethod,
      serviceFee: form.serviceFee,
      verifyWorkHours: form.verifyWorkHours,
      totalPieceQuantity: form.totalPieceQuantity,
      needPeopleNumber: form.needPeopleNumber,
      beginTime: dayjs(form.beginTime).format('YYYY-MM-DD 00:00:00'),
      endTime: dayjs(form.endTime).format('YYYY-MM-DD 23:59:59'),
    };
    let res = await taskServices.calcTaskTotalServiceFee(params, { showLoading: false });
    if (res) {
      form.totalServiceFee = res.totalServiceFee;
    }
  } catch (error) {}
}

const totalServiceFee = computed(() => {
  if (!form.beginTime || !form.endTime) {
    return 0;
  }
  var days = dayjs(form.endTime).diff(dayjs(form.beginTime), 'day') + 1;
  const serviceFee = form.serviceFee || 0;
  const needPeopleNumber = form.needPeopleNumber || 0;
  switch (form.billingMethod) {
    case EnumBillingMethod.Month:
      return serviceFee * Math.round(days / 30) * needPeopleNumber;
    case EnumBillingMethod.Day:
      return serviceFee * days * needPeopleNumber;
    case EnumBillingMethod.Hour:
      return serviceFee * (form.verifyWorkHours || 0) * days * needPeopleNumber;
    case EnumBillingMethod.Piece:
      return serviceFee * (form.totalPieceQuantity || 0);
    default:
      return 0;
  }
});

const formRef = ref<any>(null);
@@ -533,10 +708,15 @@

async function confirm() {
  try {
    await calcTaskTotalServiceFee();

    let params: API.SaveTaskInfoCommand = {
      supplierEnterpriseId: form.supplierEnterpriseId,
      name: form.name,
      needPeopleNumber: form.needPeopleNumber,
      billingMethod: form.billingMethod,
      serviceFee: form.serviceFee,
      totalPieceQuantity: form.totalPieceQuantity,
      settlementCycle: form.settlementCycle,
      settlementDate: form.settlementDate ? form.settlementDate : 0,
      benefits: form.benefits,
@@ -555,7 +735,7 @@
      description: form.description,
      verifyWorkHours: form.verifyWorkHours,
      timeoutServiceFee: form.timeoutServiceFee,
      checkReceiveMethod: form.checkReceiveMethod,
      checkReceiveMethods: form.checkReceiveMethods,
      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,
@@ -566,7 +746,7 @@
    if (isCopy) {
      params.id = '';
    }
    let res = await taskServices.saveTaskInfo(params);
    let res = await taskServices.saveTaskInfo(params, { skipErrorHandler: true });
    if (res) {
      Message.success(isEdit && !isCopy ? '编辑成功' : '发布成功', {
        onClosed() {
@@ -574,12 +754,22 @@
        },
      });
    }
  } catch (error) {}
  } catch (error) {
    if (error?.info?.errorCode == 'BalanceNotEnough') {
      await Message.confirm({
        message: `您当前账户余额不足，暂时无法发布任务，请登录客户端后台充值后操作`,
        showCancelBtn: false,
      });
    } else {
      Message.error(error);
    }
  }
}

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

function applyTimeChange() {