Merge remote-tracking branch 'origin/master' into dev-1.3.0.2

zhengyiming

2025-11-11 d58e204d091034fccff97db8b4248c6cede7fb63

 src/views/ServiceChargeManage/ServiceChargeDetail.vue

@@ -199,6 +199,8 @@
  auditStatus: '' as any as EnumTaskSettlementAuditStatus,

  timeoutServiceFee: 0,

  supplierEnterpriseId: '',
});

const BaseState = {
@@ -234,6 +236,7 @@
      form.settlementAccess = res?.detail?.settlementAccess;
      form.auditStatus = res?.detail?.auditStatus;
      form.timeoutServiceFee = res?.detail?.timeoutServiceFee ?? 0;
      form.supplierEnterpriseId = res?.detail?.supplierEnterpriseId;
      // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
      // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
    }
@@ -430,14 +433,21 @@
}

function handleSubmit() {
  let actualList = form.settlementTaskUsers.filter((x) => x.actualSettlementAmount > 0);
  const actualSettlementAmount = actualList.reduce(
    (pre, cur) => pre + cur.actualSettlementAmount,
    0
  );
  const settlementAmount = actualList.reduce((pre, cur) => pre + cur.settlementAmount, 0);
  handleSettleEdit({
    id: id,
    name: form.name,
    code: form.code,
    settlementUserCount: form.settlementTaskUsers.length,
    actualSettlementAmount: form.actualSettlementAmount,
    settlementAmount: form.settlementAmount,
    settlementUserCount: actualList.length,
    actualSettlementAmount: actualSettlementAmount,
    settlementAmount: settlementAmount,
    settlementAccess: form.settlementAccess,
    supplierEnterpriseId: form.supplierEnterpriseId,
  });
}

@@ -455,11 +465,36 @@
    settlementAmount: 0,
    actualSettlementAmount: 0,
    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
    supplierEnterpriseId: '',
  },
});

async function handleSettle() {
  sureTaskSettlementOrder();
  auditTaskSettlement();
}

async function auditTaskSettlement() {
  try {
    let params: API.AuditTaskSettlementCommand = {
      id: id,
      auditStatus: EnumTaskSettlementAuditStatus.Pass,
      rosters: form.settlementTaskUsers.map((item) => ({
        id: item.id,
        serviceFee: item.serviceFee,
        timeoutHours: item.timeoutHours,
        timeoutFee: item.timeoutFee,
        otherFee: item.otherFee,
        remark: item.remark,
        settlementAmount: item.settlementAmount,
      })),
    };
    let res = await taskServices.auditTaskSettlement(params);
    if (res) {
      Message.successMessage('操作成功');
      eventContext.emit('sureTaskSettlementOrder');
      handleBack();
    }
  } catch (error) {}
}

async function sureTaskSettlementOrder() {