From 4ace4d28e01a4265a0d5df214459b603b8e3cfda Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Tue, 08 Jun 2021 17:12:25 +0800
Subject: [PATCH] 1
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
index 3c585e0..6b8aec3 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
@@ -60,21 +60,9 @@
stripe:true
@sort-change="sortChange">
<el-table-column
- prop="writeoffTime"
- label="核销时间"
+ prop="receiveName"
+ label="中奖者"
show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="writeoffUser"
- label="核销员"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- label="兑奖码"
- show-overflow-tooltip>
- <template slot-scope="scope">
- <span v-if="scope.row.state == 3">{{scope.row.writeoffCode}}</span>
- </template>
</el-table-column>
<el-table-column
prop="actName"
@@ -97,6 +85,7 @@
<span v-if="scope.row.state == 1">待兑换</span>
<span v-if="scope.row.state == 2">待发货</span>
<span v-if="scope.row.state == 3">已兑换</span>
+ <span v-if="scope.row.state == 4">已失效</span>
</template>
</el-table-column>
<el-table-column
@@ -108,11 +97,23 @@
</template>
</el-table-column>
<el-table-column
- prop="receiveName"
- label="中奖者"
+ prop="writeoffTime"
+ label="核销时间"
show-overflow-tooltip>
</el-table-column>
<el-table-column
+ prop="writeoffUser"
+ label="核销员"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ label="兑奖码"
+ show-overflow-tooltip>
+ <template slot-scope="scope">
+ <span v-if="scope.row.state == 3">{{scope.row.writeoffCode}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="receiveAddress"
label="收货地址"
show-overflow-tooltip>
--
Gitblit v1.9.1