Authored by lin

调整页面显示

@@ -128,7 +128,27 @@ export default function() { @@ -128,7 +128,27 @@ export default function() {
128 }, 128 },
129 { 129 {
130 title: '子账务类型', 130 title: '子账务类型',
131 - key: 'subClearingTypes', 131 + key: '',
  132 + align: 'center',
  133 + render: (h, params) => {
  134 + return (
  135 + <span class="table-header-req">
  136 + <poptip trigger="hover" placement="right-start">
  137 + <a>全部</a>
  138 + <div class="example-pop" slot="content">
  139 + <p>成交金额:{params.row.subShopAccount.lastPrice}</p>
  140 + <p>交易服务费:{params.row.subShopAccount.tradeServiceAmount}</p>
  141 + <p>优惠券结算:{params.row.subShopAccount.couponAmount}</p>
  142 + <p>红包结算:{params.row.subShopAccount.redPackageAmount}</p>
  143 + <p>VIP折扣:{params.row.subShopAccount.vipAmount}</p>
  144 + <p>交易实收:{params.row.subShopAccount.tradeRealIncome}</p>
  145 + <p>提现服务费:{params.row.subShopAccount.withdrawServiceAmount}</p>
  146 + <p>商家实收:{params.row.subShopAccount.shopRealIncome}</p>
  147 + </div>
  148 + </poptip>
  149 + </span>
  150 + );
  151 + }
132 }, 152 },
133 { 153 {
134 title: '商家实收(元)', 154 title: '商家实收(元)',
@@ -118,6 +118,7 @@ import moment from 'moment'; @@ -118,6 +118,7 @@ import moment from 'moment';
118 import { TransactionList } from './store'; 118 import { TransactionList } from './store';
119 import FinanceService from 'services/finance/finance-service'; 119 import FinanceService from 'services/finance/finance-service';
120 120
  121 +
121 const ClearingTypeName2Id = { 122 const ClearingTypeName2Id = {
122 REVENUE: 1, 123 REVENUE: 1,
123 EXPEND: 2, 124 EXPEND: 2,