Commit 32aa7b16 authored by 黄奎's avatar 黄奎

页面修改

parent 2b3d2c85
......@@ -263,6 +263,12 @@
label: '校区',
field: 'SchoolName',
align: 'left',
},
{
name: "CourseSubjectName",
label: "所属科目",
field: 'CourseSubjectName',
align: "left",
},
{
name: 'CourseName',
......
......@@ -53,6 +53,10 @@
<span>选择课程</span>
</div>
<div class="row">
<div class="col">
<q-select @input="getCourses" standout v-model="msg.CourseSubject" :options="CourseSubjectList"
option-label="Name" option-value="Id" emit-value map-options label="所属科目" clearable />
</div>
<div class="col">
<q-select dense standout behavior="menu" filled v-model="chosenCourse" :options="courseOptions"
@filter="filterCourseFn" input-debounce="0" use-input option-label="CourseName" option-value="CourseId"
......@@ -123,9 +127,9 @@
<script>
import {
queryCourseDropdownList,
queryCourseCategoryTree,
saveCourseOffer,
queryCourseOfferInfo
queryCourseOfferInfo,
getCourseSubject
} from "../../api/course/index";
import {
date
......@@ -200,30 +204,40 @@
field: row => row.ActualPrice.toFixed(2)
}
],
TreeCategoryList: [], //课程系列列表
pageInfo: {
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12
},
msg: {
CourseSubject: "", //所属科目
},
courseList: [], //课程列表
courseOptions: [],
chosenCategory: null, //选中的系列
chosenCourse: null, //选中的课程
categoryOptions: [],
chosenCourses: []
chosenCourses: [],
CourseSubjectList: [], //科目列表
};
},
computed: {
},
created() {
this.getCategorytree();
this.queryCourseSubject()
},
mounted() {
this.initObj();
},
methods: {
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
this.CourseSubjectList = res.Data;
}
})
},
//初始化对象
initObj() {
if (this.obj && this.obj.Id > 0) {
......@@ -322,37 +336,20 @@
});
}
},
//获取课程系列
getCategorytree() {
this.TreeCategoryList = [];
var qMsg = {};
queryCourseCategoryTree(qMsg).then(res => {
this.TreeCategoryList = res.Data;
this.categoryOptions = this.TreeCategoryList;
this.getCourses();
});
},
//获取课程列表
getCourses() {
this.courseList = [];
var qMsg = {
CourseName: "",
CateId: 0,
IsQPrice: 1
IsQPrice: 1,
CourseSubject: this.msg.CourseSubject,
};
queryCourseDropdownList(qMsg).then(res => {
this.courseList = res.Data;
this.courseOptions = this.courseList;
});
},
//系列筛选
filterFn(val, update, abort) {
update(() => {
this.categoryOptions = this.TreeCategoryList.filter(
v => v.CateName.indexOf(val) > -1
);
});
},
//课程筛选
filterCourseFn(val, update, abort) {
update(() => {
......@@ -361,13 +358,6 @@
);
});
},
//系列改变
changeCategory() {
this.courseOptions = this.courseList.filter(
v => v.CateId == this.chosenCategory
);
this.$forceUpdate();
},
//添加课程
addCourse() {
this.$refs.JoinNum.validate();
......@@ -532,5 +522,5 @@
};
</script>
<style></style>
<style>
</style>
......@@ -42,6 +42,11 @@
<q-select @input="getClassList" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="msg.ClassStatus" :options="classStatusList" emit-value map-options label="班级状态" />
</div>
<div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="Name" option-value="Id" emit-value map-options label="所属科目"
clearable />
</div>
<div class="col-3">
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.TeacherName"
label="带班老师" @clear="getClassList" maxlength="20" />
......@@ -68,6 +73,9 @@
queryClassPage,
queryClassStatusList,
} from '../../api/course/class';
import {
getCourseSubject
} from "../../api/course/index";
//获取校区列表
import {
getSchoolDropdown,
......@@ -82,78 +90,6 @@
},
data() {
return {
columns: [{
name: 'ClassName',
label: '班级名称',
field: 'ClassName',
align: 'left'
},
{
name: 'SchoolName',
label: '校区',
field: 'SchoolName',
align: 'left',
},
{
name: 'CourseName',
label: '课程',
field: 'CourseName',
align: 'left'
},
{
name: 'OtherCourseName',
label: '关联其他课程',
field: 'OtherCourseName',
align: 'left'
},
{
name: 'CourseId',
label: '课程大纲',
field: 'CourseId',
align: 'left'
},
{
name: 'TeacherName',
label: '带班老师',
field: 'TeacherName',
align: 'left'
},
{
name: 'ClassPersion',
label: '招生/报名',
field: 'ClassPersion',
align: 'left'
},
{
name: 'OpenTime',
label: '开班时间',
field: 'OpenTime',
align: 'left'
},
{
name: 'FinishTimeStr',
label: '预计结束时间',
field: 'FinishTimeStr',
align: 'left'
},
{
name: 'CompleteProgress',
label: '课程进度',
field: 'CompleteProgress',
align: 'left'
},
{
name: 'ClassStatusStr',
label: '状态',
align: 'left',
field: 'ClassStatusStr'
},
{
name: 'optioned',
label: '操作',
field: 'CourseId'
}
],
data: [],
loading: false,
msg: {
......@@ -166,6 +102,7 @@
CourseName: '', //学习课程
School_Id: -1, //关联校区
ClassNo: '', //班号
CourseSubject: "", //所属科目
},
//班级状态
classStatusList: [],
......@@ -184,8 +121,8 @@
isShowStudentMenu: true, //显示未完成学员名单
isShowApply: true //显示调课申请
},
loading:false
loading: false,
CourseSubjectList: [], //所属科目
}
},
created() {
......@@ -194,11 +131,19 @@
}
this.getClassStatus();
this.getSchool();
this.queryCourseSubject()
},
mounted() {
this.getClassList();
},
methods: {
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
this.CourseSubjectList = res.Data;
}
})
},
//获取校区列表
getSchool() {
getSchoolDropdown({}).then(res => {
......@@ -231,7 +176,7 @@
//获取菜单分页列表
getClassList() {
this.loading = true;
this.data=[];
this.data = [];
queryClassPage(this.msg).then(res => {
this.loading = false;
this.data = res.Data.PageData;
......
......@@ -3,88 +3,43 @@
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-input
@input="resetSearch"
clearable
standout="bg-primary text-white"
v-model="msg.CourseName"
label="课程名称"
@clear="resetSearch"
maxlength="20"
/>
<q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.CourseName" label="课程名称"
@clear="resetSearch" maxlength="20" />
</div>
<div class="col-3">
<select-tree
:treeData="TreeCategoryList"
:defaultArray="returnString"
nodeKey="CateId"
:multiple="true"
labelKey="CateName"
childrenKey="ChildList"
tipText="课程系列"
@getChild="getChild"
></select-tree>
<select-tree :treeData="TreeCategoryList" :defaultArray="returnString" nodeKey="CateId" :multiple="true"
labelKey="CateName" childrenKey="ChildList" tipText="课程系列" @getChild="getChild"></select-tree>
</div>
<div class="col-3">
<q-select
@input="resetSearch"
standout="bg-primary text-white"
v-model="msg.Status"
:options="ShowOpts"
emit-value
map-options
label="状态"
/>
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="Name" option-value="Id" emit-value map-options label="所属科目"
clearable />
</div>
<div class="col-3">
<q-select
@input="resetSearch"
standout="bg-primary text-white"
v-model="msg.Saleplat"
:options="platOpts"
option-label="Name"
option-value="Id"
emit-value
map-options
label="上架渠道"
/>
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.Status" :options="ShowOpts"
emit-value map-options label="状态" />
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.Saleplat" :options="platOpts"
option-label="Name" option-value="Id" emit-value map-options label="上架渠道" />
</div>
</div>
</div>
<div class="page-content">
<q-table
:pagination="msg"
:loading="loading"
no-data-label="暂无相关数据"
flat
class="sticky-tow-column-table sticky-right-column-table"
separator="none"
:data="data"
:columns="columns"
row-key="name"
>
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class="sticky-tow-column-table sticky-right-column-table" separator="none" :data="data" :columns="columns"
row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">课程信息</div>
<q-space />
<div class="page-option">
<q-btn
color="accent"
size="sm"
class="q-mr-md"
icon="add"
label="新增课程"
@click="EditCourse(null, 1)"
/>
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增课程" @click="EditCourse(null, 1)" />
</div>
</template>
<template v-slot:body-cell-CoverImg="props">
<q-td :props="props">
<q-img
:src="props.value"
spinner-color="white"
style="height: 54px; max-width: 100px"
class="rounded-borders"
>
<q-img :src="props.value" spinner-color="white" style="height: 54px; max-width: 100px"
class="rounded-borders">
</q-img>
</q-td>
</template>
......@@ -120,12 +75,8 @@
<template v-slot:body-cell-PreferentialListSellCommission="props">
<q-td :props="props" style="padding-right: 0px; padding-left: 0px">
<div v-for="x in props.value">
<div
class="border-bottom"
style="padding-left: 16px; padding-right: 16px"
:class="{ 'text-red': x.SaleCommissionType == 1 }"
v-if="x.PriceDiscountType != 0"
>
<div class="border-bottom" style="padding-left: 16px; padding-right: 16px"
:class="{ 'text-red': x.SaleCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
{{ x.SaleCommissionType == 1 ? "¥" : ""
}}{{ x.SaleCommissionMoney
}}{{ x.SaleCommissionType == 0 ? "%" : "" }}
......@@ -142,12 +93,8 @@
<template v-slot:body-cell-PreferentialListB2BCommission="props">
<q-td :props="props" style="padding-left: 0px">
<div v-for="x in props.value">
<div
class="border-bottom"
style="padding-left: 16px"
:class="{ 'text-red': x.B2BCommissionType == 1 }"
v-if="x.PriceDiscountType != 0"
>
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.B2BCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.B2BCommissionType == 1 ? "¥" : ""
}}{{ x.B2BCommissionMoney
}}{{ x.B2BCommissionType == 0 ? "%" : "" }}
......@@ -164,12 +111,8 @@
<template v-slot:body-cell-EducationCommission="props">
<q-td :props="props" style="padding-left: 0px">
<div v-for="x in props.value">
<div
class="border-bottom"
style="padding-left: 16px"
:class="{ 'text-red': x.EduCommissionType == 1 }"
v-if="x.PriceDiscountType != 0"
>
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.EduCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.EduCommissionType == 1 ? "¥" : ""
}}{{ x.EduCommissionMoney
}}{{ x.EduCommissionType == 0 ? "%" : "" }}
......@@ -185,76 +128,32 @@
</template>
<template v-slot:body-cell-plat="props">
<q-td :props="props">
<q-badge
color="green"
label="小程序"
v-if="props.row.Saleplat.includes(4)"
/>
<q-badge color="green" label="小程序" v-if="props.row.Saleplat.includes(4)" />
</q-td>
</template>
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-badge
:color="props.value == 1 ? 'negative' : 'primary'"
:label="props.value == 0 ? '正常' : '删除'"
/>
<q-badge :color="props.value == 1 ? 'negative' : 'primary'" :label="props.value == 0 ? '正常' : '删除'" />
</q-td>
</template>
<template v-slot:bottom>
<q-pagination
class="full-width justify-end"
v-model="msg.pageIndex"
color="primary"
:max="pageCount"
:input="true"
@input="changePage"
/>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn
flat
size="xs"
icon="edit"
color="accent"
style="font-weight: 400"
label="编辑"
@click="EditCourse(props.row, 1)"
/>
<q-btn
flat
size="xs"
icon="edit"
color="accent"
style="font-weight: 400"
label="价格设置"
@click="EditCourse(props.row, 2)"
v-if="isHavePriceAction"
/>
<q-btn-dropdown
flat
size="xs"
color="dark"
label="更多"
style="margin-left: 10px"
>
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight: 400" label="编辑"
@click="EditCourse(props.row, 1)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight: 400" label="价格设置"
@click="EditCourse(props.row, 2)" v-if="isHavePriceAction" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px">
<q-list>
<q-item
clickable
v-close-popup
@click="DeleteCourse(props.row, 1)"
v-if="props.row.Status == 0"
>
<q-item clickable v-close-popup @click="DeleteCourse(props.row, 1)" v-if="props.row.Status == 0">
<q-item-section>
<q-item-label>删除</q-item-label>
</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="DeleteCourse(props.row, 0)"
v-if="props.row.Status == 1"
>
<q-item clickable v-close-popup @click="DeleteCourse(props.row, 0)" v-if="props.row.Status == 1">
<q-item-section>
<q-item-label>恢复</q-item-label>
</q-item-section>
......@@ -269,36 +168,33 @@
</q-td>
</template>
</q-table>
<course-form
v-if="isShowCourseForm"
:save-obj="courseObjOption"
@close="closeMenuSaveForm"
@success="refreshPage"
>
<course-form v-if="isShowCourseForm" :save-obj="courseObjOption" @close="closeMenuSaveForm"
@success="refreshPage">
</course-form>
<courseprice-form
v-if="isShowCoursePriceForm"
:save-obj="courseObjOption"
@close="closeMenuSaveForm"
@success="refreshPage"
>
<courseprice-form v-if="isShowCoursePriceForm" :save-obj="courseObjOption" @close="closeMenuSaveForm"
@success="refreshPage">
</courseprice-form>
</div>
</div>
</template>
<script>
import {
import {
queryCoursePage,
queryCourseCategoryTree,
deleteCourseInfo,
querySaleplatList,
} from "../../api/course/index";
import courseForm from "../../components/course/course-form";
import coursepriceForm from "../../components/course/courseprice-form";
import selectTree from "../../components/common/select-tree";
import { openURL } from "quasar";
import { mapState } from "vuex";
export default {
getCourseSubject
} from "../../api/course/index";
import courseForm from "../../components/course/course-form";
import coursepriceForm from "../../components/course/courseprice-form";
import selectTree from "../../components/common/select-tree";
import {
openURL
} from "quasar";
import {
mapState
} from "vuex";
export default {
meta: {
title: "课程管理",
},
......@@ -310,14 +206,12 @@ export default {
data() {
return {
currentUrl: "",
columns: [
{
columns: [{
name: "CoverImg",
label: "课程封面",
field: "CoverImg",
align: "left",
},
{
name: "CourseName",
required: true,
......@@ -325,6 +219,13 @@ export default {
align: "left",
field: (row) => row.CourseName,
},
{
name: "CourseSubjectName",
required: true,
label: "所属科目",
align: "left",
field: (row) => row.CourseSubjectName,
},
{
name: "CateName",
required: true,
......@@ -413,8 +314,7 @@ export default {
],
data: [],
loading: true,
ShowOpts: [
{
ShowOpts: [{
label: "全部",
value: "-1",
},
......@@ -437,6 +337,7 @@ export default {
IsQPrice: 1,
Status: "0",
Saleplat: 0,
CourseSubject: "", //所属科目
},
//课程分类树形列表
TreeCategoryList: [],
......@@ -446,6 +347,7 @@ export default {
isShowCoursePriceForm: false, //是否显示课程价格表单
courseObjOption: null, //课程对象
isShowPriceEditBtn: 1, //是否显示价格设置
CourseSubjectList: [], //科目列表
};
},
computed: mapState({
......@@ -470,12 +372,20 @@ export default {
//从订单完成统计跳转过来的带的参数
this.msg.CourseName = decodeURI(this.$route.query.Name);
}
this.queryCourseSubject()
this.getSaleplat();
this.getCategorytree();
this.currentUrl = this.$route.path;
this.getcourselist();
},
methods: {
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
this.CourseSubjectList = res.Data;
}
})
},
//删除课程
DeleteCourse(item, status) {
let delMsg = {
......@@ -611,15 +521,18 @@ export default {
});
},
},
};
};
</script>
<style scoped>
.border-bottom {
.border-bottom {
border-bottom: 1px dashed #eee;
padding-bottom: 5px;
margin-bottom: 5px;
}
}
</style>
<style lang="sass">
@import url('~assets/css/table.sass')
@import url('~assets/css/table.sass')
</style>
......@@ -115,6 +115,11 @@
<div class="page-body courseList">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="Name" option-value="Id" emit-value map-options label="所属科目"
clearable />
</div>
<div class="col-3">
<q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.CourseName" label="课程名称"
@clear="resetSearch" maxlength="20" />
......@@ -260,7 +265,8 @@
</template>
<script>
import {
queryCoursePage
queryCoursePage,
getCourseSubject
} from "../../api/course/index";
import quotationForm from '../../components/sale/quotation-form'
export default {
......@@ -290,6 +296,13 @@
field: "CoverImg",
align: "left"
},
{
name: "CourseSubjectName",
required: true,
label: "所属科目",
align: "left",
field: (row) => row.CourseSubjectName,
},
{
name: "CourseName",
required: true,
......@@ -373,16 +386,26 @@
QCateIds: "",
Status: "0",
IsQPrice: 1, //是否查询优惠价格设置
IsQTeacher: 1 //是否查询课程讲师
IsQTeacher: 1, //是否查询课程讲师
CourseSubject: "", //所属科目
},
pageCount: 0
pageCount: 0,
CourseSubjectList: [], //科目列表
};
},
mounted() {
this.queryCourseSubject()
this.currentUrl = this.$route.path;
this.getcourselist();
},
methods: {
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
this.CourseSubjectList = res.Data;
}
})
},
createQuotation() {
this.showForm = true;
},
......
......@@ -50,6 +50,11 @@
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.ClassNo" label="班号"
@clear="getClassList" maxlength="20" />
</div>
<div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="Name" option-value="Id" emit-value map-options label="所属科目"
clearable />
</div>
<div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="msg.ClassStatus" :options="classStatusList" emit-value map-options label="班级状态" />
......@@ -85,6 +90,9 @@
getSchoolDropdown,
getTeacherDropDownList
} from '../../api/school/index';
import {
getCourseSubject
} from "../../api/course/index";
import classlist from '../../components/course/classlist';
export default {
meta: {
......@@ -95,7 +103,6 @@
},
data() {
return {
data: [],
loading: false,
msg: {
......@@ -108,6 +115,7 @@
CourseName: '', //学习课程
School_Id: -1, //关联校区
ClassNo: '', //班号
CourseSubject: "", //所属科目
},
classStatusList: [], //班级状态列表
schoolList: [], //校区列表
......@@ -121,8 +129,9 @@
isShowLessonCost: true, //显示月度课耗
isShowStatusChange: true, //显示状态变更
isShowStudentMenu: true, //显示未完成学员名单
isShowApply:true //显示调课申请
}
isShowApply: true //显示调课申请
},
CourseSubjectList: [], //所属科目
}
},
created() {
......@@ -132,11 +141,19 @@
this.getClassStatus();
this.getSchool();
this.GetTeacherList();
this.queryCourseSubject()
},
mounted() {
this.getClassList();
},
methods: {
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
this.CourseSubjectList = res.Data;
}
})
},
//获取校区列表
getSchool() {
getSchoolDropdown({}).then(res => {
......@@ -169,7 +186,7 @@
//获取菜单分页列表
getClassList() {
this.loading = true;
this.data=[];
this.data = [];
queryClassPage(this.msg).then(res => {
this.loading = false;
this.data = res.Data.PageData;
......
......@@ -38,6 +38,11 @@
<q-select @input="getClassList" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="msg.ClassStatus" :options="classStatusList" emit-value map-options label="班级状态" />
</div>
<div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="Name" option-value="Id" emit-value map-options label="所属科目"
clearable />
</div>
<div class="col-3">
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.CourseName"
label="学习课程" @clear="getClassList" maxlength="20" />
......@@ -52,7 +57,6 @@
<classlist :data="data" :authObj="authObj" :loading="loading" @success="refreshPage"></classlist>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</div>
</div>
</template>
......@@ -63,6 +67,9 @@
import {
GetClassPageList
} from '../../api/teacher/index';
import {
getCourseSubject
} from "../../api/course/index";
//获取校区列表
import {
getSchoolDropdown,
......@@ -88,6 +95,7 @@
Teacher_Id: 0,
CourseName: '', //学习课程
School_Id: -1, //关联校区
CourseSubject: "", //所属科目
},
//班级状态
classStatusList: [],
......@@ -98,7 +106,8 @@
authObj: {
isShowLessonCost: true, //显示月度课耗
},
loading:false
loading: false,
CourseSubjectList: [], //所属科目
}
},
created() {
......@@ -109,11 +118,19 @@
this.msg.Teacher_Id = userInfo.AccountId;
this.getClassStatus();
this.getSchool();
this.queryCourseSubject()
},
mounted() {
this.getClassList();
},
methods: {
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
this.CourseSubjectList = res.Data;
}
})
},
//获取校区列表
getSchool() {
getSchoolDropdown({}).then(res => {
......@@ -146,7 +163,7 @@
//获取菜单分页列表
getClassList() {
this.loading = true;
this.data=[];
this.data = [];
GetClassPageList(this.msg).then(res => {
this.loading = false;
this.data = res.Data.PageData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment