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

zhengyiming

2025-11-11 f96eddc20355ac14c6aa917eb2a7cdd1d4dab7d3

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

 src/views/ServiceChargeManage/ServiceChargeDetail.vue

@@ -460,13 +460,19 @@
}

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,
  });
}

 src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue

@@ -111,7 +111,6 @@
          placeholder="请输入实发金额"
          v-model.trim="form.actualSettlementAmount"
          :controls="false"
          :min="0"
          unit="元"
        ></ProFormInputNumber>
      </ProFormItemV2>