From cc74efb36fd1f1de56b3acb2ba59d4b416eaed4f Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 19 Jan 2021 00:23:21 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 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 79a7972..94115eb 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
@@ -95,6 +95,14 @@
.el-autocomplete {
display: block !important;
}
+
+ .vip-info {
+ padding: 30px 20px;
+ }
+
+ .vip-info p {
+ line-height: 30px;
+ }
</style>
</head>
@@ -115,7 +123,7 @@
<el-button type="primary" @click="searchVipInfo">查询</el-button>
</el-col>
</el-col>
- <el-col :span="6" style="float: right; margin-right: 20px;">
+ <el-col :span="8" style="float: right; margin-right: 20px;">
<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>
@@ -182,7 +190,7 @@
<el-main style="background-color: white; margin-right: 15px; padding: 20px 30px;">
<el-tabs v-model="activeName" type="card" @tab-click="tabHandleClick">
<el-tab-pane label="会员信息" name="vipInfo">
- <el-row>
+ <el-row class="vip-info">
<el-col :span="10">
<p>生日 : {{vipInfo.birthday1}}</p>
<p>会员状态 : {{vipInfo.vipState}}</p>
@@ -254,6 +262,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" size="small" @click="openProjUseFlow(scope.$index, scope.row)">操作记录</el-button>
</template>
</el-table-column>
</el-table>
@@ -289,6 +298,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" size="small" @click="openProjUseFlow(scope.$index, scope.row)">操作记录</el-button>
</template>
</el-table-column>
</el-table>
@@ -349,6 +359,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" size="small" @click="openMoneyCardUseFlow(scope.$index, scope.row)">操作记录</el-button>
</template>
</el-table-column>
</el-table>
@@ -384,7 +395,6 @@
<el-tab-pane label="服务单" name="serviceOrder">
<el-row style="line-height: 40px;">
<el-col :span="11">
- <span>选择时间:</span>
<el-date-picker v-model="serviceOrderTab.selectTime"
type="datetimerange"
range-separator="至" format="yyyy-MM-dd HH:mm"
@@ -453,7 +463,7 @@
<el-button matrix:btn="serviceClub-paidan" type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="giveServiceOrder(scope.$index, scope.row)">派单</el-button>
<el-button matrix:btn="serviceClub-edit" type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="modifyServiceOrder(scope.$index, scope.row)">修改</el-button>
<el-button matrix:btn="serviceClub-peiliao" type="text" size="small" v-if="scope.row.state=='需配料'" @click="peiliao(scope.$index, scope.row)">配料</el-button>
- <el-button matrix:btn="serviceClub-huakou" type="text" size="small" v-if="scope.row.state=='服务完成'" @click="openHKService(scope.$index, scope.row)">划扣</el-button>
+ <el-button matrix:btn="serviceClub-huakou" type="text" size="small" v-if="scope.row.state=='服务完成'" @click="hkService(scope.$index, scope.row)">划扣</el-button>
<el-button matrix:btn="serviceClub-edit" type="text" size="small" @click="modifyTime(scope.$index, scope.row)">修改时间</el-button>
<el-button matrix:btn="serviceClub-del" type="text" size="small" v-if="scope.row.state!='预约取消'" @click="cancelServiceOrder(scope.$index, scope.row)">取消</el-button>
</template>
@@ -476,7 +486,6 @@
<el-tab-pane label="订单" name="order">
<el-row style="line-height: 40px;">
<el-col :span="11">
- <span>选择时间:</span>
<el-date-picker v-model="orderTab.selectTime"
type="datetimerange"
range-separator="至"
@@ -572,7 +581,6 @@
<el-tab-pane label="皮肤检测" name="skinCheck">
<el-row style="line-height: 40px;">
<el-col :span="11">
- <span>选择时间:</span>
<el-date-picker v-model="skinTab.selectTime"
type="daterange"
range-separator="至"
@@ -737,6 +745,9 @@
// 请求会员信息
vipInfoFn(key) {
let _this = this;
+ if (!key) {
+ key = _this.vipInfo.phone;
+ }
// 请求用户信息
$.AjaxProxy({
p: {
@@ -766,6 +777,10 @@
_this.tags.tags = data.labels;
_this.projTableQueryFn();
+ _this.serviceOrderTableQueryFn();
+ _this.orderTableDataQueryFn();
+ _this.skinCheckTableDataQueryFn();
+ _this.refreshTable();
});
},
addLabelFn(key) {
@@ -966,6 +981,28 @@
content : [ basePath + url + row.id ]
});
},
+
+
+ openProjUseFlow(index, row) {
+ layer.open({
+ type : 2,
+ title : "操作记录",
+ area : MUI.SIZE_M,
+ maxmin : true,
+ content : [ basePath + "/admin/redirect/hive/beautySalon/projUseFlow-list?projUseId=" + row.id ]
+ });
+ },
+
+ openMoneyCardUseFlow(index, row) {
+ layer.open({
+ type : 2,
+ title : "充值卡变更记录",
+ area : MUI.SIZE_M,
+ maxmin : true,
+ content : [ basePath + "/admin/redirect/hive/vip/moneyCardUseFlow-list?vipId=" + row.vipId ]
+ });
+ },
+
tabProjInvalid(index, row) {
let _this = this;
let projType = _this.projTab.projType;
@@ -1084,7 +1121,7 @@
}));
},
// 划扣
- openHkService(index, row) {
+ hkService(index, row) {
openHkServcie(row.id);
},
// 取消
--
Gitblit v1.9.1