Skip to content

M
member
Commit 415ed01e by huaying
Options

fix: kehurizhi

parent 3bae3a4c
Showing with 97 additions and 35 deletions
src/components/allCustomers/components/customerLog.vue
......@@ -14,22 +14,25 @@
<p class="font14 tip-p" v-if="!memberId">展示近一年的日志</p>
</div>
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="createTime" label="时间">
<el-table-column prop="createTime" label="时间" min-width="100px">
<template slot-scope="scope">
{{ scope.row.createTime | formatTime }}
{{ scope.row.createTime | formatDate('ymd') }} <br /> {{ scope.row.createTime | formatDate('hms') }}
</template>
</el-table-column>
<el-table-column prop="operType" label="日志类型" />
<el-table-column prop="operReason" label="事由" />
<el-table-column prop="operContent" label="日志详情" show-overflow-tooltip/>
<el-table-column prop="operRemark" label="备注" show-overflow-tooltip>
<el-table-column prop="operType" label="日志类型" min-width="100px" :formatter="(row, col, val) => val || '--'" />
<el-table-column prop="operReason" label="事由" min-width="100px" :formatter="(row, col, val) => val || '--'" />
<el-table-column prop="operContent" label="日志详情" min-width="230px" show-overflow-tooltip :formatter="(row, col, val) => val || '--'"/>
<el-table-column prop="operRemark" label="备注" min-width="230px" show-overflow-tooltip>
<template slot-scope="{ row }">
<span v-html="row.operRemark" />
<span v-if="row.operRemark" v-html="row.operRemark" />
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="" label="操作" width="120" v-if="memberId">
<template slot-scope="{ }">
<el-button type="text" @click="goLink('/customerLog')">查看</el-button>
<el-table-column prop="" label="操作" width="80" v-if="memberId">
<template slot-scope="{ row }">
<el-button v-if="row.operType == '客户合并' && row.referLogId && (row.referLogId != -1 && row.referLogId != '')" type="text" @click="goLink('/customerLog',row.referLogId)">查看</el-button>
<p v-else>--</p>
<!-- <el-button @click="goLink('/customerLog',row.referLogId)">查看</el-button> -->
</template>
</el-table-column>
</el-table>
......@@ -96,11 +99,16 @@ export default {
methods: {
// 级联搜索
filterMethod(e) {
console.log(e[0],e[1]);
if(e[0]) {
this.logPageParam.operType = e[0];
}else if (e[1]) {
this.logPageParam.operReason = e[1]
console.log(e.length);
if(e && e.length > 0) {
if(e[0]) {
this.logPageParam.operType = e[0];
}else if (e[1]) {
this.logPageParam.operReason = e[1]
}
}else {
this.logPageParam.operType = null;
// this.logPageParam.operReason = null;
}
this.logPageParam.currentPage = 1;
this.getLogPage();
......@@ -156,9 +164,10 @@ export default {
this.logPageParam.currentPage = 1;
this.getLogPage();
},
goLink (v) {
goLink (v,referLogId) {
console.log(this.memberId, 'this.memberId');
if (v) this.$router.push({ path: v, query: { memberId: this.memberId } });
if (v) this.$router.push({ path: v, query: { memberId: referLogId } });
// if (v) this.$router.push({ path: v, query: { memberId: this.memberId } });
},
}
};
......@@ -166,9 +175,11 @@ export default {
<style lang="scss" scoped>
.logTop {
margin-bottom: 20px;
display: flex !important;
align-items: center !important;
display: flex;
align-items: center;
margin-right: 10px;
line-height: normal;
vertical-align: middle;
}
.tip-p{
margin-left: 20px;
......
src/components/wechatmembers/cardMixin.js
......@@ -34,5 +34,23 @@ export default {
end = `${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate()-1}`;
this.dateDefault = [formatYMD(new Date(end).getTime()), formatYMD(new Date(start).getTime())]
},
}
},
filters: {
formatDate(val, format) {
if(!val) return '--';
val = new Date(val);
let y = val.getFullYear();
let m = (val.getMonth() + 1).toString().padStart(2, '0');
let d = val.getDate().toString().padStart(2, '0');
let h = val.getHours().toString().padStart(2, '0');
let mm = val.getMinutes().toString().padStart(2, '0');
let s = val.getSeconds().toString().padStart(2, '0');
if(format == 'ymd') {
return `${y}-${m}-${d}`;
} else if(format == 'hms') {
return `${h}:${mm}:${s}`;
}
return `${y}-${m}-${d}\xa0\xa0\xa0${h}:${mm}:${s}`;
}
},
};
\ No newline at end of file
src/components/wechatmembers/cardvoucher.vue
<template>
<div >
<div class="table-container-member">
<div class="mBottom20">
<div class="mBottom16">
<el-select
v-model="cardReviceCode"
style="margin-right: 7px;"
......@@ -143,8 +143,8 @@
label="有效期"
>
<template slot-scope="{row}">
<!-- {{row.cardEffectiveMode == 0 ? `${row.effectTime | formatTime}-${row.limitTime | formatTime}` : row.cardEffectiveMode == 1 && row.receiveTime == null ? `领取后${row.startDay}天生效，有效期${row.limitDay}天` : row.cardEffectiveMode == 1 && row.receiveTime != null ? `${row.effectTime | formatTime}-${row.limitTime | formatTime}` : row.cardEffectiveMode == 2 && row.receiveTime == null ? '领取后当月有效' : row.cardEffectiveMode == 2 && row.receiveTime != null ? `${row.effectTime | formatTime}-${row.limitTime | formatTime}` : '--'}} -->
{{row.cardEffectiveMode == 0 || (row.cardEffectiveMode == 2 && row.receiveTime != null) || (row.cardEffectiveMode == 1 && row.receiveTime != null) ? `${row.effectTime | formatTime}-${row.limitTime | formatTime}` : row.cardEffectiveMode == 1 && row.receiveTime == null ? `领取后${row.startDay}天生效，有效期${row.limitDay}天` : row.cardEffectiveMode == 2 && row.receiveTime == null ? '领取后当月有效' : '--'}}
{{row.cardEffectiveMode == 0 ? `${row.effectTime | formatTime}-${row.limitTime | formatTime}` : row.cardEffectiveMode == 1 && row.receiveTime == null ? `领取后${row.startDay}天生效，有效期${row.limitDay}天` : row.cardEffectiveMode == 1 && row.receiveTime != null ? `${row.effectTime | formatTime}-${row.limitTime | formatTime}` : row.cardEffectiveMode == 2 && row.receiveTime == null ? '领取后当月有效' : row.cardEffectiveMode == 2 && row.receiveTime != null ? `${row.effectTime | formatTime}-${row.limitTime | formatTime}` : '--'}}
<!-- {{row.cardEffectiveMode == 0 || (row.cardEffectiveMode == 2 && row.receiveTime != null) || (row.cardEffectiveMode == 1 && row.receiveTime != null) ? `${formatTime(row.effectTime) | formatTime}-${row.limitTime | formatTime}` : row.cardEffectiveMode == 1 && row.receiveTime == null ? `领取后${row.startDay}天生效，有效期${row.limitDay}天` : row.cardEffectiveMode == 2 && row.receiveTime == null ? '领取后当月有效' : '--'}} -->
</template>
</el-table-column>
......@@ -383,6 +383,7 @@ export default {
};
},
mixins: [authMethods, mixin],
methods: {
formatStatus(row) {
let _content = '';
......@@ -602,6 +603,9 @@ export default {
</script>
<style lang="stylus" scoped>
.mBottom16 {
margin-bottom: 16px;
}
.tip-p{
color: #6B6D71;
padding-bottom: 16px;
......
src/components/wechatmembers/integralDataPage.vue
......@@ -7,6 +7,7 @@
<div class="search-top mBottom20">
<div class="left-search-wrap">
<el-select
class="w160"
v-model="intervalInOut"
placeholder="所有日志"
@change="handleSearch"
......@@ -28,6 +29,7 @@
></el-option>
</el-select>
<el-select
class="w160"
v-model="dictCode"
placeholder="所有事由"
@change="handleSearch"
......@@ -44,11 +46,11 @@
:value="item.dictCode"
></el-option>
</el-select>
<el-select v-model="sourceType" placeholder="所有来源渠道" @change="handleSearch">
<el-select class="w160" v-model="sourceType" placeholder="所有来源渠道" @change="handleSearch">
<el-option label="所有来源渠道" :value=-1></el-option>
<el-option v-for="item in sourceTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-select v-model="frozenStatus" placeholder="所有积分状态" @change="handleSearch">
<el-select class="w160" v-model="frozenStatus" placeholder="所有积分状态" @change="handleSearch">
<el-option label="所有积分状态" :value=-1></el-option>
<el-option v-for="item in frozenStatusList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
......@@ -70,10 +72,10 @@
<el-table-column
prop="callBeginTime"
label="时间"
min-width="155px"
min-width="110px"
>
<template slot-scope="scope">
{{ scope.row.createTime | formatTime }}
{{ scope.row.createTime | formatDate('ymd') }} <br /> {{ scope.row.createTime | formatDate('hms') }}
</template>
</el-table-column>
<el-table-column
......@@ -87,6 +89,11 @@
</template>
</el-table-column>
<el-table-column
prop="memberIntegralName"
label="事由"
min-width="90px"
></el-table-column>
<el-table-column
prop="intervalHistory"
label="日志详情"
min-width="80px"
......@@ -95,7 +102,7 @@
<span :style="{color: scope.row.intervalHistory > 0 ? 'green' : 'red'}">{{ scope.row.intervalHistory }}</span>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="frozenStatus"
label="积分状态"
min-width="80px"
......@@ -103,12 +110,7 @@
<template slot-scope="{row}">
<span>{{ row.frozenStatus==1?'冻结':'可用' }}</span>
</template>
</el-table-column>
<el-table-column
prop="memberIntegralName"
label="事由"
min-width="80px"
></el-table-column>
</el-table-column> -->
<el-table-column prop="sourceType" label="来源渠道" min-width="80px" :formatter="formatSourceType"></el-table-column>
<el-table-column
prop="remark"
......@@ -119,16 +121,19 @@
prop="mainStoreName"
label="服务门店"
min-width="160px"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="openStoreName"
label="开卡门店"
min-width="160px"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="intervalEffect"
label="积分成本主体"
min-width="110px"
show-overflow-tooltip
>
<template slot-scope="scope">
<span v-if="scope.row.intervalInout == 0">--</span>
......@@ -413,6 +418,9 @@ export default {
</script>
<style lang="stylus">
.w160 {
width: 160px;
}
.m20 {
margin: 20px;
margin-top: 0px;
......
src/components/wechatmembers/integralMixin.js
......@@ -34,5 +34,24 @@ export default {
end = `${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate()}`;
this.dateDefault = [formatYMD(new Date(end).getTime()), formatYMD(new Date(start).getTime())]
},
}
},
filters: {
formatDate(val, format) {
if(!val) return '--';
val = new Date(val);
let y = val.getFullYear();
let m = (val.getMonth() + 1).toString().padStart(2, '0');
let d = val.getDate().toString().padStart(2, '0');
let h = val.getHours().toString().padStart(2, '0');
let mm = val.getMinutes().toString().padStart(2, '0');
let s = val.getSeconds().toString().padStart(2, '0');
if(format == 'ymd') {
return `${y}-${m}-${d}`;
} else if(format == 'hms') {
return `${h}:${mm}:${s}`;
}
return `${y}-${m}-${d}\xa0\xa0\xa0${h}:${mm}:${s}`;
}
},
};
\ No newline at end of file
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