Commit 31b6d8a0 by shaojiawen

update: UI

parent 18f1aae6
......@@ -100,29 +100,15 @@
prop="brandName"
label="来源品牌"
min-width="150px"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.brandName}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.brandName }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
prop="remark"
label="备注"
min-width="160px"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.remark}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.remark }}</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<div
......@@ -235,7 +221,7 @@ export default {
doFetch(url.enterpriseIntegralDetailData, para)
.then(res => {
if (res.data.errorCode === 0) {
this.memberData = res.data.result.page.result;
this.memberData = res.data.result.page.result || [];
this.page.currentPage = res.data.result.page.currentPage;
this.page.totalCount = res.data.result.page.totalCount;
} else {
......@@ -280,7 +266,7 @@ export default {
};
</script>
<style lang="scss">
<style lang="scss" scoped>
.search-top{
display: flex;
justify-content:space-between;
......@@ -314,4 +300,13 @@ export default {
display: -webkit-box;
-webkit-box-orient: vertical;
}
.table-content{
/deep/ .el-table {
th > .cell:first-child,
td > .cell:first-child {
padding-left: 10px;
}
}
}
</style>
......@@ -11,7 +11,7 @@
:picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
</div>
</div>
<div>
<div class="table-content">
<el-table :data="memberData" tooltip-effect="dark" ref="multipleTable" :max-height="height">
<el-table-column prop="createTime" label="时间" min-width="130px">
<template slot-scope="scope">
......@@ -45,35 +45,11 @@
<div v-else>无截止时间</div>
</template>
</el-table-column>
<el-table-column prop="relationId" label="关联id" min-width="160px">
<template slot-scope="scope">
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.relationId}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.relationId }}</div>
</el-tooltip>
</template>
<el-table-column prop="relationId" label="关联id" min-width="160px" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="openStoreName" label="积分成本主体" min-width="170px">
<template slot-scope="scope">
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.openStoreName}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.openStoreName }}</div>
</el-tooltip>
</template>
<el-table-column prop="openStoreName" label="积分成本主体" min-width="170px" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="intervalEffect" label="备注信息" min-width="140px">
<template slot-scope="scope">
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.intervalEffect}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.intervalEffect }}</div>
</el-tooltip>
</template>
<el-table-column prop="intervalEffect" label="备注信息" min-width="140px" show-overflow-tooltip>
</el-table-column>
</el-table>
<div class="page mTop20">
......@@ -159,7 +135,7 @@ export default {
.then(res => {
this.loading = false;
if (res.data.errorCode === 0) {
this.memberData = res.data.result.page.result;
this.memberData = res.data.result.page.result || [];
this.page.currentPage = res.data.result.page.currentPage;
this.page.totalCount = res.data.result.page.totalCount;
} else {
......@@ -174,7 +150,6 @@ export default {
},
mounted() {
this.setDefalutTime()
console.log(this.memberId,1);
if(this.memberId){
this.getIntegralDataPage()
}
......@@ -184,6 +159,15 @@ export default {
};
</script>
<style lang="scss" scoped>
.table-content{
/deep/ .el-table {
th > .cell:first-child,
td > .cell:first-child {
padding-left: 10px;
}
}
}
.width160{
width: 160px;
}
......
......@@ -501,5 +501,11 @@ export default {
overflow-y: auto;
box-sizing: border-box;
}
/deep/ .el-table {
th > .cell:first-child,
td > .cell:first-child {
padding-left: 10px;
}
}
}
</style>
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