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

zhengyiming

2025-11-11 f96eddc20355ac14c6aa917eb2a7cdd1d4dab7d3

 src/views/ServiceChargeManage/ServiceChargeDetail.vue

@@ -175,10 +175,7 @@
    },
    extraProps: {
      hide: (row: API.GetSettlementTaskUsersQueryResultItem) =>
        !(
          form.settlementStatus === EnumTaskSettlementStatus.Fail ||
          form.settlementStatus === EnumTaskSettlementStatus.Part
        ),
        row.settlementReceiveStatus !== SettlementReceiveStatus.Refunded,
    },
  },
  {
@@ -191,10 +188,7 @@
    },
    extraProps: {
      hide: (row: API.GetSettlementTaskUsersQueryResultItem) =>
        !(
          form.settlementStatus === EnumTaskSettlementStatus.Fail ||
          form.settlementStatus === EnumTaskSettlementStatus.Part
        ),
        row.settlementReceiveStatus !== SettlementReceiveStatus.Refunded,
    },
  },
]);
@@ -466,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,
  });
}
@@ -562,6 +562,7 @@
    let res = await taskServices.editTaskSettlementOrderRoster(params);
    if (res) {
      Message.successMessage('操作成功');
      refetch();
      getList(paginationState.pageIndex);
    }
  } catch (error) {}
@@ -575,6 +576,7 @@
    let res = await taskServices.againSureTaskSettlementOrderRoster(params);
    if (res) {
      Message.successMessage('操作成功');
      refetch();
      getList(paginationState.pageIndex);
    }
  } catch (error) {}