From b1158d0bb5b453f0b8e5df143de92ee08d1e9048 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 27 Oct 2021 16:12:23 +0800
Subject: [PATCH] 修改赠送金额购买项目没打折的情况

---
 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html |   32 ++++++++++++++++----------------
 1 files changed, 16 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 d368dd8..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"
@@ -109,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