From d13ae240c54c59b04c0571bfc0136ed0c8ba32a3 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 14 Jul 2021 14:16:06 +0800
Subject: [PATCH] 修复bug

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
index 15d5daa..7aa8771 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
@@ -127,6 +127,7 @@
                 <el-button type="primary" plain @click="recharge">充值</el-button>
                 <el-button type="warning" plain @click="addOrder">开单</el-button>
                 <el-button type="success" plain @click="addServiceOrder">开服务单</el-button>
+                <el-button type="info" plain @click="exportExcel">导出项目</el-button>
             </el-col>
         </el-header>
         <el-container>
@@ -195,7 +196,7 @@
                             </el-col>
                             <el-col :span="10">
                                 <p>会员卡类型 : {{vipInfo.vipType}}</p>
-                                <p>会员等级 : {{vipInfo.levelName}}</p>
+                                <p>会员等级 : {{vipInfo.vipLevel == null ? "" : vipInfo.vipLevel.levelName}}</p>
                                 <p>生肖/星座 : {{vipInfo.constell}}</p>
                                 <p>地址 : {{vipInfo.addr}}</p>
                                 <p>健康顾问 : {{vipInfo.staffName}}</p>
@@ -274,6 +275,11 @@
                                     <template slot-scope="scope">
                                         <span >{{scope.row.projName}}({{scope.row.projInfo.code}})</span>
                                     </template>
+                                </el-table-column>
+                                <el-table-column
+                                        prop="source"
+                                        label="来源"
+                                        width="180">
                                 </el-table-column>
                                 <el-table-column
                                         prop="status"
@@ -1535,7 +1541,15 @@
                     return;
                 }
                 vipId = this.vipInfo.id;
-                openAddService();
+                openAddService(vipId);
+            },
+            exportExcel(){
+                if (!this.vipInfo.id) {
+                    this.$message.error('请选择用户');
+                    return;
+                }
+                vipId = this.vipInfo.id;
+                window.location.href=basePath+"/admin/vipInfo/exportExcel/"+vipId;
             },
             // 开订单
             addOrder() {

--
Gitblit v1.9.1