Compare commits

..

No commits in common. "51848337371597b1de8b12381673e8c9c148aa25" and "3e6909ac0a47d4b7a3f089eb0dd07f92d3be46bc" have entirely different histories.

1 changed files with 49 additions and 22 deletions

View File

@ -28,6 +28,22 @@
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'币种展示'">
<el-select
v-model="select.pkCurrency"
clearable
placeholder=""
>
<el-option
v-for="item in acList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'结算日期'">
<el-date-picker
@ -146,75 +162,85 @@
:label="'结算期数'">
</el-table-column> -->
<el-table-column
v-if="allTxt.settleDate"
align="center"
prop="settleDate"
width="150"
:label="'结算时间'"
/>
<el-table-column
v-if="allTxt.registerAmount"
align="center"
prop="registerAmount"
:formatter="stateFormat"
width="160"
:label="'精品金额'"
:label="'注册金额'"
/>
<el-table-column
v-if="allTxt.registerPv"
align="center"
prop="registerPv"
:formatter="stateFormat"
width="160"
:label="'精品业绩'"
:label="'注册业绩'"
/>
<el-table-column
v-if="allTxt.upgradeAmount"
align="center"
prop="upgradeAmount"
:formatter="stateFormat"
width="160"
:label="'甄选金额'"
:label="'升级金额'"
/>
<el-table-column
v-if="allTxt.upgradePv"
align="center"
prop="upgradePv"
:formatter="stateFormat"
width="160"
:label="'甄选业绩'"
:label="'升级业绩'"
/>
<el-table-column
v-if="allTxt.firstPurchaseAmount"
align="center"
prop="firstPurchaseAmount"
:formatter="stateFormat"
width="160"
:label="'首购金额'"
/>
<el-table-column
v-if="allTxt.firstPurchasePv"
align="center"
prop="firstPurchasePv"
:formatter="stateFormat"
width="160"
:label="'首购业绩'"
/>
<el-table-column
v-if="allTxt.repurchaseAmount"
align="center"
prop="repurchaseAmount"
:formatter="stateFormat"
width="160"
:label="'商城金额'"
:label="'复购金额'"
/>
<el-table-column
v-if="allTxt.repurchasePv"
align="center"
prop="repurchasePv"
:formatter="stateFormat"
width="160"
:label="'商城业绩'"
/>
<el-table-column
align="center"
prop="discountAmount"
:formatter="stateFormat"
width="160"
:label="'五折金额'"
/>
<el-table-column
align="center"
prop="discountPv"
:formatter="stateFormat"
width="150"
:label="'五折业绩'"
:label="'复购业绩'"
/>
<el-table-column
v-if="allTxt.amountTotal"
align="center"
prop="amountTotal"
:formatter="stateFormat"
@ -223,6 +249,7 @@
/>
<el-table-column
v-if="allTxt.pvTotal"
align="center"
prop="pvTotal"
:formatter="stateFormat"