Commit e2d82d33 by huaying

Merge branch 'feature/act-code' into dev

parents a216dd68 97fe63a8
......@@ -58,40 +58,40 @@
</el-form>
<el-table ref="actCodeTableRef" v-loading="loadingStatus" :data="tableData" class="act-code-table" @sort-change="sortChange" :max-height="tableMaxHeight" @selection-change="handleSelectionChange">
<!-- @select="selectTable" tooltip-effect="dark"-->
<el-table-column type="selection" width="60" fixed> </el-table-column>
<el-table-column type="selection" min-width="60" fixed> </el-table-column>
<!-- <el-table-column width="60" class-name="table-select-cell" fixed>
<template #header>
<dm-table-select-page class="table-select" :type="selectPage.type" :data-ready="selectPage.dataReady" :table-vm="$refs.actCodeTableRef" :table-data="tableData" :total="totalCount" @change="t => (selectPage.type = t)" @selection-change="handleSelectionChange"></dm-table-select-page>
</template>
</el-table-column> -->
<el-table-column label="活码ID" fixed width="110">
<el-table-column label="活码ID" fixed min-width="110">
<template slot-scope="{ row }">
<p>{{ row.hmCode }}</p>
</template>
</el-table-column>
<el-table-column label="活码信息" width="100">
<el-table-column label="活码信息" min-width="100">
<template slot-scope="{ row }">
<p class="overflow-ellipsis" :title="row.hmName">{{ row.hmName ? row.hmName : '--' }}</p>
<p><span class="oneActCode" v-if="row.hmType == 1">单人活码</span><span class="moreActCOde" v-else>多人活码</span></p>
</template>
</el-table-column>
<el-table-column label="活码状态" width="130">
<el-table-column label="活码状态" min-width="130">
<template slot-scope="{ row }">
<p><span class="dot normal" v-if="row.statusFlag == 1">正常</span><span class="dot voided" v-if="row.statusFlag == 2">作废</span><span class="dot needSure" v-if="row.statusFlag == 3">待生效</span></p>
<p class="toTopTip" v-if="row.overFlag == 1">(今日已达上限)</p>
</template>
</el-table-column>
<el-table-column label="添加好友人数" prop="addNumT" sortable="custom" width="150">
<el-table-column label="添加好友人数" prop="addNumT" sortable="custom" min-width="150">
<template slot-scope="{ row }">
<p>{{ row.addNumT ? row.addNumT : '--' }}</p>
</template>
</el-table-column>
<el-table-column label="今日新增人数" prop="addNum" sortable="custom" width="150">
<el-table-column label="今日新增人数" prop="addNum" sortable="custom" min-width="150">
<template slot-scope="{ row }">
<p>{{ row.addNum ? row.addNum : '--' }}</p>
</template>
</el-table-column>
<el-table-column label="关联导购" width="130" show-overflow-tooltip>
<el-table-column label="关联导购" min-width="130" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.clerkList[0] ? row.clerkList[0].clerkName : '--' }}</p>
<p class="ft-12 phone overflow-ellipsis">{{ row.clerkList[0] ? `code:${row.clerkList[0].clerkCode}` : '--' }}</p>
......@@ -108,7 +108,7 @@
</p>
</template>
</el-table-column>
<el-table-column label="成员所属门店" width="120" show-overflow-tooltip>
<el-table-column label="成员所属门店" min-width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.storeList[0] ? row.storeList[0].storeName : '--' }}</p>
<p class="ft-12 phone">{{ row.storeList[0] ? `code:${row.storeList[0].storeCode}` : '--' }}</p>
......@@ -125,22 +125,23 @@
</p>
</template>
</el-table-column>
<el-table-column label="所属分组" width="100" show-overflow-tooltip>
<el-table-column label="所属分组" min-width="100" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.hmGroupName ? row.hmGroupName : '--' }}</p>
<p class="overflow-ellipsis">{{ row.hmGroupName ? row.hmGroupName : '--' }}</p>
</template>
</el-table-column>
<el-table-column label="创建人" width="100">
<el-table-column label="创建人" min-width="100" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.creatorName ? row.creatorName : '--' }}</p>
<p class="overflow-ellipsis">{{ row.creatorName ? row.creatorName : '--' }}</p>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime" sortable="custom" width="110">
<el-table-column label="创建时间" prop="createTime" sortable="custom" min-width="110">
<template slot-scope="{ row }">
<p>{{ row.createTime ? row.createTime : '--' }}</p>
<div>{{ row.createTime | timeStampToYmd }}</div>
<div>{{ row.createTime | timeStampToHms }}</div>
</template>
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<el-table-column label="操作" min-width="160" fixed="right">
<template slot-scope="{ row }">
<dm-dropdown :scope-data="row" :max="3" :configs="operateBtnArr" />
</template>
......
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