Commit 321ed9f8 by shaojiawen

update: 卡券领取记录使用状态

parent 208934c9
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -4,7 +4,7 @@
<el-select class="dm-select mr10 w140" clearable v-model="listParams.cardType" placeholder="所有卡券类型" @change="refresh">
<el-option v-for="(v, i) in cardType" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-select class="dm-select mr10 w140" clearable v-model="listParams.status" placeholder="所有使用状态" @change="refresh">
<el-select class="dm-select mr10 w140" clearable v-model="listParams.statusFlag" placeholder="所有使用状态" @change="refresh">
<el-option v-for="(v, i) in status" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input placeholder="请输入关键字" class="w400 mr10" v-model="listParams.search" clearable @change="refresh">
......@@ -79,7 +79,7 @@
<el-table-column label="操作" align="left" width="130px" fixed="right">
<template slot-scope="scope" v-if="listParams.visitorFlag == 0">
<el-button type="text" v-if="scope.row.statusFlag == 4 && Date.now() < scope.row.effectEndTime + 24 * 60 * 60 * 1000" @click="orderData(scope.row)">核销</el-button>
<dm-delete @confirm="delData(scope.row)" v-if="scope.row.status === 4 && Date.now() < scope.row.effectEndTime + 24 * 60 * 60 * 1000" width="280" tips="销毁后无法恢复,确认销毁?">
<dm-delete @confirm="delData(scope.row)" v-if="scope.row.statusFlag === 4 && Date.now() < scope.row.effectEndTime + 24 * 60 * 60 * 1000" width="280" tips="销毁后无法恢复,确认销毁?">
<el-button type="text">销毁</el-button>
</dm-delete>
</template>
......@@ -182,7 +182,7 @@ export default {
},
formatCardStatus(row) {
// (3:已发放,4:已领取,5:已使用,6:已到期,7:已销毁, 8:已占用, 9:转赠中, 10: 已转赠)
const st = sendCardStatus[row.status];
const st = sendCardStatus[row.statusFlag];
if(st) {
return `<span class="state-point ${st.cl}">${st.label}</span>`;
} else {
......
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