fix: bug

zhengyiming

2 天以前 39fe8d064f84088d1f8a897495fa05baf671bba8

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

@@ -32,6 +32,7 @@
            :min="0"
            :max="999999999999"
            :precision="0"
            @change="calcTaskTotalServiceFee"
          />
          <div class="form-input-unit">人</div>
        </div>
@@ -44,7 +45,11 @@
        label-width="90px"
        label-position="top"
      >
        <nut-radio-group v-model="form.billingMethod" direction="horizontal">
        <nut-radio-group
          v-model="form.billingMethod"
          direction="horizontal"
          @change="calcTaskTotalServiceFee"
        >
          <BlRadio
            :label="Number(key)"
            v-for="(val, key) in EnumBillingMethodText"
@@ -71,6 +76,7 @@
            :precision="2"
            type="text"
            :disabled="feeCannotEdit"
            @change="calcTaskTotalServiceFee"
          />
          <div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
        </div>
@@ -92,6 +98,7 @@
              :precision="2"
              type="text"
              :disabled="feeCannotEdit"
              @change="calcTaskTotalServiceFee"
            />
            <div class="form-input-unit">{{ '小时/天' }}</div>
          </div>
@@ -134,6 +141,7 @@
            :precision="2"
            type="text"
            :disabled="feeCannotEdit"
            @change="calcTaskTotalServiceFee"
          />
          <div class="form-input-unit">{{ '件' }}</div>
        </div>
@@ -272,6 +280,7 @@
          v-model="form.endTime"
          :minDate="nowDate"
          placeholder="请选择任务结束日期"
          @change="calcTaskTotalServiceFee()"
        ></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
@@ -343,7 +352,7 @@
        prop="totalServiceFee"
        label-width="110px"
      >
        {{ `${toThousand(form.totalServiceFee)}元` }}
        {{ `${toThousand(totalServiceFee)}元` }}
      </nut-form-item>
    </nut-form>
  </ContentScrollView>
@@ -405,8 +414,8 @@
const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
const isCopy = router.params?.isCopy === 'true';
const isEdit = !!taskId && !isCopy;

const nowDate = dayjs().toDate();
const applyBeginTimeMinDate = computed(() => {
@@ -572,6 +581,10 @@
    {
      required: true,
      message: '请选择验收方式',
      validator(value) {
        if (!value?.length) return Promise.reject('请选择验收方式');
        return Promise.resolve(true);
      },
    },
  ],
});
@@ -596,7 +609,7 @@
    );
  },
  placeholderData: () => ({} as API.GetTaskInfoQueryResult),
  enabled: isEdit,
  enabled: isEdit || isCopy,
  onSuccess(data) {
    form.supplierEnterpriseId = data.supplierEnterpriseId;
    form.name = data.name;
@@ -622,6 +635,7 @@
      latitude: data.latitude,
      longitude: data.longitude,
      addressName: data.addressName,
      address: data.addressName,
    };
    form.description = data.description;
    form.verifyWorkHours = data.verifyWorkHours;
@@ -630,11 +644,21 @@
    form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
    form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
    form.settlementAccess = data.settlementAccess;

    if (!!data.timeoutServiceFee) {
      calcTaskTotalServiceFee();
    }
  },
});

async function calcTaskTotalServiceFee() {
  try {
    if (!form.beginTime || !form.endTime) {
      return;
    }
    if (form.billingMethod !== EnumBillingMethod.Piece && !form.needPeopleNumber) {
      return;
    }
    let params: API.CalcTaskTotalServiceFeeCommand = {
      billingMethod: form.billingMethod,
      serviceFee: form.serviceFee,
@@ -644,12 +668,33 @@
      beginTime: dayjs(form.beginTime).format('YYYY-MM-DD 00:00:00'),
      endTime: dayjs(form.endTime).format('YYYY-MM-DD 23:59:59'),
    };
    let res = await taskServices.calcTaskTotalServiceFee(params);
    let res = await taskServices.calcTaskTotalServiceFee(params, { showLoading: false });
    if (res) {
      form.serviceFee = res.totalServiceFee;
      form.totalServiceFee = res.totalServiceFee;
    }
  } catch (error) {}
}

const totalServiceFee = computed(() => {
  if (!form.beginTime || !form.endTime) {
    return 0;
  }
  var days = dayjs(form.endTime).diff(dayjs(form.beginTime), 'day') + 1;
  const serviceFee = form.serviceFee || 0;
  const needPeopleNumber = form.needPeopleNumber || 0;
  switch (form.billingMethod) {
    case EnumBillingMethod.Month:
      return serviceFee * Math.round(days / 30) * needPeopleNumber;
    case EnumBillingMethod.Day:
      return serviceFee * days * needPeopleNumber;
    case EnumBillingMethod.Hour:
      return serviceFee * (form.verifyWorkHours || 0) * days * needPeopleNumber;
    case EnumBillingMethod.Piece:
      return serviceFee * (form.totalPieceQuantity || 0);
    default:
      return 0;
  }
});

const formRef = ref<any>(null);
function handleConfirm() {
@@ -670,7 +715,7 @@
      name: form.name,
      needPeopleNumber: form.needPeopleNumber,
      billingMethod: form.billingMethod,
      serviceFee: form.serviceFee,
      // serviceFee: form.serviceFee,
      totalPieceQuantity: form.totalPieceQuantity,
      settlementCycle: form.settlementCycle,
      settlementDate: form.settlementDate ? form.settlementDate : 0,
@@ -695,6 +740,12 @@
      applyEndTime: dayjs(form.applyEndTime).format('YYYY-MM-DD 23:59:59'),
      settlementAccess: form.settlementAccess,
    };
    if (
      form.billingMethod !== EnumBillingMethod.Face &&
      form.billingMethod !== EnumBillingMethod.Piece
    ) {
      params.serviceFee = form.serviceFee;
    }
    if (isEdit) {
      params.id = taskId;
    }
@@ -724,6 +775,7 @@
function timeChange() {
  form.applyBeginTime = '';
  form.applyEndTime = '';
  calcTaskTotalServiceFee();
}

function applyTimeChange() {