Commit 3024dc08 authored by chenwei's avatar chenwei

Merge branch 'feature/099_customer_filter' into 'dev'

新增跳转逻辑

See merge request !6
parents ab1c965c 2c9cdfa8
......@@ -181,11 +181,17 @@
align="center"
:prop="isChinese ? 'rewardTitleZh' : 'rewardTitleEn'"
></el-table-column>
<el-table-column
:label="$t('会员名称')"
align="center"
:prop="isChinese ? 'memberNameZh' : 'memberNameEn'"
></el-table-column>
<el-table-column :label="$t('会员名称')" align="center">
<template v-slot="{ row }">
<el-button
type="text"
@click="
$router.push('/member/member/member-details/' + row.memberId)
"
>{{ isChinese ? row.memberNameZh : row.memberNameEn }}</el-button
>
</template>
</el-table-column>
<el-table-column :label="$t('兑换时间')" align="center">
<template v-slot="{ row }">
{{ parseTime(row.redemptionTime) || "/" }}</template
......
......@@ -120,11 +120,17 @@
align="center"
prop="id"
></el-table-column>
<el-table-column
:label="$t('会员名称')"
align="center"
:prop="isChinese ? 'memberNameZh' : 'memberNameEn'"
></el-table-column>
<el-table-column :label="$t('会员名称')" align="center">
<template v-slot="{ row }">
<el-button
type="text"
@click="
$router.push('/member/member/member-details/' + row.memberId)
"
>{{ isChinese ? row.memberNameZh : row.memberNameEn }}</el-button
>
</template></el-table-column
>
<el-table-column
width="140"
......@@ -138,16 +144,24 @@
:label="$t('国家')"
:prop="isChinese ? 'countryNameZh' : 'countryNameEn'"
></el-table-column>
<el-table-column
:label="$t('当前积分')"
align="center"
prop="holdScore"
></el-table-column>
<el-table-column
:label="$t('已兑换积分')"
align="center"
prop="usedScore"
></el-table-column>
<el-table-column :label="$t('当前积分')" align="center">
<template v-slot="{ row }">
<el-button
type="text"
@click="$router.push('/memberManagement/integralRecord')"
>{{ row.holdScore }}</el-button
>
</template>
</el-table-column>
<el-table-column :label="$t('已兑换积分')" align="center">
<template v-slot="{ row }">
<el-button
type="text"
@click="$router.push('/memberManagement/exchangeRecord')"
>{{ row.usedScore }}</el-button
>
</template>
</el-table-column>
<el-table-column
:label="$t('已失效积分')"
align="center"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment