|
|
@@ -93,9 +93,42 @@
|
|
|
placeholder="请选择收费模式"
|
|
|
clearable
|
|
|
>
|
|
|
- <el-option :label="item.label" :value="item.value" v-for="item in courseViewTypeList" :key="item.value"></el-option>
|
|
|
+ <el-option
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ v-for="item in courseViewTypeList"
|
|
|
+ :key="item.value"
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item prop="createTimer">
|
|
|
+ <el-date-picker
|
|
|
+ v-model.trim="topForm.createTimer"
|
|
|
+ style="width: 420px"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="创建开始日期"
|
|
|
+ end-placeholder="创建结束日期"
|
|
|
+ :picker-options="{
|
|
|
+ firstDayOfWeek: 1,
|
|
|
+ }"
|
|
|
+ ></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="billTimer">
|
|
|
+ <el-date-picker
|
|
|
+ v-model.trim="topForm.billTimer"
|
|
|
+ style="width: 420px"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="成团开始日期"
|
|
|
+ end-placeholder="成团结束日期"
|
|
|
+ :picker-options="{
|
|
|
+ firstDayOfWeek: 1,
|
|
|
+ }"
|
|
|
+ ></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="danger" native-type="submit">搜索</el-button>
|
|
|
</el-form-item>
|
|
|
@@ -154,7 +187,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="status" align="center" label="收费模式">
|
|
|
+ <el-table-column prop="status" align="center" label="收费模式">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
{{ scope.row.courseViewType | courseViewType }}
|
|
|
@@ -399,11 +432,12 @@ import {
|
|
|
resumeMusicGroup,
|
|
|
deleteMusicGroup,
|
|
|
} from "@/api/buildTeam";
|
|
|
-import { musicGroupStatus,courseViewTypeList } from "@/utils/searchArray";
|
|
|
+import { musicGroupStatus, courseViewTypeList } from "@/utils/searchArray";
|
|
|
import { isObject } from "util";
|
|
|
import { permission } from "@/utils/directivePage";
|
|
|
import teamSteam from "./teamListComponent/teamSteam";
|
|
|
import closeStudens from "../teamBuild/modals/close-studens";
|
|
|
+import { getTimes } from "@/utils";
|
|
|
export default {
|
|
|
name: "teamList",
|
|
|
data() {
|
|
|
@@ -417,7 +451,9 @@ export default {
|
|
|
payType: "",
|
|
|
word: "",
|
|
|
orgin: "",
|
|
|
- courseViewType:""
|
|
|
+ courseViewType: "",
|
|
|
+ billTimer: [],
|
|
|
+ createTimer: [],
|
|
|
},
|
|
|
organList: [],
|
|
|
typeList: [], // 收费类型
|
|
|
@@ -491,6 +527,7 @@ export default {
|
|
|
this.getList();
|
|
|
},
|
|
|
getList() {
|
|
|
+ let { createTimer, billTimer, ...reset } = this.topForm;
|
|
|
getTeamList({
|
|
|
rows: this.rules.limit,
|
|
|
page: this.rules.page,
|
|
|
@@ -498,8 +535,14 @@ export default {
|
|
|
chargeTypeId: this.topForm.payType || null,
|
|
|
musicGroupName: this.topForm.teamName || null,
|
|
|
musicGroupStatus: this.topForm.status || null,
|
|
|
- courseViewType:this.topForm.courseViewType||null,
|
|
|
+ courseViewType: this.topForm.courseViewType || null,
|
|
|
searchType: this.$route.query.searchType,
|
|
|
+ ...getTimes(
|
|
|
+ createTimer,
|
|
|
+ ["createStartDate", "createEndDate"],
|
|
|
+ "YYYY-MM-DD"
|
|
|
+ ),
|
|
|
+ ...getTimes(billTimer, ["billStartDate", "billEndDate"], "YYYY-MM-DD"),
|
|
|
}).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
this.tableData = res.data.rows;
|
mo