~jiangyouyao/beauty-erp.git

			@@ -226,9 +226,11 @@
			<el-table id="proj" v-show="projTab.projType=='proj'" :data="projTab.projTableData"
			style="width: 100%">
			<el-table-column
			prop="projName"
			label="项目名称"
			width="180">
			<template slot-scope="scope">
			<span >{{scope.row.projName}}({{scope.row.projInfo.code}})</span>
			</template>
			</el-table-column>
			<el-table-column
			prop="source"
			@@ -257,6 +259,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>
			@@ -266,9 +269,11 @@
			style="width: 100%;"
			row-key="id" :tree-props="{children: 'taocanProjUse', hasChildren: 'hasChildren'}">
			<el-table-column
			prop="projName"
			label="名称"
			width="240">
			width="280">
			<template slot-scope="scope">
			<span >{{scope.row.projName}}({{scope.row.projInfo.code}})</span>
			</template>
			</el-table-column>
			<el-table-column
			prop="status"
			@@ -293,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" 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>
			@@ -333,10 +339,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>
			@@ -350,10 +352,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>
			@@ -717,6 +720,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: {