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

admin-web/src/views/admin/station/statment/dialog.vue

@@ -155,14 +155,14 @@ tbody tr td {
             <td colspan="2">充电电量（度）</td>
             <td colspan="2">订单电费（元）</td>
             <td >实收服务费（元）</td>
-            <td>订单总金额（元）</td>
+            <td>订单实收总金额（元）</td>
           </tr>
           <tr style="text-align: center">
             <td colspan="2">{{ state.ruleForm.stationName }}</td>
             <td colspan="2">{{ state.ruleForm.totalPower }}</td>
-            <td colspan="2">{{ u.fmt.fmtMoney(state.ruleForm.actualElecMoney) }}</td>
-            <td>{{ u.fmt.fmtMoney(state.ruleForm.serviceMoney ) }}</td>
-            <td>{{ u.fmt.fmtMoney(state.ruleForm.totalMoney ) }}</td>
+            <td colspan="2">{{ u.fmt.fmtMoney(state.ruleForm.elecMoney) }}</td>
+            <td>{{ u.fmt.fmtMoney(state.ruleForm.serviceMoney - state.ruleForm.discountAmount) }}</td>
+            <td>{{ u.fmt.fmtMoney(state.ruleForm.totalMoney - state.ruleForm.discountAmount) }}</td>
           </tr>
           <tr style="background-color: lightsteelblue">
             <td colspan="8" style="padding-left: 15px;">二、物业结算数据（含税）</td>