Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

zhengyiming

3 天以前 c848d51eb43c87463fc8ce0b8e4996bb3f80894c

 src/views/EmploymentManage/components/AddOrEditEmploymentView.vue

@@ -25,7 +25,7 @@
                      if (!form.billingMethod) {
                        callback(new Error('请选择服务费类型'));
                      }
                      if (!form.serviceFee) {
                      if (!form.serviceFee && form.billingMethod !== EnumBillingMethod.Face) {
                        callback(new Error('请输入服务费'));
                      }
                      callback();
@@ -38,19 +38,70 @@
                  :value-enum="EnumBillingMethodText"
                  :showExtra="true"
                  :button-style="false"
                  :disabled="feeCannotEdit"
                >
                  <template #extra>
                    <ProFormInputNumber
                      v-if="form.billingMethod !== EnumBillingMethod.Face"
                      :controls="false"
                      v-model="form.serviceFee"
                      placeholder="请输入"
                      :min="0"
                      :max="999999999999"
                      :unit="EnumBillingMethodUnitText[form.billingMethod]"
                      :disabled="feeCannotEdit"
                    ></ProFormInputNumber>
                  </template>
                </RadioWithExtra>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <template
            v-if="
              form.billingMethod === EnumBillingMethod.Hour ||
              form.billingMethod === EnumBillingMethod.Day
            "
          >
            <ProFormCol>
              <ProFormColItem :span="12">
                <ProFormItemV2
                  label="核定工时:"
                  prop="verifyWorkHours"
                  :check-rules="[{ message: '请输入核定工时' }]"
                >
                  <ProFormInputNumber
                    :controls="false"
                    v-model="form.verifyWorkHours"
                    placeholder="请输入核定工时"
                    :min="0"
                    :max="999999999999"
                    unit="小时/天"
                    :disabled="feeCannotEdit"
                  ></ProFormInputNumber>
                </ProFormItemV2>
              </ProFormColItem>
            </ProFormCol>
            <ProFormCol>
              <ProFormColItem :span="12">
                <ProFormItemV2
                  label="超时服务费:"
                  prop="timeoutServiceFee"
                  :check-rules="[{ message: '请输入超时服务费' }]"
                >
                  <ProFormInputNumber
                    :controls="false"
                    v-model="form.timeoutServiceFee"
                    placeholder="请输入超时服务费"
                    :min="0"
                    :max="999999999999"
                    unit="元/小时"
                    :disabled="feeCannotEdit"
                  ></ProFormInputNumber>
                </ProFormItemV2>
              </ProFormColItem>
            </ProFormCol>
          </template>

          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2
@@ -63,6 +114,7 @@
                  :value-enum="EnumSettlementCycleText"
                  :button-style="false"
                  @change="handleSettlementCycleChange"
                  :disabled="feeCannotEdit"
                ></ProFormRadio>
              </ProFormItemV2>
            </ProFormColItem>
@@ -70,6 +122,7 @@
          <ProFormCol>
            <ProFormColItem :span="12" class="settlement-cycle-date-form-item">
              <ProFormItemV2
                v-if="form.settlementCycle !== EnumSettlementCycle.Day"
                label="结算日期:"
                prop="settlementCycle"
                :check-rules="[{ message: '请选择结算日期' }]"
@@ -128,14 +181,14 @@
              >
                <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>
@@ -196,12 +249,19 @@
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2
                label="详细地址:"
                prop="addressDetail"
                :check-rules="[{ message: '请输入详细地址' }]"
              >
                <ProFormText v-model.trim="form.addressDetail" placeholder="请输入详细地址" />
              <ProFormItemV2 label="地点说明:" prop="addressDetail">
                <ProFormText v-model.trim="form.addressDetail" placeholder="请输入地点说明" />
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2 label="任务描述:" prop="description">
                <ProFormTextArea
                  :rows="4"
                  v-model.trim="form.description"
                  placeholder="请输入任务描述"
                />
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -219,10 +279,56 @@
                  start-placeholder="开始日期"
                  end-placeholder="结束日期"
                  :disabled-date="disabledDate"
                  @change="handleTimeChange"
                ></ProFormDatePicker>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2
                label="报名时间:"
                prop="applyTime"
                :check-rules="[{ message: '请选择报名时间', type: 'array' }]"
              >
                <ProFormDatePicker
                  v-model="form.applyTime"
                  type="daterange"
                  range-separator="至"
                  start-placeholder="开始日期"
                  end-placeholder="结束日期"
                  :disabled-date="disabledapplyDate"
                ></ProFormDatePicker>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2
                label="验收方式:"
                prop="checkReceiveMethod"
                :check-rules="[{ message: '请选择验收方式' }]"
              >
                <ProFormRadio
                  v-model="form.checkReceiveMethod"
                  :value-enum="EnumTaskCheckReceiveMethodText"
                  :button-style="false"
                ></ProFormRadio>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <ProFormItemV2
            label="结算方式:"
            prop="settlementAccess"
            :check-rules="[{ message: '请选择结算方式' }]"
          >
            <ProFormSelect
              v-model="form.settlementAccess"
              :value-enum="settlementAccessList"
              :disabled="isEdit"
              placeholder="请选择结算方式"
            ></ProFormSelect>
          </ProFormItemV2>
        </ProForm>
        <template #footer>
          <el-button @click="handleBack()">关闭</el-button>
@@ -247,6 +353,7 @@
  ProFormDatePicker,
  ProFormCheckbox,
  ProFormSelect,
  ProFormTextArea,
} from '@bole-core/components';
import { FormInstance, ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
@@ -255,12 +362,16 @@
import * as taskServices from '@/services/api/task';
import {
  EnumUserGenderTextForEdit,
  EnumBillingMethod,
  EnumBillingMethodText,
  EnumBillingMethodUnitText,
  EnumSettlementCycleText,
  EnumSettlementCycleDateText,
  EnumSettlementCycleDateMonthArray,
  EnumSettlementCycleDateWeekArray,
  EnumSettlementCycle,
  EnumTaskCheckReceiveMethodText,
  EnumEnterpriseWalletAccessText,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -276,9 +387,19 @@
const id = route.params.id as string;
const isEdit = !!id;

const { settlementAccessList } = useEnterpriseWalletAccessSelect();

function disabledDate(time: Date) {
  return dayjs(time).isBefore(dayjs(), 'day');
}

function disabledapplyDate(time: Date) {
  return dayjs(time).isAfter(dayjs(form.time[1]), 'day') || dayjs(time).isBefore(dayjs(), 'day');
}

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

const eventContext = useGlobalEventContext();

@@ -322,6 +443,12 @@
  time: [] as unknown as ModelValueType,
  weMapInfo: {} as WeMapModel,
  addressDetail: '',
  verifyWorkHours: null as number,
  timeoutServiceFee: null as number,
  description: '',
  checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
  applyTime: [] as unknown as ModelValueType,
  settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});

