Skip to content

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

新增班级类型

parent 48320f1b
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 37 deletions
src/api/course/class.js
View file @ dbbc1e12
......@@ -135,6 +135,17 @@ export function addClassCheck(data) {
});
}
/**
* 讲座签到
*/
export function addClassCheckOtherType(data) {
return request({
url: '/class/AddClassCheckOtherType',
method: 'post',
data
});
}
/**
* 获取班级日志
*/
......@@ -451,4 +462,4 @@ export function queryClassStudentTree(data) {
method: 'post',
data
})
}
\ No newline at end of file
}
src/api/school/index.js
View file @ dbbc1e12
......@@ -268,6 +268,17 @@ export function getClassInfo(data) {
})
}
/**
* 班级分类
*/
export function getClassCategory(data) {
return request({
url: '/Class/GetClassCategoryList',
method: 'post',
data
})
}
/**
* 删除班级
* @param {JSON数据} data
......@@ -306,7 +317,7 @@ export function getStudentDorpDownList(data) {
/**
* 确认邀约咨询30分钟以上
*/
export function SetStudentSureConsult(data) {
export function SetStudentSureConsult(data) {
return request({
url: '/CustomerStudent/SetStudentSureConsult',
method: 'post',
......@@ -317,7 +328,7 @@ export function getStudentDorpDownList(data) {
/**
* 上传到访表
*/
export function SetStudentVoucher(data) {
export function SetStudentVoucher(data) {
return request({
url: '/CustomerStudent/SetStudentVoucher',
method: 'post',
......@@ -365,8 +376,7 @@ export function queryQrCodeImage(data) {
/**
* 获取客户阶段列表
*/
export function queryStuStageList()
{
export function queryStuStageList() {
return request({
url: '/CustomerStudent/GetStageDropdownList',
method: 'post',
......@@ -600,24 +610,24 @@ export function queryEmpChangeLog(data) {
// 获取用户领用资产的数量(用户教育用户列表 展示资产使用情况)
export function getEduEmployeeNumList(data) {
return request_zc({
url: '/property/GetEduEmployeeReceiveNumList',
method: 'post',
data
url: '/property/GetEduEmployeeReceiveNumList',
method: 'post',
data
});
}
//获取用户资产列表
export function propertyGetPageList(data) {
return request_zc({
url: '/property/PropertyGetPageList',
method: 'post',
data
url: '/property/PropertyGetPageList',
method: 'post',
data
});
}
/**
* 获取班级下拉_（出库单）
*
*/
export function getClassPage_ck(data) {
export function getClassPage_ck(data) {
return request({
url: '/class/GetClassListForProperty',
method: 'post',
......@@ -628,7 +638,7 @@ export function propertyGetPageList(data) {
/**
* 验证用户是否有 需补交提成订单
*/
export function getUserLeaveOrderCommission(data) {
export function getUserLeaveOrderCommission(data) {
return request({
url: '/SellCommission/GetUserLeaveOrderCommission',
method: 'post',
......@@ -782,12 +792,11 @@ export function GetStudentCoursePage(data) {
/**
* 获取学员电话关联联系人
*/
export function getStuTelType()
{
*/
export function getStuTelType() {
return request({
url: '/User/GetStuTelType',
method: 'post',
data:{}
data: {}
})
}
\ No newline at end of file
}
src/components/course/class-form.vue
View file @ dbbc1e12
......@@ -72,6 +72,7 @@
display: table-row;
height: 20px;
}
</style>
<template>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale">
......@@ -166,6 +167,15 @@
emit-value map-options />
</div>
</div>
<div class="row wrap" style="margin-top:15px;">
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.ClassCategory"
ref="ClassCategory" :options="classCategoryList" label="班级分类" :dense="false" class="col-6 q-pr-lg q-pr-lg"
emit-value map-options />
</div>
<div class="col-6">
</div>
</div>
<div class="row wrap" style="margin:20px 0;display:none;">
<div class="col-6">
阶梯定价
......@@ -393,7 +403,8 @@
saveClass,
batchSaveClassPlan,
getClassInfo,
queryClassRoomList
queryClassRoomList,
getClassCategory,
} from '../../api/school/index'
export default {
components: {},
......@@ -438,6 +449,7 @@
ClassType: 1, //班级类型
ClassHourMinute: 45, //课时分钟数
ClassDateList: [], //开班时间
ClassCategory: 0, //班级分类
},
optionTitle: "",
saveCourseLoading: false,
......@@ -507,7 +519,8 @@
checkedDays: [],
//默认上课时间数组
DefaultPlanTimeList: [],
BtnStr: "立即提交"
BtnStr: "立即提交",
classCategoryList: [],
}
},
created() {
......@@ -517,11 +530,17 @@
this.getClassRoomList();
this.GetTeacherList();
this.GetClassTypeList();
this.queryClassCategory();
},
mounted() {
this.initObj()
},
methods: {
queryClassCategory() {
getClassCategory({}).then(res => {
this.classCategoryList = res.Data;
});
},
filterCourse(val, update) {
update(() => {
if (val === '') {
......@@ -593,6 +612,7 @@
this.objOption.ClassType = TempData.ClassType;
this.objOption.ClassHourMinute = TempData.ClassHourMinute;
this.objOption.ClassDateList = TempData.ClassDateList;
this.objOption.ClassCategory = TempData.ClassCategory;
//默认时间
if (TempData.DefaultTimeList && TempData.DefaultTimeList.length > 0) {
this.DefaultPlanTimeList = TempData.DefaultTimeList;
......@@ -755,7 +775,7 @@
getCourseList() {
queryCourseDropdownList({
IsQPrice: 1,
IsQuerySalePlat:1,
IsQuerySalePlat: 1,
}).then(res => {
if (res.Code == 1) {
this.CourseList = res.Data;
......@@ -885,4 +905,5 @@
}
},
}
</script>
\ No newline at end of file
</script>
src/components/course/classlist.vue
View file @ dbbc1e12
......@@ -256,6 +256,12 @@
field: 'SchoolName',
align: 'left',
},
{
name: "ClassCategoryName",
label: "分类",
field: 'ClassCategoryName',
align: "left",
},
{
name: "CourseSubjectName",
label: "所属科目",
......
src/components/course/lesson-form.vue
View file @ dbbc1e12
......@@ -619,7 +619,13 @@
</div>
<q-card-actions align="right" class="bg-white" v-if="isShowSignBtn" style="margin:20px 10px 100px 0;">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="isShowSignForm=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveSign()" />
<template v-if="setingObj&&setingObj.ClassCategory&&setingObj.ClassCategory!=1">
<q-btn :label="setingObj.ClassCategory==2?'宣讲签到':'日语角签到'" color="accent q-px-md"
style="font-weight:400 !important" @click="saveSignOther()" />
</template>
<template v-else>
<q-btn label="班课签到" color="accent q-px-md" style="font-weight:400 !important" @click="saveSign()" />
</template>
</q-card-actions>
</div>
</div>
......@@ -632,7 +638,8 @@
setClassPlan,
RemoveClassPlan,
GetDayClassPlan,
addClassCheck
addClassCheck,
addClassCheckOtherType
} from '../../api/course/class';
import {
getTeacherDropDownList,
......@@ -781,6 +788,7 @@
},
created() {
this.currentUser = this.getLocalStorage();
if (this.setingObj && this.setingObj.ClassId) {
this.addMsg.ClassId = this.setingObj.ClassId;
}
......@@ -958,8 +966,10 @@
},
//日历点击删除
delInfo(item) {
console.log("item", item);
var tipMsg = "确定要删除【" + item.ClassDateStr + "】的上课计划吗?";
this.$q.dialog({
title: "确定删除课程",
title: tipMsg,
message: '',
cancel: {
label: "取消",
......@@ -1056,7 +1066,22 @@
this.getClassPlan();
}
})
},
//讲座、日语角班课签到
saveSignOther() {
let postMsg = {
ClassId: this.setingObj.ClassId,
ClassPlanId: this.dayMsg.ClassPlanId,
ClassTimeId: this.comChecked.ClassTimeId,
};
addClassCheckOtherType(postMsg).then(res => {
if (res.Code == 1) {
this.isShowSignForm = false;
this.getClassPlan();
}
})
}
},
watch: {
setingObj: function (val, oldval) {
......
src/components/sale/b2bcustomlist.vue
View file @ dbbc1e12
......@@ -96,7 +96,6 @@
import customerEditForm from "../sale/customerEdit-form";
import customerReviewForm from "../sale/customerReview-form";
import customerInfo from "./b2bcustomerinfo/b2bCustomerInfo.vue";
import obj from '../../pages/financial/lang/zh-demo';
export default {
props: {
dataList: {
......
src/components/sale/categoryEdit-form.vue
View file @ dbbc1e12
......@@ -84,7 +84,7 @@
<div class="row wrap">
<div class="col-12">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.CategoryName"
ref="CategoryName" class="col-12 q-pb-lg" label="名称" :rules="[val => !!val || '请填写客户名称']" />
ref="CategoryName" class="col-12 q-pb-lg" label="名称" :rules="[val => !!val || '请填写同行名称']" />
</div>
</div>
<div class="row wrap">
......@@ -225,7 +225,7 @@
this.objOption.RebateMoney = tempData.RebateMoney;
}
})
this.optionTitle = "修改客户信息"
this.optionTitle = "修改同行信息"
} else {
this.objOption.CategoryName = '';
this.objOption.CatetoryType = '';
......@@ -236,7 +236,7 @@
this.objOption.RebateMoney = 0;
this.objOption.IsContract = 0;
this.objOption.ContractUrl = '';
this.optionTitle = "新增客户信息"
this.optionTitle = "新增同行信息"
this.isShowTel = true;
}
},
......
src/components/sale/customcategorylist.vue
View file @ dbbc1e12
......@@ -15,7 +15,7 @@
<template v-slot:top>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" @click="EditCustom(null)" label="新增客户" />
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" @click="EditCustom(null)" label="新增同行" />
<q-btn v-if="authObj&&authObj.isShowDownload" color="accent" class="q-mr-md" size="sm" icon="download"
label="下载" @click="downLoadCustomer" />
</div>
......
src/components/sale/customerEdit-form.vue
View file @ dbbc1e12
......@@ -101,6 +101,7 @@
right: -10px;
top: -10px;
}
</style>
<template>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale">
......@@ -137,7 +138,7 @@
<div class="row wrap">
<q-input filled v-if="objOption.CustomerType==4" stack-label maxlength="20" :dense="false"
v-model="objOption.EnterpriseName" lazy-rules ref="EnterpriseName" class="col-6 q-pr-lg q-pb-lg" />
<q-select stack-label color="primary" v-else filled label="请选择客户" option-value="CategoryId"
<q-select stack-label color="primary" v-else filled label="请选择同行" option-value="CategoryId"
option-label="CategoryName" :options="customList" class="col-6 q-pr-lg q-pb-lg"
v-model="objOption.CategoryId" use-input @filter="filterFn" clearable emit-value map-options />
<template v-if="objOption.CustomerType!=4">
......@@ -155,8 +156,8 @@
</div>
<div class="row wrap">
<div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model:number="objOption.QQ" ref="QQ"
type="number" :min="0" class="col-6 q-pr-lg q-pb-lg" label="QQ" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.QQ" ref="QQ" type="number"
:min="0" class="col-6 q-pr-lg q-pb-lg" label="QQ" />
</div>
<div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.WeChatNo" ref="wechat"
......@@ -430,9 +431,8 @@
let msg = {
CatetoryType: Type
}
if(Type)
{
this.objOption.CategoryId = '';
if (Type) {
this.objOption.CategoryId = '';
}
this.isShowEdit = false;
queryCustomerCategoryList(msg).then(res => {
......@@ -444,4 +444,5 @@
}
}
}
</script>
\ No newline at end of file
</script>
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