Commit 30633a98 by huaying

fix: 核销记录

parent a52d5659
......@@ -2,10 +2,10 @@
<div class="hhBox">
<el-tabs v-model="activeName">
<el-tab-pane label="卡券核销" name="first">
<write-off-card></write-off-card>
<write-off-card :class="activeName == 'first' ? 'scroll_class' : ''"></write-off-card>
</el-tab-pane>
<el-tab-pane label="门店核销" name="second">
<write-off-store></write-off-store>
<write-off-store :class="activeName == 'second' ? 'scroll_class' : ''"></write-off-store>
</el-tab-pane>
</el-tabs>
</div>
......@@ -14,11 +14,16 @@
<script>
import writeOffCard from './writeOffCard.vue';
import WriteOffStore from './writeOffStore.vue';
import sticky from '@/mixins/table-sticky.js';
export default {
components: { writeOffCard, WriteOffStore },
mixins: [sticky],
data() {
return {
activeName: 'first'
activeName: 'first',
headerTop: '60px',
parent: 'scroll_class',
scrollClass: 'dm-layout-page'
};
},
methods: {}
......
......@@ -33,7 +33,6 @@ export default {
},
mounted() {
this.dateTime = [`${formatDateTimeByType(this.dateTime[0], 'yyyy-MM-dd')} 00:00:00`, `${formatDateTimeByType(this.dateTime[1], 'yyyy-MM-dd')} 23:59:59`];
console.log(this.dateTime, 'datadffa');
},
methods: {
getDateRange(setEndDate) {
......
......@@ -40,7 +40,7 @@
<div>
<img class="vertical-middle table__avatar_40" :src="scope.row.thirdimgurl || defaultAvatar" width="40" height="40" />
<div class="inline-block vertical-middle">
<p class="overflow-ellipsis">{{ scope.row.memberName || '--' }}</p>
<p class="overflow-ellipsis">{{ scope.row.thirdName || '--' }}</p>
<p class="fz12 gray overflow-ellipsis">{{ scope.row.phoneNum || '--' }}</p>
</div>
</div>
......
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