Commit 0a288932 by crushh

Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

parents f5265caa ea1f9e1d
......@@ -94,13 +94,13 @@
<el-table-column label="关联导购" width="130" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.clerkName ? row.clerkName : '--' }}</p>
<p class="ft-12 phone overflow-ellipsis">{{ row.clerkCode ? row.clerkCode : '--' }}</p>
<p class="ft-12 phone overflow-ellipsis">code:{{ row.clerkCode ? row.clerkCode : '--' }}</p>
<p v-if="row.clerkList && row.clerkList.length > 0">
<el-popover width="200" trigger="click">
<ul class="userMember-ul">
<li v-for="item in row.clerkList" :key="item.clerkId" class="userMemberLi">
<p class="ulName">{{ item.clerkName }}</p>
<p class="ft-12 phone">code:{{ item.clerkCode }}</p>
<p class="ft-12 phone">code{{ item.clerkCode }}</p>
</li>
</ul>
<el-button class="ft-12" type="text" slot="reference">查看更多</el-button>
......@@ -111,13 +111,13 @@
<el-table-column label="成员所属门店" width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.storeName ? row.storeName : '--' }}</p>
<p class="ft-12 phone">code:{{ row.storeCode ? row.storeCode : '--' }}</p>
<p class="ft-12 phone">code{{ row.storeCode ? row.storeCode : '--' }}</p>
<p v-if="row.storeList && row.storeList.length > 0">
<el-popover width="200" trigger="click">
<ul class="userMember-ul">
<li v-for="item in row.storeList" :key="item.storeId" class="userMemberLi">
<p class="ulName">{{ item.storeName }}</p>
<p class="ft-12 phone">code:{{ item.storeCode }}</p>
<p class="ft-12 phone">code{{ item.storeCode }}</p>
</li>
</ul>
<el-button class="ft-12" type="text" slot="reference">查看更多</el-button>
......
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