feat: 1.2.0.1

wupengfei

8 天以前 42d60f50072ebde98549157420bd18639712af43

 src/views/EmploymentManage/components/AddOrEditEmploymentView.vue

@@ -44,6 +44,8 @@
                      :controls="false"
                      v-model="form.serviceFee"
                      placeholder="请输入"
                      :min="0"
                      :max="999999999999"
                      :unit="EnumBillingMethodUnitText[form.billingMethod]"
                    ></ProFormInputNumber>
                  </template>
@@ -51,6 +53,37 @@
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <template v-if="form.billingMethod === EnumBillingMethod.Hour">
            <ProFormCol>
              <ProFormColItem :span="12">
                <ProFormItemV2 label="核定工时:" prop="name">
                  <ProFormInputNumber
                    :controls="false"
                    v-model="form.serviceFee"
                    placeholder="请输入核定工时"
                    :min="0"
                    :max="999999999999"
                    unit="小时/天"
                  ></ProFormInputNumber>
                </ProFormItemV2>
              </ProFormColItem>
            </ProFormCol>
            <ProFormCol>
              <ProFormColItem :span="12">
                <ProFormItemV2 label="超时服务费:" prop="name">
                  <ProFormInputNumber
                    :controls="false"
                    v-model="form.serviceFee"
                    placeholder="请输入超时服务费"
                    :min="0"
                    :max="999999999999"
                    unit="元/小时"
                  ></ProFormInputNumber>
                </ProFormItemV2>
              </ProFormColItem>
            </ProFormCol>
          </template>

          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2
@@ -62,25 +95,26 @@
                  v-model="form.settlementCycle"
                  :value-enum="EnumSettlementCycleText"
                  :button-style="false"
                  @change="handleSettlementCycleChange"
                ></ProFormRadio>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="12">
            <ProFormColItem :span="12" class="settlement-cycle-date-form-item">
              <ProFormItemV2
                v-if="form.settlementCycle !== EnumSettlementCycle.Day"
                label="结算日期:"
                prop="settlementCycle"
                :check-rules="[{ message: '请选择结算日期' }]"
                class="settlement-cycle-date-form-item"
              >
                {{ EnumSettlementCycleDateText[form.settlementCycle] }}
                <ProFormSelect
                  v-model="form.settlementCycle"
                  :value-enum="[]"
                  v-model="form.settlementDate"
                  :value-enum="settlementDateList"
                  :button-style="false"
                ></ProFormSelect>
                {{ '日结算' }}
                {{ '结算' }}
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -128,17 +162,18 @@
              >
                <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>
                岁
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -195,12 +230,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="addressDetail">
                <ProFormTextArea
                  :rows="4"
                  v-model.trim="form.addressDetail"
                  placeholder="请输入任务描述"
                />
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -219,6 +261,35 @@
                  end-placeholder="结束日期"
                  :disabled-date="disabledDate"
                ></ProFormDatePicker>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2
                label="报名时间:"
                prop="time"
                :check-rules="[{ message: '请选择报名时间', type: 'array' }]"
              >
                <ProFormDatePicker
                  v-model="form.time"
                  type="daterange"
                  range-separator="至"
                  start-placeholder="开始日期"
                  end-placeholder="结束日期"
                  :disabled-date="disabledDate"
                ></ProFormDatePicker>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2
                label="验收方式:"
                prop="genderLimit"
                :check-rules="[{ message: '请选择验收方式' }]"
              >
                <ProFormRadio v-model="form.genderLimit" :value-enum="[]"></ProFormRadio>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -246,6 +317,7 @@
  ProFormDatePicker,
  ProFormCheckbox,
  ProFormSelect,
  ProFormTextArea,
} from '@bole-core/components';
import { FormInstance, ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
@@ -254,10 +326,14 @@
import * as taskServices from '@/services/api/task';
import {
  EnumUserGenderTextForEdit,
  EnumBillingMethod,
  EnumBillingMethodText,
  EnumBillingMethodUnitText,
  EnumSettlementCycleText,
  EnumSettlementCycleDateText,
  EnumSettlementCycleDateMonthArray,
  EnumSettlementCycleDateWeekArray,
  EnumSettlementCycle,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -287,6 +363,16 @@
  categoryCode: CategoryCode.CertificateType,
});

const settlementDateList = computed(() => {
  if (form.settlementCycle === EnumSettlementCycle.Month) {
    return EnumSettlementCycleDateMonthArray;
  }
  if (form.settlementCycle === EnumSettlementCycle.Week) {
    return EnumSettlementCycleDateWeekArray;
  }
  return [];
});

const state = reactive({
  checkBenefitsAll: false,
  isBenefitsIndeterminate: false,
@@ -300,6 +386,7 @@
  billingMethod: EnumBillingMethod.Day,
  serviceFee: null,
  settlementCycle: EnumSettlementCycle.Day,
  settlementDate: null as number,
  benefits: [] as string[],
  ageMinLimit: null,
  ageMaxLimit: null,
@@ -326,6 +413,7 @@
    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;
@@ -349,6 +437,10 @@
  enabled: isEdit,
});

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

function handleBack() {
  closeViewPush(route, {
    name: 'TaskManageList',
@@ -367,12 +459,12 @@
}
async function submit() {
  try {
    console.log('form.weMapInfo: ', form.weMapInfo);
    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,
@@ -456,6 +548,10 @@
        min-width: 0;
        flex: 1;
      }

      .pro-from-item-read-content-wrapper {
        width: auto;
      }
    }
  }
}