~jiangyouyao/beauty-erp.git

			@@ -95,6 +95,14 @@
			.el-autocomplete {
			display: block !important;
			}

			.vip-info {
			padding: 30px 20px;
			}

			.vip-info p {
			line-height: 30px;
			}
			</style>

			</head>
			@@ -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>
			@@ -452,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>
			@@ -769,6 +780,7 @@
			_this.serviceOrderTableQueryFn();
			_this.orderTableDataQueryFn();
			_this.skinCheckTableDataQueryFn();
			_this.refreshTable();
			});
			},
			addLabelFn(key) {
			@@ -969,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;
			@@ -1087,7 +1121,7 @@
			}));
			},
			// 划扣
			openHkService(index, row) {
			hkService(index, row) {
			openHkServcie(row.id);
			},
			// 取消