|
|
@@ -11,13 +11,9 @@
|
|
|
<div class="panel_control">
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="7">
|
|
|
- <el-date-picker
|
|
|
- v-model="panel.timeScope"
|
|
|
- type="daterange"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期">
|
|
|
- </el-date-picker>
|
|
|
+ <el-date-picker v-model="panel.timeScope" type="daterange" range-separator="至"
|
|
|
+ start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
+ </el-date-picker>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
<el-button size="" type="primary" @click="query" :disabled="serachBtnStatus" plain>查询
|
|
|
@@ -29,63 +25,29 @@
|
|
|
</div>
|
|
|
|
|
|
<div class="table">
|
|
|
- <el-table
|
|
|
- :data="tableData"
|
|
|
- border
|
|
|
- is-horizontal-resize
|
|
|
- :default-sort="{prop: 'date', order: 'descending'}"
|
|
|
- element-loading-background="rgba(0, 0, 0, 0.8)"
|
|
|
- class=""
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
- >
|
|
|
+ <el-table :data="tableData" border is-horizontal-resize :default-sort="{prop: 'date', order: 'descending'}"
|
|
|
+ element-loading-background="rgba(0, 0, 0, 0.8)" class="" @selection-change="handleSelectionChange">
|
|
|
>
|
|
|
<el-table-column label="序号" type="index" width="50" align="center">
|
|
|
<template scope="scope">
|
|
|
<span>{{(start) + scope.$index + 1}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="BeginTime"
|
|
|
- label="上课时间"
|
|
|
- :formatter="filterFmtDate"
|
|
|
- >
|
|
|
+ <el-table-column prop="BeginTime" label="上课时间" width="160" :formatter="filterFmtDate">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="ClassName"
|
|
|
- label="课程"
|
|
|
- sortable
|
|
|
- >
|
|
|
+ <el-table-column prop="ClassName" label="课程" sortable width="120">
|
|
|
<template slot-scope="scope">
|
|
|
<span class="lessonSpan"
|
|
|
- :style="{background:scope.row.ClassColor}">{{scope.row.ClassName}}</span>
|
|
|
+ :style="{background:scope.row.ClassColor}">{{scope.row.ClassName}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="ConsumeHour"
|
|
|
- label="消耗课时"
|
|
|
- width="110"
|
|
|
- sortable
|
|
|
- >
|
|
|
+ <el-table-column prop="ConsumeHour" label="消耗课时" width="110" sortable>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="OrderNum"
|
|
|
- label="实际预约"
|
|
|
- width="110"
|
|
|
- sortable
|
|
|
- >
|
|
|
+ <el-table-column prop="OrderNum" label="实际预约" width="110" sortable>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="SvName"
|
|
|
- label="区域"
|
|
|
- width="110"
|
|
|
- sortable
|
|
|
- >
|
|
|
+ <el-table-column prop="SvName" label="区域" width="110" sortable>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="ClassType"
|
|
|
- label="课程类型"
|
|
|
- sortable
|
|
|
- >
|
|
|
+ <el-table-column prop="ClassType" label="课程类型" width="110" sortable>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.ClassType == 1">团课</span>
|
|
|
<span v-if="scope.row.ClassType == 3">私教</span>
|
|
|
@@ -93,12 +55,7 @@
|
|
|
<span v-if="scope.row.ClassType == 2 && scope.row.PkNum == 3">三队PK</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="FinishClass"
|
|
|
- label="当前状态"
|
|
|
- width="110"
|
|
|
- sortable
|
|
|
- >
|
|
|
+ <el-table-column prop="FinishClass" label="当前状态" width="110" sortable>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.FinishClass == 0" style="color: red">未上课</span>
|
|
|
<span v-if="scope.row.FinishClass == 1">已下课</span>
|
|
|
@@ -107,41 +64,32 @@
|
|
|
<span v-if="scope.row.FinishClass == 4">已完成</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="Status"
|
|
|
- label="操作"
|
|
|
- width="160"
|
|
|
-
|
|
|
- >
|
|
|
+ <el-table-column prop="Status" label="操作" >
|
|
|
<template slot-scope="scope">
|
|
|
<!--<el-button type="primary" round size="mini" @click="checkClassOverPrepare(scope.row)">-->
|
|
|
<!--下课-->
|
|
|
<!--</el-button>-->
|
|
|
<el-button type="primary" round size="mini" v-if="scope.row.FinishClass == 0"
|
|
|
- @click="showDialogMemberVisible(scope.row)">
|
|
|
+ @click="showDialogMemberVisible(scope.row)">
|
|
|
上课
|
|
|
</el-button>
|
|
|
<!--<el-button type="danger" round size="mini" v-if="scope.row.FinishClass == 0"-->
|
|
|
- <!--@click="closeLesson(scope.row)">-->
|
|
|
- <!--关课-->
|
|
|
+ <!--@click="closeLesson(scope.row)">-->
|
|
|
+ <!--关课-->
|
|
|
<!--</el-button>-->
|
|
|
<el-button type="primary" round size="mini"
|
|
|
- v-if="scope.row.FinishClass == 3 || scope.row.FinishClass == 2"
|
|
|
- @click="seeEdit(scope.row)"
|
|
|
- >
|
|
|
+ v-if="scope.row.FinishClass == 3 || scope.row.FinishClass == 2" @click="seeEdit(scope.row)">
|
|
|
管理
|
|
|
</el-button>
|
|
|
<!--修改区域 todo-->
|
|
|
<el-button type="primary" round plain size="mini" v-if="scope.row.FinishClass == 3"
|
|
|
- @click="changeShopVenue(scope.row)"
|
|
|
- >
|
|
|
+ @click="changeShopVenue(scope.row)">
|
|
|
编辑
|
|
|
</el-button>
|
|
|
<!--已完成才能看详情-->
|
|
|
<el-button type="primary" round plain size="mini"
|
|
|
- v-if="scope.row.FinishClass == 1 || scope.row.FinishClass == 4"
|
|
|
- @click="seeDetail(scope.row)"
|
|
|
- >
|
|
|
+ v-if="scope.row.FinishClass == 1 || scope.row.FinishClass == 4"
|
|
|
+ @click="seeDetail(scope.row)">
|
|
|
详情
|
|
|
</el-button>
|
|
|
|
|
|
@@ -149,13 +97,8 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<br>
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- :total="pageination.total"
|
|
|
- :page-size="pageination.pageItem"
|
|
|
- @current-change="pageChange"
|
|
|
- :current-page.sync="cur_page"
|
|
|
- ></el-pagination>
|
|
|
+ <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
|
|
|
+ @current-change="pageChange" :current-page.sync="cur_page"></el-pagination>
|
|
|
</div>
|
|
|
<el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" width="650px">
|
|
|
<div class="dialogContent">
|
|
|
@@ -164,44 +107,32 @@
|
|
|
<el-form ref="form" :model="form" label-width="160px">
|
|
|
<el-form-item label="区域" :required="true">
|
|
|
<el-select v-model="form.svId" filterable placeholder="请选择" @change="changeLocationValue">
|
|
|
- <el-option
|
|
|
- v-for="item in form.svList"
|
|
|
- :key="item.SvId"
|
|
|
- :label="item.Name"
|
|
|
- :value="item.SvId">
|
|
|
+ <el-option v-for="item in form.svList" :key="item.SvId" :label="item.Name"
|
|
|
+ :value="item.SvId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="类型" :required="true">
|
|
|
<el-select v-model="form.classType" filterable placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in form.ClassTypeOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
+ <el-option v-for="item in form.ClassTypeOptions" :key="item.value" :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="组队方式" v-if="form.classType == 2">
|
|
|
<el-select v-model="form.pkNum" filterable placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in form.PKTypeOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
+ <el-option v-for="item in form.PKTypeOptions" :key="item.value" :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<!--选教练，非必选-->
|
|
|
<el-form-item label="上课教练">
|
|
|
<!--<el-transfer filterable v-model="dialogCoachValue" :data="form.dialogCoachdata"-->
|
|
|
- <!--:titles="['教练列表', '已添加教练']"></el-transfer>-->
|
|
|
- <el-select v-model="dialogCoachValue" filterable placeholder="请选择" >
|
|
|
- <el-option
|
|
|
- v-for="item in form.dialogCoachdata"
|
|
|
- :key="item.key"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
+ <!--:titles="['教练列表', '已添加教练']"></el-transfer>-->
|
|
|
+ <el-select v-model="dialogCoachValue" filterable placeholder="请选择">
|
|
|
+ <el-option v-for="item in form.dialogCoachdata" :key="item.key" :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -209,7 +140,8 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="dialogFooter">
|
|
|
- <el-button type="primary" size="small" v-if="form.btnType == 0" :disabled="PrepareBtnStatus" @click="getClassStartPrepare()">确定
|
|
|
+ <el-button type="primary" size="small" v-if="form.btnType == 0" :disabled="PrepareBtnStatus"
|
|
|
+ @click="getClassStartPrepare()">确定
|
|
|
</el-button>
|
|
|
<el-button type="primary" size="small" v-if="form.btnType == 1" @click="getClassStartPrepareForEdit()">
|
|
|
确定
|
|
|
@@ -252,6 +184,7 @@
|
|
|
dialogValue: [],
|
|
|
start: 0,
|
|
|
draw: 1,
|
|
|
+ cur_page: 1,
|
|
|
// panel 配置项目
|
|
|
panel: {
|
|
|
usercode: '',
|
|
|
@@ -273,16 +206,16 @@
|
|
|
multipleSelection: [],
|
|
|
detectedmac: '',
|
|
|
options: [
|
|
|
- {value: 99, label: '全部'},
|
|
|
- {value: 1, label: '进行中'},
|
|
|
- {value: 2, label: '已完成'},
|
|
|
+ { value: 99, label: '全部' },
|
|
|
+ { value: 1, label: '进行中' },
|
|
|
+ { value: 2, label: '已完成' },
|
|
|
],
|
|
|
|
|
|
endTypeOptions: [
|
|
|
- {value: 99, label: '全部'},
|
|
|
- {value: 30, label: '近一个月'},
|
|
|
- {value: 7, label: '近一周'},
|
|
|
- {value: 1, label: '当日'},
|
|
|
+ { value: 99, label: '全部' },
|
|
|
+ { value: 30, label: '近一个月' },
|
|
|
+ { value: 7, label: '近一周' },
|
|
|
+ { value: 1, label: '当日' },
|
|
|
],
|
|
|
time1: globalBt(),
|
|
|
timeScope: globalBt2(0),
|
|
|
@@ -317,18 +250,18 @@
|
|
|
dialogValue: [],//穿梭已选
|
|
|
dialogCoachdata: [],//穿梭已选
|
|
|
ClassTypeOptions: [
|
|
|
- {value: 1, label: '团课'},
|
|
|
- {value: 2, label: '竞技PK'},
|
|
|
- {value: 3, label: '私教'},
|
|
|
+ { value: 1, label: '团课' },
|
|
|
+ { value: 2, label: '竞技PK' },
|
|
|
+ { value: 3, label: '私教' },
|
|
|
],
|
|
|
PKTypeOptions: [
|
|
|
- {value: 2, label: '2队PK'},
|
|
|
- {value: 3, label: '3队PK'},
|
|
|
+ { value: 2, label: '2队PK' },
|
|
|
+ { value: 3, label: '3队PK' },
|
|
|
],
|
|
|
},
|
|
|
memberTypes: [
|
|
|
- {value: 1, label: '年会员'},
|
|
|
- {value: 2, label: '充值会员'},
|
|
|
+ { value: 1, label: '年会员' },
|
|
|
+ { value: 2, label: '充值会员' },
|
|
|
],
|
|
|
tableData: []
|
|
|
}
|
|
|
@@ -338,7 +271,7 @@
|
|
|
},
|
|
|
methods: {
|
|
|
goType(url) {
|
|
|
- this.$router.push({path: '/' + url});
|
|
|
+ this.$router.push({ path: '/' + url });
|
|
|
},
|
|
|
// 更改上课区域
|
|
|
changeShopVenue(row) {
|
|
|
@@ -461,7 +394,7 @@
|
|
|
});
|
|
|
},
|
|
|
// 关课
|
|
|
- closeLesson(row){
|
|
|
+ closeLesson(row) {
|
|
|
that.$message.error('功能未上线，请耐心等候');
|
|
|
return false;
|
|
|
let that = this;
|
|
|
@@ -732,8 +665,6 @@
|
|
|
@import "../assets/css/panel.css";
|
|
|
|
|
|
.context {
|
|
|
- /* height: 770px; */
|
|
|
- overflow-y: scroll;
|
|
|
display: block;
|
|
|
margin: 0 auto;
|
|
|
background-color: #fff !important;
|
|
|
@@ -890,21 +821,35 @@
|
|
|
.likeTab button.pull-right {
|
|
|
float: right;
|
|
|
}
|
|
|
+
|
|
|
.el-dialog__body .el-date-editor.el-input__inner {
|
|
|
width: 156px;
|
|
|
}
|
|
|
- .el-transfer-panel__item.el-checkbox .el-checkbox__label{
|
|
|
+
|
|
|
+ .el-transfer-panel__item.el-checkbox .el-checkbox__label {
|
|
|
width: 156px;
|
|
|
}
|
|
|
+
|
|
|
/deep/ .el-dialog__body .el-transfer-panel__item .el-checkbox__input {
|
|
|
left: 10px;
|
|
|
}
|
|
|
- /deep/ .el-dialog__body .el-form-item__content .el-select {
|
|
|
+
|
|
|
+ /deep/ .el-dialog__body .el-form-item__content .el-select {
|
|
|
float: left;
|
|
|
margin-left: 50px;
|
|
|
}
|
|
|
- /deep/ .el-dialog__body .el-transfer {
|
|
|
+
|
|
|
+ /deep/ .el-dialog__body .el-transfer {
|
|
|
float: left;
|
|
|
margin-left: 50px;
|
|
|
}
|
|
|
-</style>
|
|
|
+
|
|
|
+ @media (min-width: 320px) and (max-width: 1367px) {
|
|
|
+ .panel /deep/ .el-date-editor--daterange {
|
|
|
+ max-width: 240px;
|
|
|
+ }
|
|
|
+ .panel /deep/ .el-date-editor .el-range-separator {
|
|
|
+ line-height: 35px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+</style>
|
