Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp in...

zhengyiming

2 天以前 9752b78da2f4afba58955b7c46a2700f72c8ab34

Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1

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

@@ -32,6 +32,46 @@
          <div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
        </div>
      </nut-form-item>
      <template v-if="form.billingMethod === EnumBillingMethod.Hour">
        <nut-form-item
          label="核定工时:"
          class="bole-form-item"
          prop="verifyWorkHours"
          label-width="90"
        >
          <div class="bole-form-input-wrapper">
            <NumberInput
              v-model.trim="form.verifyWorkHours"
              class="nut-input-text bole-input-text"
              placeholder="请输入核定工时"
              :min="0"
              :max="999999999999"
              :precision="2"
              type="text"
            />
            <div class="form-input-unit">{{ '小时/天' }}</div>
          </div>
        </nut-form-item>
        <nut-form-item
          label="超时服务费:"
          class="bole-form-item"
          prop="timeoutServiceFee"
          label-width="90"
        >
          <div class="bole-form-input-wrapper">
            <NumberInput
              v-model.trim="form.timeoutServiceFee"
              class="nut-input-text bole-input-text"
              placeholder="请输入超时服务费"
              :min="0"
              :max="999999999999"
              :precision="2"
              type="text"
            />
            <div class="form-input-unit">{{ '元/小时' }}</div>
          </div>
        </nut-form-item>
      </template>
      <nut-form-item
        label="结算方式:"
        class="bole-form-item"
@@ -134,13 +174,15 @@
        />
      </nut-form-item>
      <nut-form-item
        label="详细地址:"
        label="地点说明:"
        class="bole-form-item"
        prop="addressDetail"
        label-width="90px"
        required
      >
        <nut-input v-model="form.addressDetail" placeholder="请输入详细地址"> </nut-input>
        <nut-input v-model="form.addressDetail" placeholder="请输入地点说明"> </nut-input>
      </nut-form-item>
      <nut-form-item label="任务说明:" class="bole-form-item" prop="description" label-width="90px">
        <nut-textarea v-model="form.description" placeholder="请输入任务说明"> </nut-textarea>
      </nut-form-item>
      <nut-form-item
        label="任务开始日期:"
@@ -160,6 +202,45 @@
          :minDate="nowDate"
          placeholder="请选择任务结束日期"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
        label="报名开始日期:"
        class="bole-form-item"
        prop="applyBeginTime"
        label-width="90px"
      >
        <ChooseInputWithDatePicker
          v-model="form.applyBeginTime"
          :minDate="form.beginTime ? dayjs(form.beginTime).toDate() : nowDate"
          placeholder="请选择报名开始日期"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
        label="报名结束日期:"
        class="bole-form-item"
        prop="applyEndTime"
        label-width="90px"
      >
        <ChooseInputWithDatePicker
          v-model="form.applyEndTime"
          :max-date="form.endTime ? dayjs(form.endTime).toDate() : nowDate"
          placeholder="请选择报名结束日期"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
        label="验收方式:"
        class="bole-form-item"
        prop="checkReceiveMethod"
        label-width="90px"
      >
        <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-form-item>
    </nut-form>
  </ContentScrollView>
@@ -183,6 +264,8 @@
  EnumUserGenderTextOptions,
  EnumSettlementCycleDateWeekArray,
  EnumSettlementCycleDateMonthArray,
  EnumTaskCheckReceiveMethod,
  EnumTaskCheckReceiveMethodText,
} from '@12333/constants';
import {
  ChooseInputWithPicker,
@@ -249,13 +332,20 @@

  weMapInfo: {} as WeMapModel,
  addressDetail: '',

  verifyWorkHours: null as number,
  timeoutServiceFee: null as number,
  description: '',
  checkReceiveMethod: EnumTaskCheckReceiveMethod.CheckIn,
  applyBeginTime: '',
  applyEndTime: '',
});

const rules = reactive<FormRules>({
  name: [{ required: true, message: '请输入任务名称' }],
  genderLimit: [{ required: true, message: '请选择性别要求' }],
  settlementCycleDate: [{ required: true, message: '请设置结算日期' }],
  addressDetail: [{ required: true, message: '请输入详细地址' }],
  // addressDetail: [{ required: true, message: '请输入详细地址' }],
  billingMethod: [
    {
      required: true,
@@ -354,6 +444,12 @@
      longitude: data.longitude,
      addressName: data.addressName,
    };
    form.description = data.description;
    form.verifyWorkHours = data.verifyWorkHours;
    form.timeoutServiceFee = data.timeoutServiceFee;
    form.checkReceiveMethod = data.checkReceiveMethod;
    form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
    form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
  },
});

@@ -388,6 +484,12 @@
      latitude: form.weMapInfo.latitude,
      beginTime: dayjs(form.beginTime).format('YYYY-MM-DD 00:00:00'),
      endTime: dayjs(form.endTime).format('YYYY-MM-DD 23:59:59'),
      description: form.description,
      verifyWorkHours: form.verifyWorkHours,
      timeoutServiceFee: form.timeoutServiceFee,
      checkReceiveMethod: form.checkReceiveMethod,
      applyBeginTime: dayjs(form.applyBeginTime).format('YYYY-MM-DD 00:00:00'),
      applyEndTime: dayjs(form.applyEndTime).format('YYYY-MM-DD 23:59:59'),
    };
    if (isEdit) {
      params.id = taskId;

 packages/constants/task.ts

@@ -14,6 +14,7 @@
  GetTaskInfoQueryResultApplyButton,
  EnumTaskUserSubmitCheckReceiveStatus,
  EnumTaskUserSubmitCheckHistoryType,
  EnumTaskCheckReceiveMethod,
} from './apiEnum';

export const EnumBillingMethodText = {
@@ -21,6 +22,7 @@
  [EnumBillingMethod.Day]: '按日',
  [EnumBillingMethod.Hour]: '按时',
  [EnumBillingMethod.Piece]: '计件',
  [EnumBillingMethod.Face]: '面议',
};

export const EnumUserGenderText = {
@@ -170,3 +172,8 @@
  [EnumTaskUserSubmitCheckHistoryType.UnCheckIn]: Colors.Danger,
  [EnumTaskUserSubmitCheckHistoryType.UnCheckOut]: Colors.Info,
};

export const EnumTaskCheckReceiveMethodText = {
  [EnumTaskCheckReceiveMethod.CheckIn]: '人工签到',
  [EnumTaskCheckReceiveMethod.Submit]: '自主提交',
};