Skip to content

C
confucius
Commit 32aa7b16 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 2b3d2c85
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 499 additions and 588 deletions
src/components/course/classlist.vue
View file @ 32aa7b16
......@@ -263,6 +263,12 @@
label: '校区',
field: 'SchoolName',
align: 'left',
},
{
name: "CourseSubjectName",
label: "所属科目",
field: 'CourseSubjectName',
align: "left",
},
{
name: 'CourseName',
......
src/components/sale/quotation-form.vue
View file @ 32aa7b16
......@@ -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>
src/pages/course/classManage.vue
View file @ 32aa7b16
......@@ -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;
......
src/pages/course/course.vue
View file @ 32aa7b16
This diff is collapsed.
src/pages/sale/courseList.vue
View file @ 32aa7b16
......@@ -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;
},
......
src/pages/stuMan/stuClassManage.vue
View file @ 32aa7b16
......@@ -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;
......
src/pages/teacher/myClass.vue
View file @ 32aa7b16
......@@ -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