Commit 0d0f506a authored by 黄奎's avatar 黄奎

页面修改

parent 03381b31
...@@ -191,7 +191,6 @@ ...@@ -191,7 +191,6 @@
}, },
//点击报入 //点击报入
getStuInfo(item) { getStuInfo(item) {
console.log("item",item);
if (item) { if (item) {
this.StuObj.ClassRoomId = item.ClassRoomId; this.StuObj.ClassRoomId = item.ClassRoomId;
this.StuObj.TeacherId = item.TeacherId; this.StuObj.TeacherId = item.TeacherId;
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</template> </template>
</q-input> </q-input>
<div class="Sysuser_Date col-6 q-pb-lg"> <div class="Sysuser_Date col-6 q-pb-lg">
<q-field filled> <q-field>
  <template v-slot:control> <template v-slot:control>
<el-time-select v-model="objOption.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{ <el-time-select v-model="objOption.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{
start: '09:00', start: '09:00',
step: '00:15', step: '00:15',
...@@ -48,16 +48,14 @@ ...@@ -48,16 +48,14 @@
<q-select filled stack-label option-value="RoomId" option-label="RoomName" v-model="objOption.ClassRoomId" <q-select filled stack-label option-value="RoomId" option-label="RoomName" v-model="objOption.ClassRoomId"
ref="ClassRoomId" :options="ClassRoomList" label="关联教室" :dense="false" class="col-6 q-pb-lg" emit-value ref="ClassRoomId" :options="ClassRoomList" label="关联教室" :dense="false" class="col-6 q-pb-lg" emit-value
map-options /> map-options />
<q-select filled stack-label option-value="Id" option-label="LessonName" v-model="objOption.TrialLessonId" <q-select filled stack-label option-value="Id" option-label="LessonName" v-model="objOption.TrialLessonId"
:options="TrialList" label="试听课程" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value :options="TrialList" label="试听课程" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
map-options />
<q-select filled stack-label option-value="Name" option-label="Name" v-model="objOption.ClassContent" <q-select filled stack-label option-value="Name" option-label="Name" v-model="objOption.ClassContent"
ref="ClassContent" :options="ContentList" label="主讲内容" :dense="false" class="col-12 q-pb-lg" emit-value ref="ClassContent" :options="ContentList" label="主讲内容" :dense="false" class="col-12 q-pb-lg" emit-value
map-options /> map-options />
</div> </div>
</div>
</q-card-section> </q-card-section>
<q-separator /> <q-separator />
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
...@@ -96,7 +94,7 @@ ...@@ -96,7 +94,7 @@
EndTime: "", EndTime: "",
ClassRoomId: "", ClassRoomId: "",
ClassContent: '', ClassContent: '',
TrialLessonId:'' TrialLessonId: ''
}, },
saveLoading: false, saveLoading: false,
TeacherList: [], TeacherList: [],
...@@ -114,7 +112,7 @@ ...@@ -114,7 +112,7 @@
Id: 4, Id: 4,
Name: '留学类:打算去往日本留学(本科、硕士、语言学校、私塾等)' Name: '留学类:打算去往日本留学(本科、硕士、语言学校、私塾等)'
}], }],
TrialList:[] //试听课程下拉数据 TrialList: [] //试听课程下拉数据
} }
}, },
mounted() { mounted() {
...@@ -122,8 +120,8 @@ ...@@ -122,8 +120,8 @@
var year = nowDay.getFullYear(); //年 var year = nowDay.getFullYear(); //年
var month = nowDay.getMonth() + 1; //月 var month = nowDay.getMonth() + 1; //月
var day = nowDay.getDate(); //日 var day = nowDay.getDate(); //日
if(month<10){ if (month < 10) {
month='0'+month month = '0' + month
} }
this.objOption.ClassDate = year + '-' + month + '-' + day; this.objOption.ClassDate = year + '-' + month + '-' + day;
this.GetTeacherList(); this.GetTeacherList();
...@@ -132,7 +130,7 @@ ...@@ -132,7 +130,7 @@
this.initObj() this.initObj()
}, },
methods: { methods: {
GetTrialDrop(){ GetTrialDrop() {
GetTrialLessonList({}).then(res => { GetTrialLessonList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.TrialList = res.Data; this.TrialList = res.Data;
...@@ -165,6 +163,7 @@ ...@@ -165,6 +163,7 @@
this.objOption.EndTime = ''; this.objOption.EndTime = '';
this.objOption.ClassRoomId = ''; this.objOption.ClassRoomId = '';
this.objOption.ClassContent = ''; this.objOption.ClassContent = '';
this.objOption.TrialLessonId = "";
} }
}) })
} }
...@@ -208,8 +207,6 @@ ...@@ -208,8 +207,6 @@
} }
}) })
}, },
} }
} }
</script>
</script> \ No newline at end of file
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
background: #f0f2f5 !important; background: #f0f2f5 !important;
border: 0; border: 0;
} }
</style> </style>
<template> <template>
<div class="schedulVisit"> <div class="schedulVisit">
...@@ -215,6 +214,7 @@ ...@@ -215,6 +214,7 @@
<q-icon name="edit" color="primary" style="font-size:11px" class="q-mr-xs"></q-icon> <q-icon name="edit" color="primary" style="font-size:11px" class="q-mr-xs"></q-icon>
<span style="font-size:12px;">到访</span> <span style="font-size:12px;">到访</span>
</q-btn> </q-btn>
<q-btn dense flat color="primary" label="添加试听" @click="CreateReserveclass(visitModel)"></q-btn>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-IsVisitStr="props"> <template v-slot:body-cell-IsVisitStr="props">
...@@ -289,11 +289,21 @@ ...@@ -289,11 +289,21 @@
</studentRight-form> </studentRight-form>
<student-audition v-if="isShowStuAudition" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList"> <student-audition v-if="isShowStuAudition" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
</student-audition> </student-audition>
<!--试听课弹窗-->
<q-dialog persistent v-model="isShowReserveclass">
<q-card flat class="q-pa-md" style="width:800px">
<div class="text-h6">新增试听课</div>
<reserveclass-form :save-Obj="stuOption" @close="closeReserveForm" @success="closeReserveForm">
</reserveclass-form>
</q-card>
</q-dialog>
</div> </div>
</template> </template>
<script> <script>
import studentRightForm from "../school/student/studentRight-form"; import studentRightForm from "../school/student/studentRight-form";
import studentAudition from "../school/student/student-audition" import studentAudition from "../school/student/student-audition"
import reserveclassForm from '../school/student/reserveclass-form'
import { import {
getTodayVisitList getTodayVisitList
} from "../../api/stuMan/index"; } from "../../api/stuMan/index";
...@@ -332,7 +342,8 @@ ...@@ -332,7 +342,8 @@
schedulFanke, schedulFanke,
studentAddForm, studentAddForm,
studentRightForm, studentRightForm,
studentAudition studentAudition,
reserveclassForm
}, },
computed: { computed: {
...mapGetters(["userInfo"]) ...mapGetters(["userInfo"])
...@@ -636,7 +647,8 @@ ...@@ -636,7 +647,8 @@
showTodayVist: [], showTodayVist: [],
trialList: [], trialList: [],
shwoTrialList: [], shwoTrialList: [],
stuOption:null stuOption: null,
isShowReserveclass: false, //是否显示试听课弹窗
}; };
}, },
watch: { watch: {
...@@ -670,6 +682,14 @@ ...@@ -670,6 +682,14 @@
this.initDutyTrialLessonList(); this.initDutyTrialLessonList();
}, },
methods: { methods: {
//添加试听
CreateReserveclass(item) {
this.isShowReserveclass = true;
},
//关闭试听弹窗
closeReserveForm() {
this.isShowReserveclass = false;
},
//点击学生姓名弹出 //点击学生姓名弹出
getStuRight(obj) { getStuRight(obj) {
if (obj) { if (obj) {
...@@ -681,7 +701,7 @@ ...@@ -681,7 +701,7 @@
this.isShowStuRight = true; this.isShowStuRight = true;
}, },
//点击预约到访的姓名 //点击预约到访的姓名
getStuAudition(obj){ getStuAudition(obj) {
if (obj) { if (obj) {
this.stuOption = obj; this.stuOption = obj;
} else { } else {
...@@ -690,7 +710,6 @@ ...@@ -690,7 +710,6 @@
this.isShowStuAudition = true; this.isShowStuAudition = true;
}, },
addFinishHandler(m, t) { addFinishHandler(m, t) {
console.log(m, t);
if (m && m.StuId) { if (m && m.StuId) {
if (t == 1) { if (t == 1) {
this.visitModel = m; this.visitModel = m;
...@@ -713,7 +732,6 @@ ...@@ -713,7 +732,6 @@
StuId: m.StuId, StuId: m.StuId,
VisitTime: d.getHours() + ":" + d.getMinutes() VisitTime: d.getHours() + ":" + d.getMinutes()
}; };
console.log("进来了呀", msg);
saveStudentVisit(msg).then(r => { saveStudentVisit(msg).then(r => {
this.visitModel = null this.visitModel = null
if (r.Data) { if (r.Data) {
...@@ -783,7 +801,7 @@ ...@@ -783,7 +801,7 @@
this.getVisitoryPage(); this.getVisitoryPage();
this.closeStuForm(); this.closeStuForm();
}, },
closeStuForm(){ closeStuForm() {
this.isShowStuRight = false; this.isShowStuRight = false;
this.isShowStuAudition = false; this.isShowStuAudition = false;
}, },
...@@ -927,9 +945,7 @@ ...@@ -927,9 +945,7 @@
} }
} }
}; };
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style>
</style> \ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<q-field filled class="q-pb-lg q-pr-lg" dense> <q-field filled class="q-pb-lg q-pr-lg" dense>
 <template v-slot:control>  <template v-slot:control>
<el-date-picker v-model="addMsg.ClassDate" ref="ClassDate" :rules="[val => !!val || '请选择预约日期']" <el-date-picker v-model="addMsg.ClassDate" ref="ClassDate" :rules="[val => !!val || '请选择预约日期']"
style="width:225px" size="mini" type="date" placeholder="预约日期" value-format="yyyy-MM-dd"> style="width:225px" size="mini" type="date" placeholder="预约日期" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</template> </template>
</q-field> </q-field>
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
ref="ClassRoomId" :options="ClassRoomList" label="关联教室" class="col-6 q-pb-lg q-pr-lg" emit-value map-options /> ref="ClassRoomId" :options="ClassRoomList" label="关联教室" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
<q-select filled stack-label option-value="Id" dense option-label="LessonName" v-model="addMsg.TrialLessonId" <q-select filled stack-label option-value="Id" dense option-label="LessonName" v-model="addMsg.TrialLessonId"
:options="TrialList" label="试听课程" class="col-6 q-pb-lg q-pr-lg" emit-value map-options /> :options="TrialList" label="试听课程" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
</div> </div>
<div class="row wrap justify-end q-pr-lg" style="margin-bottom:10px;"> <div class="row wrap justify-end q-pr-lg" style="margin-bottom:10px;">
<q-btn label="关闭" flat color="accent q-mb-lg" size="md" style="margin-right:10px;" @click="closeClassForm" />
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveAppointForm()" /> <q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveAppointForm()" />
</div> </div>
<audition-form v-if="isShowTeacher" @close="closeAuditForm" @getchildInfo="getchildInfo"></audition-form> <audition-form v-if="isShowTeacher" @close="closeAuditForm" @getchildInfo="getchildInfo"></audition-form>
...@@ -126,6 +126,10 @@ ...@@ -126,6 +126,10 @@
} }
}, },
methods: { methods: {
//关闭窗口
closeClassForm() {
this.$emit("success");
},
//选择主讲内容赋值选择教师 //选择主讲内容赋值选择教师
getTeacherChoose(content) { getTeacherChoose(content) {
var TList = []; var TList = [];
...@@ -257,7 +261,7 @@ ...@@ -257,7 +261,7 @@
this.addMsg.ClassTime = obj.ClassTime; this.addMsg.ClassTime = obj.ClassTime;
this.addMsg.EndTime = obj.EndTime; this.addMsg.EndTime = obj.EndTime;
this.addMsg.ClassContent = obj.ClassContent; this.addMsg.ClassContent = obj.ClassContent;
this.addMsg.TrialLessonId=obj.TrialLessonId; this.addMsg.TrialLessonId = obj.TrialLessonId;
} }
}, },
} }
......
<style> <style>
.Student_Date .el-input__inner {
background: transparent !important;
border: 0 !important;
padding-right: 0 !important;
}
</style> </style>
<template> <template>
<div> <div>
......
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