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,15 +38,18 @@
                  :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>
@@ -73,6 +76,7 @@
                    :min="0"
                    :max="999999999999"
                    unit="小时/天"
                    :disabled="feeCannotEdit"
                  ></ProFormInputNumber>
                </ProFormItemV2>
              </ProFormColItem>
@@ -91,6 +95,7 @@
                    :min="0"
                    :max="999999999999"
                    unit="元/小时"
                    :disabled="feeCannotEdit"
                  ></ProFormInputNumber>
                </ProFormItemV2>
              </ProFormColItem>
@@ -109,6 +114,7 @@
                  :value-enum="EnumSettlementCycleText"
                  :button-style="false"
                  @change="handleSettlementCycleChange"
                  :disabled="feeCannotEdit"
                ></ProFormRadio>
              </ProFormItemV2>
            </ProFormColItem>
@@ -273,6 +279,7 @@
                  start-placeholder="开始日期"
                  end-placeholder="结束日期"
                  :disabled-date="disabledDate"
                  @change="handleTimeChange"
                ></ProFormDatePicker>
              </ProFormItemV2>
            </ProFormColItem>
@@ -387,8 +394,12 @@
}

function disabledapplyDate(time: Date) {
  return dayjs(time).isBefore(form.time[0], 'day');
  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();

@@ -497,6 +508,10 @@
  form.settlementDate = null as number;
}

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

function handleBack() {
  closeViewPush(route, {
    name: 'TaskManageList',