Commit e8902c19 by huaying

fix: bug

parent 185a7d12
......@@ -2,10 +2,10 @@
<div class="hhBox">
<el-tabs v-model="activeName">
<el-tab-pane label="卡券核销" name="first">
<write-off-card :class="activeName == 'first' ? 'scroll_class' : ''"></write-off-card>
<write-off-card v-if="activeName == 'first'"></write-off-card>
</el-tab-pane>
<el-tab-pane label="门店核销" name="second">
<write-off-store :class="activeName == 'second' ? 'scroll_class' : ''"></write-off-store>
<write-off-store v-if="activeName == 'second'"></write-off-store>
</el-tab-pane>
</el-tabs>
</div>
......@@ -14,16 +14,11 @@
<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',
headerTop: '60px',
parent: 'scroll_class',
scrollClass: 'dm-layout-page'
activeName: 'first'
};
},
methods: {}
......
......@@ -5,7 +5,7 @@
<el-input class="w304" v-model.trim="form.writeOffName" placeholder="请输入内容" maxlength="10" show-word-limit></el-input>
</el-form-item>
<el-form-item label="手机号码:" prop="writeOffPhone">
<el-input :disabled="row.writeOffStoreStaffId" class="w303" v-model.trim="form.writeOffPhone">
<el-input :disabled="row.writeOffStoreStaffId" class="w303" v-model.trim="form.writeOffPhone" @input="formatN">
<template slot="prepend">中国 +86</template>
</el-input>
</el-form-item>
......@@ -70,6 +70,10 @@ export default {
};
},
methods: {
//
formatN(e) {
this.form.writeOffPhone = e.replace(/[^\d]/g, '');
},
handleClose() {
this.$refs.form.clearValidate();
this.$nextTick(_ => {
......
<template>
<div v-loading="loading" class="writeOffCardBox">
<div v-loading="loading" ref="page" class="writeOffCardBox">
<div class="searchBox">
<el-input prefix-icon="el-icon-search" placeholder="请输入会员信息/卡券信息/门店名称" class="w280" v-model="params.search" @change="refresh" clearable></el-input>
<span class="spanBox">核销时间</span>
......@@ -10,8 +10,8 @@
<el-button type="primary" @click="exportResult" v-if="$getButtonLimit($buttonCode.writeOffOUt)" :limit-code="$buttonCode.writeOffOUt"><i class="iconfont icon-xiazai" style="marginRight:4px;fontSize:16px" />查询结果导出</el-button>
</div>
</div>
<div class="content">
<el-table :data="tableData">
<div class="content" style="height: 100%">
<el-table :data="tableData" :height="`calc(100% - 130px)`" :max-height="`${tableData.length * 71 + 48}px`">
<el-table-column label="领取时间" prop="receiveTime" min-width="128px">
<template slot-scope="scope">
<p>
......@@ -80,7 +80,17 @@ export default {
mounted() {
this.getList();
},
beforeUpdate() {
this.$refs.page.style.height = `calc(100vh - ${this.getOffsetTop(this.$refs.page)}px)`;
},
methods: {
getOffsetTop(el) {
let top = el.offsetTop;
if (el.offsetParent) {
top += this.getOffsetTop(el.offsetParent);
}
return top;
},
async getList() {
this.dataTimeFormat();
this.loading = true;
......
<template>
<div v-loading="loading" class="writeOffCardBox">
<div v-loading="loading" ref="storePage" class="writeOffCardBox">
<div class="searchBox">
<el-input prefix-icon="el-icon-search" placeholder="请输入核销门店" class="w261" v-model="params.search" @change="refresh" clearable></el-input>
<span class="spanBox">核销时间</span>
......@@ -10,8 +10,8 @@
<el-button type="primary" @click="exportResult" v-if="$getButtonLimit($buttonCode.writeOffOUt)" :limit-code="$buttonCode.writeOffOUt"><i class="iconfont icon-xiazai" style="marginRight:4px;fontSize:16px" />查询结果导出</el-button>
</div>
</div>
<div class="content">
<el-table :data="tableData" @sort-change="sortChange">
<div class="content" style="height:100%">
<el-table :data="tableData" @sort-change="sortChange" ref="tableRef" :height="`calc(100% - 130px)`" :max-height="`${tableData.length * 48 + 59}px`">
<el-table-column label="核销门店" prop="storeName" min-width="100px"></el-table-column>
<el-table-column label="券核销数量" prop="writeOffCount" min-width="100px" sortable="custom"></el-table-column>
<el-table-column label="核销金额" prop="writeOffPrice" min-width="100px" sortable="custom"></el-table-column>
......@@ -53,7 +53,17 @@ export default {
mounted() {
this.getList();
},
beforeUpdate() {
this.$refs.storePage.style.height = `calc(100vh - ${this.getOffsetTop(this.$refs.storePage)}px)`;
},
methods: {
getOffsetTop(el) {
let top = el.offsetTop;
if (el.offsetParent) {
top += this.getOffsetTop(el.offsetParent);
}
return top;
},
async getList() {
this.loading = true;
this.dataTimeFormat();
......
<template>
<div v-loading="loading" class="writeOffCardBox">
<div v-loading="loading" ref="storePageDetail" class="writeOffCardBox">
<div class="searchBox">
<el-input prefix-icon="el-icon-search" placeholder="请输入卡券名称" class="w261" v-model="params.search" @change="refresh" clearable></el-input>
<span class="spanBox">核销时间</span>
......@@ -7,9 +7,9 @@
<el-checkbox class="ml16" v-model="checkedM" label="当月" border @change="currentM" />
<el-checkbox style="margin-left:6px;" v-model="checkedT" label="最近三个月" border @change="reThree" />
</div>
<div class="content">
<el-table :data="tableData" @sort-change="sortChange">
<el-table-column label="卡券名称" prop="cardName" min-width="100px"></el-table-column>
<div class="content" style="height:100%">
<el-table :data="tableData" @sort-change="sortChange" :height="`calc(100% - 30px)`" :max-height="`${tableData.length * 48 + 59}px`">
<el-table-column label="卡券名称" prop="cardName" min-width="100px" show-overflow-tooltip></el-table-column>
<el-table-column label="券金额" prop="cardDenomination" min-width="100px" sortable="custom"></el-table-column>
<el-table-column label="核销数量" prop="writeOffCount" min-width="100px" sortable="custom"></el-table-column>
<el-table-column label="核销金额" prop="writeOffPrice" min-width="100px" sortable="custom"></el-table-column>
......@@ -26,15 +26,11 @@
<script>
import { getCardDetailPage } from '@/service/api/cardApi.js';
import writeOff from './writeOff.js';
import sticky from '@/mixins/table-sticky.js';
export default {
name: 'writeOffDetail',
mixins: [writeOff, sticky],
mixins: [writeOff],
data() {
return {
headerTop: '80px',
parent: 'content',
scrollClass: 'dm-layout-page',
params: {
writeOffBeginTime: '',
writeOffEndTime: '',
......@@ -48,7 +44,17 @@ export default {
mounted() {
this.getList();
},
beforeUpdate() {
this.$refs.storePageDetail.style.height = `calc(100vh - ${this.getOffsetTop(this.$refs.storePageDetail)}px - 100px)`;
},
methods: {
getOffsetTop(el) {
let top = el.offsetTop;
if (el.offsetParent) {
top += this.getOffsetTop(el.offsetParent);
}
return top;
},
async getList() {
try {
this.loading = true;
......
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