feat: 1.3.0.1

wupengfei

2025-11-07 0cb324779727155effffcbca13c5b11409c8211c

 src/views/EmploymentManage/components/AddOrEditEmploymentView.vue

@@ -86,12 +86,7 @@
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <template
            v-if="
              form.billingMethod === EnumBillingMethod.Hour ||
              form.billingMethod === EnumBillingMethod.Day
            "
          >
          <template v-if="form.billingMethod === EnumBillingMethod.Hour">
            <ProFormCol>
              <ProFormColItem :span="12">
                <ProFormItemV2
@@ -139,14 +134,12 @@
            <ProFormColItem :span="12">
              <ProFormItemV2
                label="总件数:"
                prop="verifyWorkHours"
                prop="totalPieceQuantity"
                :check-rules="[{ message: '请输入任务总件数' }]"
              >
                <span v-if="isDetail && !form.verifyWorkHours"></span>
                <ProFormInputNumber
                  v-else
                  :controls="false"
                  v-model="form.verifyWorkHours"
                  v-model="form.totalPieceQuantity"
                  placeholder="请输入任务总件数"
                  :min="0"
                  :max="999999999999"
@@ -324,7 +317,20 @@
              <ProFormItemV2
                label="任务时间:"
                prop="time"
                :check-rules="[{ message: '请选择任务时间', type: 'array' }]"
                :check-rules="[
                  { message: '请选择任务时间', type: 'array' },
                  {
                    validator: (rule, value, callback) => {
                      if (form.billingMethod === EnumBillingMethod.Month) {
                        if (dayjs(form.time[1]).diff(dayjs(form.time[0]), 'month') < 1) {
                          callback(new Error('月结任务时任务时间需大于一个月'));
                        }
                        callback();
                      }
                      callback();
                    },
                  },
                ]"
              >
                <ProFormDatePicker
                  v-model="form.time"
@@ -360,14 +366,13 @@
            <ProFormColItem :span="12">
              <ProFormItemV2
                label="验收方式:"
                prop="checkReceiveMethod"
                prop="checkReceiveMethods"
                :check-rules="[{ message: '请选择验收方式' }]"
              >
                <ProFormRadio
                  v-model="form.checkReceiveMethod"
                <ProFormCheckbox
                  v-model="form.checkReceiveMethods"
                  :value-enum="EnumTaskCheckReceiveMethodText"
                  :button-style="false"
                ></ProFormRadio>
                ></ProFormCheckbox>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -438,6 +443,7 @@
};
defineProps<Props>();
const route = useRoute();
const router = useRouter();
const id = route.params.id as string;
const isEdit = !!id;

@@ -489,6 +495,7 @@
  needPeopleNumber: null as number,
  billingMethod: EnumBillingMethod.Day,
  serviceFee: null,
  totalPieceQuantity: null as number,
  settlementCycle: EnumSettlementCycle.Day,
  settlementDate: null as number,
  benefits: [] as string[],
@@ -502,7 +509,7 @@
  verifyWorkHours: null as number,
  timeoutServiceFee: null as number,
  description: '',
  checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
  checkReceiveMethods: [] as any as EnumTaskCheckReceiveMethod[],
  applyTime: [] as unknown as ModelValueType,
  settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});
@@ -527,6 +534,7 @@
    form.name = data.name;
    form.needPeopleNumber = data.needPeopleNumber;
    form.billingMethod = data.billingMethod;
    form.totalPieceQuantity = data.totalPieceQuantity;
    form.serviceFee = data.serviceFee;
    form.settlementCycle = data.settlementCycle;
    form.settlementDate = data.settlementDate;
@@ -556,7 +564,7 @@
    form.verifyWorkHours = data.verifyWorkHours;
    form.timeoutServiceFee = data.timeoutServiceFee;
    form.description = data.description;
    form.checkReceiveMethod = data.checkReceiveMethod;
    form.checkReceiveMethods = data.checkReceiveMethods;
    form.applyTime = [
      format(data.applyBeginTime, 'YYYY-MM-DD 00:00:00'),
      format(data.applyEndTime, 'YYYY-MM-DD 23:59:59'),
@@ -579,6 +587,34 @@
    name: 'TaskManageList',
  });
}

function calculateMonthInterval(startDate, endDate) {
  const diffInDays = dayjs(endDate).diff(startDate, 'day');
  const monthInterval = Math.ceil(diffInDays / 30);
  return monthInterval > 15 ? Math.ceil(monthInterval / 30) : monthInterval;
}

function calculateServicesFee(
  billingMethod: EnumBillingMethod,
  serviceFee: number,
  time: ModelValueType,
  needPeopleNumber: number,
  verifyWorkHours: number
) {
  const monthInterval = calculateMonthInterval(time[0], time[1]);
  const dayInterval = dayjs(time[1]).diff(time[0], 'day');
  switch (billingMethod) {
    case EnumBillingMethod.Month:
      return monthInterval * serviceFee * needPeopleNumber;
    case EnumBillingMethod.Day:
      return serviceFee * dayInterval * needPeopleNumber;
    case EnumBillingMethod.Hour:
      return serviceFee * dayInterval * needPeopleNumber * verifyWorkHours;
    case EnumBillingMethod.Piece:
      return serviceFee * needPeopleNumber;
  }
}

const productFormRef = ref<FormInstance>();
function handleConfirm() {
  if (!productFormRef.value) return;
@@ -592,11 +628,33 @@
}
async function submit() {
  try {
    // const estimateServicesFee = calculateServicesFee(
    //   form.billingMethod,
    //   form.serviceFee,
    //   form.time,
    //   form.needPeopleNumber,
    //   form.verifyWorkHours
    // );
    // if (estimateServicesFee > 10000) {
    //   Message.tipMessage('您当前账户余额不足，暂时无法发布任务，请充值后操作', {
    //     confirmButtonText: '立即充值',
    //     cancelButtonText: '取消',
    //     type: 'warning',
    //     callback: (action) => {
    //       if (action === 'confirm') {
    //         router.push({
    //           name: 'BalanceManageV2',
    //         });
    //       }
    //     },
    //   });
    // }
    let params: API.SaveTaskInfoCommand = {
      supplierEnterpriseId: form.supplierEnterpriseId,
      name: form.name,
      needPeopleNumber: form.needPeopleNumber,
      billingMethod: form.billingMethod,
      totalPieceQuantity: form.totalPieceQuantity,
      serviceFee: form.serviceFee,
      settlementCycle: form.settlementCycle,
      settlementDate: form.settlementDate ? form.settlementDate : 0,
@@ -618,7 +676,7 @@
      verifyWorkHours: form.verifyWorkHours,
      timeoutServiceFee: form.timeoutServiceFee,
      description: form.description,
      checkReceiveMethod: form.checkReceiveMethod,
      checkReceiveMethods: form.checkReceiveMethods,
      settlementAccess: form.settlementAccess,
    };
    if (isEdit) {