diff --git a/apps/src/views/operate/manual-salary-payment.vue b/apps/src/views/operate/manual-salary-payment.vue
index c17d16b..59ab046 100644
--- a/apps/src/views/operate/manual-salary-payment.vue
+++ b/apps/src/views/operate/manual-salary-payment.vue
@@ -74,9 +74,15 @@ const columns = [
{ dataIndex: 'lastSettlementTarget', key: 'lastSettlementTarget', title: '上次结算的积分', width: 150 },
{ dataIndex: 'currentTarget', key: 'currentTarget', title: '本次积分', width: 130 },
{ dataIndex: 'policyLevel', key: 'policyLevel', title: '本次积分档位', width: 130 },
- { dataIndex: 'expectedSalary', key: 'expectedSalary', title: '本月应发', width: 120 },
- { dataIndex: 'payableSalary', key: 'payableSalary', title: '应发(应发-实收)', width: 160 },
- { dataIndex: 'totalIssuedSalary', key: 'totalIssuedSalary', title: '总发工资', width: 130 },
+ { dataIndex: 'expectedMemberSalary', key: 'expectedMemberSalary', title: '主播应发', width: 120 },
+ { dataIndex: 'expectedAgentSalary', key: 'expectedAgentSalary', title: '代理应发', width: 120 },
+ { dataIndex: 'expectedSalary', key: 'expectedSalary', title: '应发合计', width: 120 },
+ { dataIndex: 'payableMemberSalary', key: 'payableMemberSalary', title: '主播差额', width: 120 },
+ { dataIndex: 'payableAgentSalary', key: 'payableAgentSalary', title: '代理差额', width: 120 },
+ { dataIndex: 'payableSalary', key: 'payableSalary', title: '合计差额', width: 140 },
+ { dataIndex: 'memberIssuedSalary', key: 'memberIssuedSalary', title: '主播实收', width: 140 },
+ { dataIndex: 'agentIssuedSalary', key: 'agentIssuedSalary', title: '代理实收', width: 140 },
+ { dataIndex: 'totalIssuedSalary', key: 'totalIssuedSalary', title: '总发工资', width: 140 },
{ dataIndex: 'currentSalaryBalance', key: 'currentSalaryBalance', title: '当前工资', width: 140 },
{ dataIndex: 'action', fixed: 'right', key: 'action', title: '操作', width: 110 },
];
@@ -426,7 +432,7 @@ void loadCountries();
:page-size="query.limit"
row-key="rowKey"
:row-selection="rowSelection"
- :scroll-x="1620"
+ :scroll-x="2340"
:show-pager="false"
:summary-text="summaryText"
:total="total"
@@ -471,6 +477,26 @@ void loadCountries();
{{ formatMoney(record.expectedSalary) }}
+
+ {{ formatMoney(record.expectedMemberSalary) }}
+
+
+ {{ formatMoney(record.expectedAgentSalary) }}
+
+
+
+ {{ formatMoney(record.payableMemberSalary) }}
+
+
+
+
+ {{ formatMoney(record.payableAgentSalary) }}
+
+
已结算
+
+ {{ formatMoney(record.memberIssuedSalary) }}
+
+ ({{ formatMoney(record.memberOverIssuedSalary) }})
+
+
+
+ {{ formatMoney(record.agentIssuedSalary) }}
+
+ ({{ formatMoney(record.agentOverIssuedSalary) }})
+
+
{{ formatMoney(record.totalIssuedSalary) }}