Merge branch 'master' into dev-v1.1

wupengfei

2025-09-12 89eca80eaf4a75b512b0074c0fecc194162c3530

 src/views/TaskManage/components/TaskDetailView.vue

@@ -48,8 +48,6 @@
                <ProFormCheckbox
                  v-model="form.benefits"
                  :value-enum="welfareList"
                  enumLabelKey="name"
                  enum-value-key="code"
                ></ProFormCheckbox>
              </ProFormItemV2>
            </ProFormColItem>
@@ -90,8 +88,6 @@
                <ProFormCheckbox
                  v-model="form.credentialLimits"
                  :value-enum="certificateTypeList"
                  enumLabelKey="name"
                  enum-value-key="code"
                ></ProFormCheckbox>
              </ProFormItemV2>
            </ProFormColItem>
@@ -99,7 +95,11 @@
          <ProFormCol>
            <ProFormColItem :span="12">
              <ProFormItemV2 label="任务地点:" prop="weMapInfo">
                <WeMap v-model="form.weMapInfo" />
                {{
                  `${form.weMapInfo.provinceName ?? ''}${form.weMapInfo.cityName ?? ''}${
                    form.weMapInfo.addressName ?? ''
                  }`
                }}
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -180,7 +180,7 @@
  benefits: [] as string[],
  ageMinLimit: 0,
  ageMaxLimit: 0,
  genderLimit: '' as any as EnumUserGender,
  genderLimit: 0 as any as EnumUserGender,
  credentialLimits: [] as string[],
  time: [] as unknown as ModelValueType,
  weMapInfo: {} as WeMapModel,
@@ -203,11 +203,11 @@
    form.billingMethod = data.billingMethod;
    form.serviceFee = data.serviceFee;
    form.settlementCycle = data.settlementCycle;
    form.benefits = data.benefits?.map((x) => x.code) ?? [];
    form.benefits = data.benefits?.map((x) => x.benefitCode) ?? [];
    form.ageMinLimit = data.ageMinLimit;
    form.ageMaxLimit = data.ageMaxLimit;
    form.genderLimit = data.genderLimit;
    form.credentialLimits = data.credentialLimits?.map((x) => x.code) ?? [];
    form.credentialLimits = data.credentialLimits?.map((x) => x.typeCode) ?? [];
    form.time = [
      format(data.beginTime, 'YYYY-MM-DD 00:00:00'),
      format(data.endTime, 'YYYY-MM-DD 23:59:59'),
@@ -215,8 +215,8 @@
    form.weMapInfo = {
      latitude: data.latitude,
      longitude: data.longitude,
      provinceName: data.provinceName,
      cityName: data.cityName,
      provinceName: data.provinceContent,
      cityName: data.cityContent,
      provinceCode: data.provinceCode,
      cityCode: data.cityCode,
      addressName: data.addressName,
@@ -235,4 +235,16 @@

<style lang="scss" scoped>
@use '@/style/common.scss' as *;

:deep() {
  .radio-with-input-extra-wrapper {
    display: flex;
  }

  .form-age-range {
    .pro-from-item-read-content-wrapper {
      width: auto;
    }
  }
}
</style>