Skip to content

C
confucius
Commit 4119b68b authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

parents fdc06738 fd82d8f2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1942 additions and 1513 deletions
src/api/scheduling/schedu.js
View file @ 4119b68b
...@@ -232,4 +232,16 @@ export function GetReserveClass(data) { ...@@ -232,4 +232,16 @@ export function GetReserveClass(data) {
method: 'post', method: 'post',
data data
}) })
}
/**
* 修改预约状态
* @param {JSON参数} data
*/
export function setVisitorReserveStatus(data) {
return request({
url: '/VisitorReserve/UpdateVisitorReserveStatus',
method: 'post',
data
})
} }
\ No newline at end of file
src/components/activity/active-from.vue
View file @ 4119b68b
This diff is collapsed.
src/components/course/record-form.vue
View file @ 4119b68b
...@@ -276,7 +276,6 @@ ...@@ -276,7 +276,6 @@
this.msg.ClassId = this.setingObj.ClassId; this.msg.ClassId = this.setingObj.ClassId;
this.msg.TeacherId = this.setingObj.Teacher_Id; this.msg.TeacherId = this.setingObj.Teacher_Id;
GetClassPlanLogPageList(this.msg).then(res => { GetClassPlanLogPageList(this.msg).then(res => {
console.log("res,", res.Data)
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
......
src/components/duty/addDutyItem.vue
View file @ 4119b68b
...@@ -246,7 +246,6 @@ ...@@ -246,7 +246,6 @@
getSchoolDropdown({}).then(res => { getSchoolDropdown({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.schoolOptions = res.Data; this.schoolOptions = res.Data;
console.log(this.schoolOptions,'schoolOptions');
} }
}) })
}, },
......
src/components/sale/editOrder-form.vue
View file @ 4119b68b
...@@ -456,7 +456,6 @@ ...@@ -456,7 +456,6 @@
GetSelectClassOrderList(qMsg).then(res => { GetSelectClassOrderList(qMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.beforeOrderList = res.Data; this.beforeOrderList = res.Data;
console.log(res, '前置数据');
} }
}) })
}, },
......
src/components/schedul/appoint-form.vue
View file @ 4119b68b
...@@ -192,11 +192,9 @@ ...@@ -192,11 +192,9 @@
}, },
//子组件选中传值 //子组件选中传值
getchildInfo(obj){ getchildInfo(obj){
console.log(obj,'来了');
this.addMsg.TeacherId = obj.TeacherId; this.addMsg.TeacherId = obj.TeacherId;
this.addMsg.ClassRoomId = obj.ClassRoomId; this.addMsg.ClassRoomId = obj.ClassRoomId;
this.addMsg.ReserveClassId = obj.ReserveClassId; this.addMsg.ReserveClassId = obj.ReserveClassId;
} }
} }
} }
......
src/components/schedul/audition-form.vue
View file @ 4119b68b
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
//获取课程系列分页列表 //获取课程系列分页列表
getList() { getList() {
GetReserveClassPage(this.msg).then(res => { GetReserveClassPage(this.msg).then(res => {
console.log(res,'数据');
if(res.Code==1){ if(res.Code==1){
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
......
src/components/schedul/exorder-form.vue 0 → 100644
View file @ 4119b68b
This diff is collapsed.
src/components/schedul/yueke-form.vue
View file @ 4119b68b
...@@ -4,18 +4,18 @@ ...@@ -4,18 +4,18 @@
<q-card-section class="q-pt-none scroll" style="max-height: 70vh"> <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<q-card-section> <q-card-section>
<div class="text-h6"> <div class="text-h6">
<span v-if="ChoiceType==3">请填写取消备注</span> <span v-if="ChoiceType==3">取消预约</span>
<span v-if="ChoiceType==2">请选择流单原因</span> <span v-if="ChoiceType==2">流单</span>
</div> </div>
</q-card-section> </q-card-section>
<div class="row wrap"> <div class="row wrap">
<template v-if="ChoiceType==3"> <template v-if="ChoiceType==3">
<q-input filled stack-label :dense="false" v-model="msg.remark" type="textarea" class="col-12" label="备注" /> <q-input filled stack-label :dense="false" v-model="msg.Remark" type="textarea" class="col-12" label="备注" />
</template> </template>
<template v-if="ChoiceType==2"> <template v-if="ChoiceType==2">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseLiudan" <q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseLiudan" ref="remark"
ref="remark" :options="reasonList" label="流单原因" :dense="false" class="col-12 q-pb-lg" :options="reasonList" label="流单原因" :dense="false" class="col-12 q-pb-lg" emit-value map-options
emit-value map-options multiple /> multiple />
</template> </template>
</div> </div>
</div> </div>
...@@ -30,10 +30,17 @@ ...@@ -30,10 +30,17 @@
</q-dialog> </q-dialog>
</template> </template>
<script> <script>
import {
setVisitorReserveStatus
} from '../../api/scheduling/schedu'
export default { export default {
props: { props: {
ChoiceType: { ChoiceType: {
type: Number, type: Number,
default: 2
},
saveObj: {
type: Object,
default: null default: null
} }
}, },
...@@ -42,49 +49,77 @@ ...@@ -42,49 +49,77 @@
persistent: true, persistent: true,
saveLoading: false, saveLoading: false,
msg: { msg: {
remark: '' Id: 0,
ReserveStatus: 0,
Remark: '',
}, },
chooseLiudan:[], chooseLiudan: [],
reasonList: [{ reasonList: [{
Id: 1, Id: "教学环境",
Name: '教学环境' Name: '教学环境'
}, { }, {
Id: 2, Id: "教学内容",
Name: '教学内容' Name: '教学内容'
}, { }, {
Id: 3, Id: "讲师",
Name: '讲师' Name: '讲师'
}, { }, {
Id: 4, Id: "价格",
Name: '价格' Name: '价格'
}, { }, {
Id: 5, Id: "销售跟进",
Name: '销售跟进' Name: '销售跟进'
}, { }, {
Id: 6, Id: "同行竞争",
Name: '同行竞争' Name: '同行竞争'
}, { }, {
Id: 7, Id: "其他",
Name: '其他' Name: '其他'
}] }]
} }
}, },
mounted() {}, mounted() {
if (this.saveObj) {
if (this.saveObj.Id) {
this.msg.Id = this.saveObj.Id;
}
}
},
methods: { methods: {
//关闭弹窗 //关闭弹窗
closeSaveForm() { closeSaveForm() {
this.$emit('close') this.$emit('close')
this.persistent = false this.persistent = false;
}, },
//保存菜单 //保存菜单
saveYueke() { saveYueke() {
this.saveLoading = true; this.saveLoading = true;
if(this.ChoiceType==2){ if (this.ChoiceType == 2) {
this.msg.remark = this.chooseLiudan.toString(); this.msg.ReserveStatus = 2;
} }
console.log(this.msg,'msg'); if (this.ChoiceType == 3) {
this.msg.ReserveStatus = 3;
}
if (this.ChoiceType == 2) {
this.msg.remark = this.chooseLiudan.toString();
}
setVisitorReserveStatus(this.msg).then(res => {
if (res.Code == 1) {
this.saveLoading = false
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '数据保存成功！',
position: 'top'
})
this.$emit("success")
this.closeSaveForm()
}
}).catch(() => {
this.saveLoading = false
});
}, },
} }
} }
......
src/components/school/classroom/classroom-form.vue
View file @ 4119b68b
...@@ -223,8 +223,7 @@ ...@@ -223,8 +223,7 @@
uploadFile(files) { uploadFile(files) {
UploadSelfFile('studentIcon', files, res => { UploadSelfFile('studentIcon', files, res => {
if (res.Code == 1) { if (res.Code == 1) {
console.log(211,res) this.objOption.RoomPicList.push(res.FileUrl);
this.objOption.RoomPicList.push(res.FileUrl);
} }
}) })
}, },
...@@ -236,17 +235,7 @@ ...@@ -236,17 +235,7 @@
} }
</script> </script>
<style> <style>
/* .avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 143px;
height: 82px;
line-height: 82px;
text-align: center;
} */
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
......
src/pages/activity/activeType.vue
View file @ 4119b68b
...@@ -239,8 +239,6 @@ import ActiveTypeForm from '../../components/activity/activeType-from' ...@@ -239,8 +239,6 @@ import ActiveTypeForm from '../../components/activity/activeType-from'
this.data = res.data.data.pageData; this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount; this.pageCount = res.data.data.pageCount;
} }
console.log(257,res)
}) })
}, },
delType(item){ delType(item){
......
src/pages/activity/activityList.vue
View file @ 4119b68b
...@@ -422,8 +422,6 @@ import ActiveForm from '../../components/activity/active-from' ...@@ -422,8 +422,6 @@ import ActiveForm from '../../components/activity/active-from'
this.data = res.data.data.pageData; this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount; this.pageCount = res.data.data.pageCount;
} }
console.log(257,res)
}) })
}, },
delActive(item){ delActive(item){
......
src/pages/classroom/components/classroomNav.vue
View file @ 4119b68b
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
methods:{ methods:{
showNav(val,id){ showNav(val,id){
this.schoolId=id this.schoolId=id
console.log(id)
}, },
chooseNav(i){ chooseNav(i){
this.currentNav=i.RoomId this.currentNav=i.RoomId
......
src/pages/classroom/components/js/lunarCalendar.js
View file @ 4119b68b
...@@ -204,7 +204,6 @@ var lunarCalendar = { ...@@ -204,7 +204,6 @@ var lunarCalendar = {
var objDate = new Date(); var objDate = new Date();
var endDate = new Date(); var endDate = new Date();
if (dateStr) { if (dateStr) {
console.log(dateStr)
let d = Date.parse(dateStr) let d = Date.parse(dateStr)
let res = new Date(d); let res = new Date(d);
...@@ -216,15 +215,6 @@ var lunarCalendar = { ...@@ -216,15 +215,6 @@ var lunarCalendar = {
endDate.setDate(endDate.getDate() + dayNum); endDate.setDate(endDate.getDate() + dayNum);
// let x1 = objDate.getTime();
// console.log(211, x1, objDate)
// let x2 = endDate.getTime();
// console.log(222, x2, endDate)
// let x = x2 - x1
// console.log(x1 == x2, x, 'time');
//修正ymd参数 //修正ymd参数
var m = objDate.getMonth() + 1, d = objDate.getDate(); var m = objDate.getMonth() + 1, d = objDate.getDate();
var totalMonthDay = lunarCalendar.solarDays(yearStr, m); var totalMonthDay = lunarCalendar.solarDays(yearStr, m);
......
src/pages/classroom/components/scenicSummary.vue
View file @ 4119b68b
...@@ -398,7 +398,6 @@ export default { ...@@ -398,7 +398,6 @@ export default {
this.QStartDate = data[0].CurrentDate; this.QStartDate = data[0].CurrentDate;
this.QEndDate = data[data.length - 1].CurrentDate; this.QEndDate = data[data.length - 1].CurrentDate;
this.Calendar = this.CalendarDataArray.slice(0,7); this.Calendar = this.CalendarDataArray.slice(0,7);
console.log("初始化",this.Calendar)
}, },
//左侧点击 //左侧点击
...@@ -445,45 +444,18 @@ export default { ...@@ -445,45 +444,18 @@ export default {
this.msg.EndDate = d.Format("yyyy-MM-dd"); this.msg.EndDate = d.Format("yyyy-MM-dd");
}, },
getDayInfo(Y, M, D) { getDayInfo(Y, M, D) {
console.log(148,Y, M, D)
// let StartDate = Y + "-" + M + "-" + D;
// let msg = {
// StartDate: StartDate
// };
// this.apipost(
// "ticketcoupons_get_GetTicketCouponsSummaryDay",
// msg,
// res => {
// if (res.data.resultCode == 1) {
// this.dayList = res.data.data;
// }
// },
// null
// );
}, },
getOffSet(index){ getOffSet(index){
let el=document.getElementsByClassName('el-timeline-item')[index] let el=document.getElementsByClassName('el-timeline-item')[index]
let top=el.getBoundingClientRect().top let top=el.getBoundingClientRect().top
return top return top
}, },
// timeDifference(startTime,endTime){
// var start1=startTime.split(":");
// var startAll=parseInt(start1[0]*60)+parseInt(start1[1]);
// var end1=endTime.split(":");
// var endAll=parseInt(end1[0]*60)+parseInt(end1[1]);
// let res=Math.ceil((endAll-startAll)/15)
// console.log("时间差===",res);
// return res
// }
}, },
mounted() { mounted() {
this.initData(); this.initData();
this.getEndDay(); this.getEndDay();
// this.getList();
let nowDate = new Date().Format("yyyy-MM-dd"); let nowDate = new Date().Format("yyyy-MM-dd");
this.nowYear = nowDate.split("-")[0]; this.nowYear = nowDate.split("-")[0];
this.nowMonth = parseInt(nowDate.split("-")[1]); this.nowMonth = parseInt(nowDate.split("-")[1]);
......
src/pages/classroom/components/userHistory.vue
View file @ 4119b68b
<template> <template>
<q-dialog v-model="persistent" maximized full-height position="right" ref="historyDialog" @hide="" class="flex "> <q-dialog v-model="persistent" maximized full-height position="right" ref="historyDialog" @hide="" class="flex ">
<div class="con"> <div class="con">
<div class="header"> <div class="header">
<img class="img-head" src="../../../assets/images/logo.png" mode="" /> <img class="img-head" src="../../../assets/images/logo.png" mode="" />
<div class="head-title"> <div class="head-title">
{{details.ErrorTitle}} {{details.ErrorTitle}}
</div>
<img class="img-head-close" src="../../../assets/images/classroom/close.png" mode="" @click="hideDialog"/>
</div> </div>
<div class="info-box">
<div class="user-info"> <img class="img-head-close" src="../../../assets/images/classroom/close.png" mode="" @click="hideDialog" />
<div class="user-item"> </div>
<div class="user-label">姓名:</div><span class="user-con">{{details.ManageName}}</span> <div class="info-box">
</div> <div class="user-info">
<div class="user-item"> <div class="user-item">
<div class="user-label">值班时间:</div><span class="user-con">{{details.StartTime}}-{{details.EndTime}}</span> <div class="user-label">姓名:</div><span class="user-con">{{details.ManageName}}</span>
</div> </div>
</div> <div class="user-item">
<div class="use"> <div class="user-label">值班时间:</div><span class="user-con">{{details.StartTime}}-{{details.EndTime}}</span>
<!-- <div class="use-title">用途</div> --> </div>
<div class="use-con">{{details.ErrorContent}}</div> </div>
</div> <div class="use">
<div class="use"> <!-- <div class="use-title">用途</div> -->
<div class="use-title">现场照片</div> <div class="use-con">{{details.ErrorContent}}</div>
<div class="img-con"> </div>
<div v-for="(item,index) in details.LogPicList" :key="index" class="classroom-img-item"> <div class="use">
<el-image :src="item" fit="contain" /> <div class="use-title">现场照片</div>
</div> <div class="img-con">
</div> <div v-for="(item,index) in details.LogPicList" :key="index" class="classroom-img-item">
<el-image :src="item" fit="contain" />
</div> </div>
<div class="use"> </div>
<div class="use-title">参与人员</div> </div>
<div class="img-con"> <div class="use">
<div v-for="(item,index) in details.ParticipantsList" :key="index" class="classroom-img-item"> <div class="use-title">参与人员</div>
<el-image :src="item" fit="contain" /> <div class="img-con">
</div> <div v-for="(item,index) in details.ParticipantsList" :key="index" class="classroom-img-item">
</div> <el-image :src="item" fit="contain" />
</div> </div>
</div>
</div> </div>
</div>
</div> </div>
</q-dialog> </q-dialog>
</template> </template>
<script> <script>
import {getClassRoomLogDetail} from '../../../api/classroom/index'; import {
getClassRoomLogDetail
} from '../../../api/classroom/index';
export default { export default {
props: { props: {
classroomId:{ classroomId: {
type:[Number,String] type: [Number, String]
}, },
}, },
watch:{ watch: {
classroomId(val,oldVal){ classroomId(val, oldVal) {
if(val!==oldVal){ if (val !== oldVal) {
this.getClassRoomDetail(val) this.getClassRoomDetail(val)
} }
}, },
}, },
components: { components: {
}, },
data() { data() {
return { return {
persistent: false, persistent: false,
details:{} details: {}
} }
}, },
methods: { methods: {
getClassRoomDetail(id){ getClassRoomDetail(id) {
getClassRoomLogDetail({ID:id}).then((res)=>{ getClassRoomLogDetail({
console.log(51,res) ID: id
if(res.Code===1){ }).then((res) => {
this.details=res.Data if (res.Code === 1) {
this.details = res.Data
} }
}) })
}, },
changeShow(){ changeShow() {
this.persistent=true this.persistent = true
}, },
hideDialog(){ hideDialog() {
this.$refs.historyDialog.hide() this.$refs.historyDialog.hide()
} }
}, },
} }
...@@ -138,101 +133,118 @@ ...@@ -138,101 +133,118 @@
font-size: 12px; font-size: 12px;
color: #2961FE; color: #2961FE;
} }
.con{
box-sizing: border-box; .con {
width: 500px; box-sizing: border-box;
height: 1080px; width: 500px;
background: #FFFFFF; height: 1080px;
box-shadow: 0px 0px 76px 0px rgba(2, 44, 66, 0.2); background: #FFFFFF;
.header{ box-shadow: 0px 0px 76px 0px rgba(2, 44, 66, 0.2);
width: 500px;
height: 56px; .header {
background-color: #F0F5FB; width: 500px;
padding: 0 20px; height: 56px;
display: flex; background-color: #F0F5FB;
align-items: center; padding: 0 20px;
position: relative; display: flex;
.img-head{ align-items: center;
width: 35px; position: relative;
height: 35px;
// border-radius: 50%; .img-head {
background-color: #B0C9FC; width: 35px;
margin-right: 10px; height: 35px;
object-fit: fill; // border-radius: 50%;
} background-color: #B0C9FC;
.head-title{ margin-right: 10px;
white-space: nowrap; object-fit: fill;
overflow: hidden; }
text-overflow:ellipsis;
} .head-title {
.img-head-close{ white-space: nowrap;
width: 15px; overflow: hidden;
height: 15px; text-overflow: ellipsis;
margin-right: 10px; }
position: absolute;
top: 50%; .img-head-close {
transform: translateY(-50%); width: 15px;
right: 15px; height: 15px;
} margin-right: 10px;
} position: absolute;
.info-box{ top: 50%;
transform: translateY(-50%);
box-sizing: border-box; right: 15px;
padding: 20px; }
.user-info{ }
height: 100px;
border-bottom: 1px solid #E2E2E2; .info-box {
font-size: 12px;
font-family: Microsoft YaHei; box-sizing: border-box;
font-weight: 400; padding: 20px;
.user-item{
display: flex; .user-info {
margin-top: 20px; height: 100px;
.user-label{ border-bottom: 1px solid #E2E2E2;
width: 100px; font-size: 12px;
color: #999999; font-family: Microsoft YaHei;
} font-weight: 400;
.user-con{
color: #111111; .user-item {
} display: flex;
} margin-top: 20px;
.user-label {
width: 100px;
color: #999999;
} }
.use{
padding: 30px 0; .user-con {
border-bottom: 1px solid #E2E2E2;
.use-title{
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #111111; color: #111111;
margin-bottom: 20px;
}
.use-con{
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #999999;
} }
.img-con{ }
}
.use {
padding: 30px 0;
border-bottom: 1px solid #E2E2E2;
.use-title {
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #111111;
margin-bottom: 20px;
}
.use-con {
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #999999;
}
.img-con {
display: flex;
.classroom-img-item {
display: flex; display: flex;
.classroom-img-item{ width: 145px;
display: flex; height: 80px;
width: 145px; border-radius: 4px;
height: 80px; margin-right: 10px;
border-radius: 4px; margin-bottom: 10px;
margin-right: 10px;
margin-bottom: 10px; .classroom-img {
.classroom-img{
width: 100%; width: 100%;
height: 100%; height: 100%;
}
} }
}
} }
} }
}
} }
}
</style> </style>
src/pages/classroom/courseInfo.vue
View file @ 4119b68b
...@@ -336,8 +336,7 @@ ...@@ -336,8 +336,7 @@
"cover":cover, "cover":cover,
"playauth":auth, "playauth":auth,
}, function (player) { }, function (player) {
console.log(321,player)
console.log("The player is created");
} }
); );
}, },
......
src/pages/classroom/useRecord.vue
View file @ 4119b68b
...@@ -128,14 +128,14 @@ ...@@ -128,14 +128,14 @@
}, },
//选择校区教室导航 //选择校区教室导航
successNav(val){ successNav(val){
console.log(114,val)
this.msg.RoomId=val.RoomId this.msg.RoomId=val.RoomId
this.msg.SchoolId=val.schoolId this.msg.SchoolId=val.schoolId
this.getClassRoomTimeList(); this.getClassRoomTimeList();
this.$forceUpdate() this.$forceUpdate()
}, },
dateChoose(value, reason, details){ dateChoose(value, reason, details){
// console.log(112,this.dateModel)
}, },
//获取结束日期 //获取结束日期
getEndTime(date){ getEndTime(date){
......
src/pages/course/teacherLesson.vue
View file @ 4119b68b
...@@ -419,7 +419,6 @@ ...@@ -419,7 +419,6 @@
} }
} }
}) })
console.log()
return Str; return Str;
}, },
//跳转至备课 //跳转至备课
......
src/pages/financial/CommissionDetail.vue
View file @ 4119b68b
This diff is collapsed.
src/pages/financial/cycleOrderList.vue
View file @ 4119b68b
This diff is collapsed.
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ 4119b68b
...@@ -2532,7 +2532,6 @@ ...@@ -2532,7 +2532,6 @@
}) })
}, },
getAccountListtype(AccountId){ getAccountListtype(AccountId){
console.log(AccountId)
this.accountList2.map(x=>{ this.accountList2.map(x=>{
if(x.ID == AccountId){ if(x.ID == AccountId){
this.FinanceTrabeMsg.Type = x.BankType this.FinanceTrabeMsg.Type = x.BankType
......
src/pages/financial/salesRules.vue
View file @ 4119b68b
This diff is collapsed.
src/pages/sale/appointManagement.vue
View file @ 4119b68b
<template> <template>
<div class="page-body"> <div class="page-body">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-4">
<div class="col-4 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>至
<el-date-picker v-model="msg.EndClassDate" value-format="yyyy-MM-dd" type="date" placeholder="结束时间"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>
</template>
</q-field>
</div>
</div>
<div class="col-3">
<q-select @input="resetSearch" filled option-value="TId" option-label="TeacherName" v-model="msg.TeacherId"
:options="TeacherList" emit-value map-options label="老师" clearable />
</div>
<div class="col-3">
<q-select @input="resetSearch" filled stack-label option-value="RoomId" option-label="RoomName"
v-model="msg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室" clearable :dense="false"
class="col-6 q-pb-lg" emit-value map-options />
</div>
</div>
</div>
<q-table :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table" <q-table :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
separator="none" :data="dataList" :columns="columns" row-key="name"> separator="none" :data="dataList" :columns="columns" row-key="name">
<template v-slot:top="props"> <template v-slot:top="props">
...@@ -11,7 +39,7 @@ ...@@ -11,7 +39,7 @@
<q-td :props="props"> <q-td :props="props">
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"> <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list> <q-list>
<q-item clickable v-close-popup @click="OperateVitior(props.row,1)"> <q-item clickable v-close-popup @click="ExchangeOrder(props.row)">
<q-item-section> <q-item-section>
<q-item-label>转订单</q-item-label> <q-item-label>转订单</q-item-label>
</q-item-section> </q-item-section>
...@@ -21,7 +49,7 @@ ...@@ -21,7 +49,7 @@
<q-item-label>流单</q-item-label> <q-item-label>流单</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup @click="OperateVitior(props.row,3)" > <q-item clickable v-close-popup @click="OperateVitior(props.row,3)">
<q-item-section> <q-item-section>
<q-item-label>取消</q-item-label> <q-item-label>取消</q-item-label>
</q-item-section> </q-item-section>
...@@ -35,7 +63,8 @@ ...@@ -35,7 +63,8 @@
:input="true" @input="changePage" /> :input="true" @input="changePage" />
</template> </template>
</q-table> </q-table>
<yuekeForm v-if="isShowYue" :ChoiceType="ChoiceType" @close="closeYuekeForm" @success="refreshPage"></yuekeForm> <yuekeForm v-if="isShowYue" :ChoiceType="ChoiceType" :save-obj="visitorItem" @close="closeYuekeForm" @success="refreshPage"></yuekeForm>
<exorderForm v-if="isShowExOrder" :save-obj="visitorItem" @close="closeOrderForm" @success="refreshPage"></exorderForm>
</div> </div>
</template> </template>
...@@ -43,20 +72,31 @@ ...@@ -43,20 +72,31 @@
import { import {
queryVisitorReservePage queryVisitorReservePage
} from '../../api/scheduling/schedu' } from '../../api/scheduling/schedu'
import {
getTeacherDropDownList,
queryClassRoomList
} from "../../api/school/index";
import yuekeForm from '../../components/schedul/yueke-form' import yuekeForm from '../../components/schedul/yueke-form'
import exorderForm from '../../components/schedul/exorder-form'
export default { export default {
meta: { meta: {
title: "约课管理" title: "约课管理"
}, },
components: { components: {
yuekeForm yuekeForm,
exorderForm
}, },
data() { data() {
return { return {
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10 pageSize: 10,
rowsPerPage: 10,
StartClassDate: "", //开始日期
EndClassDate: "", //结束日期
TeacherId: "",
ClassRoomId: "",
}, },
dataList: [], dataList: [],
loading: false, loading: false,
...@@ -110,14 +150,36 @@ ...@@ -110,14 +150,36 @@
} }
], ],
isShowYue:false, isShowYue:false,
ChoiceType:0 ChoiceType:0,
visitorItem:{},//选中的对象
isShowExOrder:false,
} }
}, },
created() {
this.GetTeacherList();
this.getClassRoomList();
},
mounted() { mounted() {
this.getList() this.getList()
}, },
methods: { methods: {
//获取教师下拉
GetTeacherList() {
getTeacherDropDownList({}).then(res => {
if (res.Code == 1) {
this.TeacherList = res.Data;
}
});
},
//获取教室下拉
getClassRoomList() {
queryClassRoomList({}).then(res => {
if (res.Code == 1) {
this.ClassRoomList = res.Data;
}
})
},
//重新查询 //重新查询
resetSearch() { resetSearch() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
...@@ -130,7 +192,6 @@ ...@@ -130,7 +192,6 @@
//获取课程系列分页列表 //获取课程系列分页列表
getList() { getList() {
queryVisitorReservePage(this.msg).then(res => { queryVisitorReservePage(this.msg).then(res => {
console.log(res, '数据');
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
...@@ -138,20 +199,26 @@ ...@@ -138,20 +199,26 @@
}) })
}, },
//预约操作按钮 //预约操作按钮
OperateVitior(item,type) OperateVitior(item, type) {
{
this.ChoiceType = type; this.ChoiceType = type;
this.isShowYue = true; this.isShowYue = true;
this.visitorItem = item;
}, },
//关闭弹窗 //关闭弹窗
closeYuekeForm() { closeYuekeForm() {
this.isShowYue = false this.isShowYue = false
}, },
closeOrderForm() {
this.isShowExOrder = false
},
//刷新页面 //刷新页面
refreshPage() { refreshPage() {
this.getList(); this.getList();
},
ExchangeOrder(item){
this.visitorItem = item;
this.isShowExOrder=true;
} }
} }
} }
......
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