const { isLoading } = useQuery({
@@ -350,6 +477,10 @@
      format(data.beginTime, 'YYYY-MM-DD 00:00:00'),
      format(data.endTime, 'YYYY-MM-DD 23:59:59'),
    ];
    form.applyTime = [
      format(data.applyBeginTime, 'YYYY-MM-DD 00:00:00'),
      format(data.applyEndTime, 'YYYY-MM-DD 23:59:59'),
    ];
    form.weMapInfo = {
      latitude: data.latitude,
      longitude: data.longitude,
@@ -360,12 +491,25 @@
      addressName: data.addressName,
    };
    form.addressDetail = data.addressDetail;
    form.verifyWorkHours = data.verifyWorkHours;
    form.timeoutServiceFee = data.timeoutServiceFee;
    form.description = data.description;
    form.checkReceiveMethod = data.checkReceiveMethod;
    form.applyTime = [
      format(data.applyBeginTime, 'YYYY-MM-DD 00:00:00'),
      format(data.applyEndTime, 'YYYY-MM-DD 23:59:59'),
    ];
    form.settlementAccess = data.settlementAccess;
  },
  enabled: isEdit,
});

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

function handleTimeChange() {
  form.applyTime = [] as unknown as ModelValueType;
}

function handleBack() {
@@ -391,7 +535,7 @@
      billingMethod: form.billingMethod,
      serviceFee: form.serviceFee,
      settlementCycle: form.settlementCycle,
      settlementDate: form.settlementDate,
      settlementDate: form.settlementDate ? form.settlementDate : 0,
      benefits: form.benefits,
      ageMinLimit: form.ageMinLimit,
      ageMaxLimit: form.ageMaxLimit,
@@ -405,6 +549,13 @@
      latitude: form.weMapInfo.latitude,
      beginTime: dayjs(form.time[0]).format('YYYY-MM-DD 00:00:00'),
      endTime: dayjs(form.time[1]).format('YYYY-MM-DD 23:59:59'),
      applyBeginTime: dayjs(form.applyTime[0]).format('YYYY-MM-DD 00:00:00'),
      applyEndTime: dayjs(form.applyTime[1]).format('YYYY-MM-DD 23:59:59'),
      verifyWorkHours: form.verifyWorkHours,
      timeoutServiceFee: form.timeoutServiceFee,
      description: form.description,
      checkReceiveMethod: form.checkReceiveMethod,
      settlementAccess: form.settlementAccess,
    };
    if (isEdit) {
      params.id = id;