From 4f1a0c89b40a99e7e3b6ec72b42a1b9d6bac971a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 15:36:19 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 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 ab0f2fc..2be1c8b 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
@@ -149,7 +149,7 @@
<el-row style="padding: 10px 20px;">
<p>余额：<span v-if="vipInfo.balance != null">{{vipInfo.balance}}元</span></p>
<p>积分：<span v-if="vipInfo.pointAll != null">{{vipInfo.pointAll}}</span></p>
- <p>累计消费金额：<span v-if="vipInfo.totalMoney != null">{{vipInfo.totalMoney}} 元</span></p>
+ <p>累计消费金额：<span v-if="vipInfo.totalMoney != null">{{vipInfo.totalMoney.toFixed(2)}} 元</span></p>
<p>累计消费次数：<span v-if="vipInfo.totalTimes != null">{{vipInfo.totalTimes}} 次</span></p>
<p>上次消费时间：<span v-if="vipInfo.payTime">{{vipInfo.payTime}}</span></p>
</el-row>
@@ -159,7 +159,6 @@
size="small"
:key="tag.label"
v-for="tag in tags.tags"
- closable
:disable-transitions="false"
@close="handleClose(tag)">
{{tag.label}}
@@ -173,15 +172,12 @@
@keyup.enter.native="handleInputConfirm"
@blur="handleInputConfirm"
></el-input>
- <el-button v-else class="button-new-tag" size="mini" @click="showInput">+</el-button>
+<!-- <el-button v-else class="button-new-tag" size="mini" @click="showInput">+</el-button>-->
</el-row>
<el-row style="padding: 10px 0;">
<h4>消费门店</h4>
<el-row style="text-align: center">
- <el-col :span="10" v-for="item in vipInfo.shopNames">
- <el-avatar size="small" :src="circleUrl"></el-avatar>
- <span class="col-style">{{item}}</span>
- </el-col>
+ <el-tag v-for="item in vipInfo.shopNames" >{{item}}</el-tag>
</el-row>
</el-row>
</el-row>
@@ -261,6 +257,7 @@
<el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
<el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
<el-button matrix:btn="vipInfo-cardEdit" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
+ <el-button type="text" @click="openOrder(scope.$index, scope.row)" size="small">订单</el-button>
<el-button type="text" size="small" @click="openProjUseFlow(scope.$index, scope.row)">操作记录</el-button>
</template>
</el-table-column>
@@ -297,6 +294,7 @@
<el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效' && scope.row.taocanId == null" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
<el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结' && scope.row.taocanId == null" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
<el-button matrix:btn="vipInfo-cardEdit" v-if="scope.row.taocanId == null" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
+ <el-button type="text" v-if="scope.row.orderId != null" @click="openOrder(scope.$index, scope.row)" size="small">订单</el-button>
<el-button type="text" size="small" @click="openProjUseFlow(scope.$index, scope.row)">操作记录</el-button>
</template>
</el-table-column>
@@ -337,10 +335,6 @@
label="状态">
</el-table-column>
<el-table-column
- prop="isVipCar"
- label="是否是会籍卡" :formatter="cardIsVipFormatter">
- </el-table-column>
- <el-table-column
prop="isOver"
label="是否使用完成" :formatter="cardIsOrderFormatter">
</el-table-column>
@@ -354,10 +348,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
- <el-button matrix:btn="vipInfo-youxiao" v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
- <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
- <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
+ <el-button matrix:btn="vipInfo-youxiao" v-if="scope.row.status!='有效' && scope.row.isVipCar =='N' " type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
+ <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效' && scope.row.isVipCar =='N' " type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
+ <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结' && scope.row.isVipCar =='N' " type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
<el-button matrix:btn="vipInfo-cardEdit" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
+ <el-button type="text" v-if="scope.row.isVipCar =='N'" @click="openOrder(scope.$index, scope.row)" size="small">订单</el-button>
<el-button type="text" size="small" @click="openMoneyCardUseFlow(scope.$index, scope.row)">操作记录</el-button>
</template>
</el-table-column>
@@ -647,7 +642,7 @@
var app = new Vue({
el: '#app',
data : {
- circleUrl : "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+ circleUrl : "",
activeName : 'vipInfo',
tags : {
tags : [],
@@ -721,6 +716,15 @@
}
},
methods : {
+ //打开订单详情页面
+ openOrder(index,row){
+ layer.full(layer.open({
+ type : 2,
+ title : "订单详情",
+ maxmin : true,
+ content : [ basePath + '/admin/order/orderItem?id=' + row.orderId ]
+ }));
+ },
querySearch(queryString, cb) {
$.AjaxProxy({
p: {
@@ -762,7 +766,7 @@
let data = loj[0].result.rows[0];
_this.vipInfo = {};
_this.vipInfo = data;
-
+ _this.circleUrl= _this.vipInfo.photo;
if (data.sysOrder != null) {
_this.vipInfo.totalMoney = data.sysOrder.zkTotal;
_this.vipInfo.totalTimes = data.sysOrder.times;
@@ -773,7 +777,7 @@
_this.vipInfo.shopNames = shopNames;
}
}
-
+ _this.vipInfo.payTime = moment(_this.vipInfo.payTime).format("YYYY-MM-DD HH:mm:ss")
_this.tags.tags = data.labels;
_this.projTableQueryFn();
_this.serviceOrderTableQueryFn();
@@ -1075,8 +1079,8 @@
params.state = serviceOrderTab.state;
params.vipId = _this.vipInfo.id;
if (serviceOrderTab.selectTime) {
- params.beginTime = moment(serviceOrderTab.selectTime[0]).format("YYYY-MM-DD HH:mm");
- params.closureTime = moment(serviceOrderTab.selectTime[1]).format("YYYY-MM-DD HH:mm");
+ params.beginTime = serviceOrderTab.selectTime?moment(serviceOrderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"):'';
+ params.closureTime = serviceOrderTab.selectTime?moment(serviceOrderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"):'';
}
$.AjaxProxy({
p:params
@@ -1158,8 +1162,8 @@
params.statu = orderTab.state;
params.vipId = _this.vipInfo.id;
if (orderTab.selectTime) {
- params.beginTimeVo = moment(orderTab.selectTime[0]).format("YYYY-MM-DD HH:mm");
- params.endTimeVo = moment(orderTab.selectTime[1]).format("YYYY-MM-DD HH:mm");
+ params.beginTimeVo = orderTab.selectTime?moment(orderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"):'';
+ params.endTimeVo = orderTab.selectTime?moment(orderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"):'';
}
$.AjaxProxy({
p:params
@@ -1233,8 +1237,8 @@
params.offset = (page.currentPage - 1) * page.pageSize;
params.userId = _this.vipInfo.id;
if (skinTab.selectTime) {
- params.beginTime = moment(skinTab.selectTime[0]).format("YYYY-MM-DD");
- params.endTime = moment(skinTab.selectTime[1]).format("YYYY-MM-DD");
+ params.beginTime = skinTab.selectTime?moment(skinTab.selectTime[0]).format("YYYY-MM-DD"):'';
+ params.endTime = skinTab.selectTime?moment(skinTab.selectTime[1]).format("YYYY-MM-DD"):'';
}
$.AjaxProxy({
p:params
@@ -1372,10 +1376,10 @@
/********** 顶部按钮 start **********/
dateFormat(row, column) {
- return moment(column.yyTime).format("YYYY-MM-DD HH:mm");
+ return moment(row.yyTime).format("YYYY-MM-DD HH:mm");
},
oderTimeFormat(row, column) {
- return moment(column.orderTime).format("YYYY-MM-DD HH:mm:ss");
+ return moment(row.orderTime).format("YYYY-MM-DD HH:mm:ss");
},
}
});
--
Gitblit v1.9.1