Commit 7213da26 by huaying

fix: kaquan

parent 0d8bba2f
......@@ -28,7 +28,7 @@ export default {
setDefalutTime(){
let start = new Date();
start.setFullYear(start.getFullYear() - 1);
start.setDate(start.getDate());
start.setDate(start.getDate()+1);
start = `${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`;
let end = new Date();
end = `${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate()}`;
......
......@@ -145,12 +145,8 @@
>
<template slot-scope="{row}">
<span v-if="row.cardEffectiveMode == 0 || (row.cardEffectiveMode == 2 && row.receiveTime != null) || (row.cardEffectiveMode == 1 && row.receiveTime != null)">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span>
<span v-if="row.cardEffectiveMode == 1 && row.receiveTime == null">领取后{{row.startDay}}天生效,有效期{{row.limitDay}}</span>
<!-- <span v-if="row.cardEffectiveMode == 1 && row.receiveTime != null">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span> -->
<span v-if="row.cardEffectiveMode == 1 && row.receiveTime == null">领取后{{row.startDay}}天生效,有效期{{row.limitDay}}</span>
<span v-if="row.cardEffectiveMode == 2 && row.receiveTime == null">领取后当月有效</span>
<!-- <span v-if="row.cardEffectiveMode == 2 && row.receiveTime != null">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span> -->
<!-- {{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>
<el-table-column
......
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