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

页面修改

parent e2e57b9e
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<div v-if="tabCheck=='first'" style="margin:0 15px;"> <div v-if="tabCheck=='first'" style="margin:0 15px;">
 <classstuForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></classstuForm>  <classstuForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></classstuForm>
</div> </div>
<div v-if="tabCheck=='second'"> <div v-if="tabCheck=='second'">
 <lessForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></lessForm>  <lessForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></lessForm>
</div> </div>
<div v-if="tabCheck=='third'"> <div v-if="tabCheck=='third'">
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
max-height: calc(100vh - 235px); max-height: calc(100vh - 235px);
height: calc(100vh - 235px); height: calc(100vh - 235px);
overflow-y: overlay; overflow-y: overlay;
/* margin-right: -3px; */
} }
.planTabDiv::-webkit-scrollbar { .planTabDiv::-webkit-scrollbar {
......
...@@ -348,5 +348,4 @@ ...@@ -348,5 +348,4 @@
} }
} }
} }
</script> </script>
\ No newline at end of file
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
background-color: #3FC4FF; background-color: #3FC4FF;
margin-right: 5px; margin-right: 5px;
} }
.courseMainTbale td{
padding:0 3px; .courseMainTbale td {
padding: 0 3px;
} }
</style> </style>
<template> <template>
...@@ -119,7 +120,8 @@ ...@@ -119,7 +120,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.B2BRebateRatio" ref="B2BRebateRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.B2BRebateRatio" ref="B2BRebateRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'B2BRebateRatio'),getShouBAO(3)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'B2BRebateRatio'),getShouBAO(3)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(3)}} {{getShouBAO(3)}}
...@@ -137,7 +139,8 @@ ...@@ -137,7 +139,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.B2BReNewRatio" ref="B2BReNewRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.B2BReNewRatio" ref="B2BReNewRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'B2BReNewRatio'),getShouBAO(4)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'B2BReNewRatio'),getShouBAO(4)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(4)}} {{getShouBAO(4)}}
...@@ -160,7 +163,8 @@ ...@@ -160,7 +163,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.SchoolRebateRatio" ref="SchoolRebateRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.SchoolRebateRatio" ref="SchoolRebateRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'SchoolRebateRatio'),getShouBAO(5)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'SchoolRebateRatio'),getShouBAO(5)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(5)}} {{getShouBAO(5)}}
...@@ -178,7 +182,8 @@ ...@@ -178,7 +182,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.SchoolReNewRatio" ref="SchoolReNewRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.SchoolReNewRatio" ref="SchoolReNewRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'SchoolReNewRatio'),getShouBAO(6)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'SchoolReNewRatio'),getShouBAO(6)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(6)}} {{getShouBAO(6)}}
...@@ -202,7 +207,8 @@ ...@@ -202,7 +207,8 @@
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceRatio"
ref="TransIntroductceRatio" ref="TransIntroductceRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'TransIntroductceRatio'),getShouBAO(7)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'TransIntroductceRatio'),getShouBAO(7)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(7)}} {{getShouBAO(7)}}
...@@ -221,7 +227,8 @@ ...@@ -221,7 +227,8 @@
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceReNewRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceReNewRatio"
ref="TransIntroductceReNewRatio" ref="TransIntroductceReNewRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'TransIntroductceReNewRatio'),getShouBAO(8)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'TransIntroductceReNewRatio'),getShouBAO(8)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(8)}} {{getShouBAO(8)}}
...@@ -245,7 +252,8 @@ ...@@ -245,7 +252,8 @@
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendRatio"
ref="InnerRecommendRatio" ref="InnerRecommendRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'InnerRecommendRatio'),getShouBAO(9)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'InnerRecommendRatio'),getShouBAO(9)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(9)}} {{getShouBAO(9)}}
...@@ -264,7 +272,8 @@ ...@@ -264,7 +272,8 @@
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendReNewRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendReNewRatio"
ref="InnerRecommendReNewRatio" ref="InnerRecommendReNewRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'InnerRecommendReNewRatio'),getShouBAO(10)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'InnerRecommendReNewRatio'),getShouBAO(10)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(10)}} {{getShouBAO(10)}}
...@@ -287,7 +296,8 @@ ...@@ -287,7 +296,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.B2CRbRatio" ref="B2CRbRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.B2CRbRatio" ref="B2CRbRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'B2CRbRatio'),getShouBAO(11)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'B2CRbRatio'),getShouBAO(11)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(11)}} {{getShouBAO(11)}}
...@@ -305,7 +315,8 @@ ...@@ -305,7 +315,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.B2CRNRatio" ref="B2CRNRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.B2CRNRatio" ref="B2CRNRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'B2CRNRatio'),getShouBAO(12)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'B2CRNRatio'),getShouBAO(12)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(12)}} {{getShouBAO(12)}}
...@@ -323,7 +334,6 @@ ...@@ -323,7 +334,6 @@
</td> </td>
</tr> </tr>
</table> </table>
</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">
...@@ -592,7 +602,8 @@ ...@@ -592,7 +602,8 @@
//首次优惠 //首次优惠
var Count = '' var Count = ''
var currentPrice = Number(100 - this.priceObj.courseObj.B2CRatio) * this.priceObj.courseObj.SellPrice / 100; var currentPrice = Number(100 - this.priceObj.courseObj.B2CRatio) * this.priceObj.courseObj.SellPrice / 100;
var currrntXufei = Number(100 - this.priceObj.courseObj.B2CReNewRatio) * this.priceObj.courseObj.SellPrice / 100; var currrntXufei = Number(100 - this.priceObj.courseObj.B2CReNewRatio) * this.priceObj.courseObj.SellPrice /
100;
if (type == 3) { if (type == 3) {
if (this.priceObj.courseObj.B2BRebateRatio) { if (this.priceObj.courseObj.B2BRebateRatio) {
let num = currentPrice * Number(this.priceObj.courseObj.B2BRebateRatio) / 100; let num = currentPrice * Number(this.priceObj.courseObj.B2BRebateRatio) / 100;
...@@ -666,5 +677,4 @@ ...@@ -666,5 +677,4 @@
} }
} }
}; };
</script> </script>
\ No newline at end of file
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
//选择保存 //选择保存
saveCourse() { saveCourse() {
if (JSON.stringify(this.checkedRow) != "{}") { if (JSON.stringify(this.checkedRow) != "{}") {
this.$emit('success',this.checkedRow); this.$emit('success', this.checkedRow);
this.closeCourseForm(); this.closeCourseForm();
} else { } else {
this.$q.notify({ this.$q.notify({
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
}) })
} }
}, },
getCreatTime(time){ getCreatTime(time) {
return time.replace("T", " "); return time.replace("T", " ");
}, },
//关闭弹窗 //关闭弹窗
...@@ -85,5 +85,4 @@ ...@@ -85,5 +85,4 @@
}, },
} }
} }
</script> </script>
\ No newline at end of file
...@@ -10,9 +10,8 @@ ...@@ -10,9 +10,8 @@
class="col-12 q-pb-lg" label="试听课程名称" :rules="[val => !!val || '请填写试听课程名称']" /> class="col-12 q-pb-lg" label="试听课程名称" :rules="[val => !!val || '请填写试听课程名称']" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<q-select stack-label class="col-12 q-pb-lg" color="primary" filled label="试听课主讲老师" <q-select stack-label class="col-12 q-pb-lg" color="primary" filled label="试听课主讲老师" option-value="TId"
option-value="TId" option-label="TeacherName" :options="TeacherList" v-model="objOption.TeacherId" option-label="TeacherName" :options="TeacherList" v-model="objOption.TeacherId" emit-value map-options />
emit-value map-options />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<q-input filled stack-label :dense="false" v-model="objOption.ClassHourFee" ref="ClassHourFee" <q-input filled stack-label :dense="false" v-model="objOption.ClassHourFee" ref="ClassHourFee"
...@@ -143,5 +142,4 @@ ...@@ -143,5 +142,4 @@
} }
} }
} }
</script> </script>
\ No newline at end of file
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
<div class="plan_Inner" v-if="subItem.GuestList&&subItem.GuestList.length>0"> <div class="plan_Inner" v-if="subItem.GuestList&&subItem.GuestList.length>0">
<div class="plan_LeftTitle">学生名称:</div> <div class="plan_LeftTitle">学生名称:</div>
<div class="plan_RightInner"> <div class="plan_RightInner">
<span style="margin-right:10px;" v-for="(tItem,tIndex) in subItem.GuestList" :key="tIndex">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="(tItem,tIndex) in subItem.GuestList"
:key="tIndex">{{tItem.GuestName}}</span>
</div> </div>
</div> </div>
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0"> <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
......
...@@ -239,7 +239,8 @@ ...@@ -239,7 +239,8 @@
}) })
} }
}, },
removeshift(obj) { //删除 //删除
removeshift(obj) {
let that = this; let that = this;
this.$q.dialog({ this.$q.dialog({
title: "提示", title: "提示",
......
...@@ -435,7 +435,6 @@ ...@@ -435,7 +435,6 @@
this.dataList.List.forEach(x => { this.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true)) x.FullClassList.sort(this.compare('StartValue', true))
}) })
this.isShowBanMenu = false; this.isShowBanMenu = false;
}, },
//删除列 //删除列
...@@ -627,7 +626,6 @@ ...@@ -627,7 +626,6 @@
} }
}) })
}, },
//修改表格横向内容 //修改表格横向内容
getInnerEdit(item) { getInnerEdit(item) {
this.isShowInnerEdit = true; this.isShowInnerEdit = true;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
class="sticky-column-table sticky-header-column-table" style="max-height: 550px" separator="none" class="sticky-column-table sticky-header-column-table" style="max-height: 550px" separator="none"
:data="dataList" :columns="columns" row-key="TemplateId" selection="single" :data="dataList" :columns="columns" row-key="TemplateId" selection="single"
:selected.sync="selectedTemplate"> :selected.sync="selectedTemplate">
<template v-slot:top="props"> <template v-slot:top>
<div class="col-2 q-table__title">模板列表</div> <div class="col-2 q-table__title">模板列表</div>
<q-space /> <q-space />
</template> </template>
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
}, },
mounted() { mounted() {
this.initObj() this.initObj()
}, },
methods: { methods: {
......
...@@ -191,9 +191,7 @@ ...@@ -191,9 +191,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
This diff is collapsed.
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
.time-select { .time-select {
z-index: 9999 !important; z-index: 9999 !important;
} }
</style> </style>
<template> <template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeAppointForm"> <q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeAppointForm">
...@@ -36,8 +35,8 @@ ...@@ -36,8 +35,8 @@
</template> </template>
</q-input> </q-input>
<div class="Sysuser_Date"> <div class="Sysuser_Date">
<q-field filled class="q-pb-lg"> <q-field filled class="q-pb-lg">
  <template v-slot:control> <template v-slot:control>
<el-time-select v-model="addMsg.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{ <el-time-select v-model="addMsg.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{
start: '09:00', start: '09:00',
step: '00:15', step: '00:15',
...@@ -55,9 +54,10 @@ ...@@ -55,9 +54,10 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<q-select filled stack-label option-value="Name" option-label="Name" @input="getTeacherChoose(addMsg.ClassContent)" v-model="addMsg.ClassContent" <q-select filled stack-label option-value="Name" option-label="Name"
ref="ClassContent" :options="ContentList" :rules="[val => !!val || '请选择主讲内容']" label="主讲内容" :dense="false" @input="getTeacherChoose(addMsg.ClassContent)" v-model="addMsg.ClassContent" ref="ClassContent"
class="col-6 q-pb-lg" emit-value map-options /> :options="ContentList" :rules="[val => !!val || '请选择主讲内容']" label="主讲内容" :dense="false" class="col-6 q-pb-lg"
emit-value map-options />
<q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="addMsg.TeacherId" <q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="addMsg.TeacherId"
ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false" class="col-6 q-pb-lg" emit-value ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false" class="col-6 q-pb-lg" emit-value
map-options /> map-options />
...@@ -237,15 +237,15 @@ ...@@ -237,15 +237,15 @@
} }
}, },
//选择主讲内容赋值选择教师 //选择主讲内容赋值选择教师
getTeacherChoose(content){ getTeacherChoose(content) {
var TList = []; var TList = [];
this.addMsg.TeacherId=''; this.addMsg.TeacherId = '';
this.TeacherList = this.AllTeacherList; this.TeacherList = this.AllTeacherList;
this.TeacherList.forEach(x=>{ this.TeacherList.forEach(x => {
this.ContentList.forEach(y=>{ this.ContentList.forEach(y => {
if(y.Name==content){ if (y.Name == content) {
if(x.TId>0){ if (x.TId > 0) {
if(x.ChooseSpecialty.indexOf(y.Id)>-1){ if (x.ChooseSpecialty.indexOf(y.Id) > -1) {
TList.push(x); TList.push(x);
} }
} }
...@@ -256,5 +256,4 @@ ...@@ -256,5 +256,4 @@
} }
} }
} }
</script> </script>
\ No newline at end of file
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<q-card-section> <q-card-section>
<div class="row wrap"> <div class="row wrap">
<div class="col-6 q-pb-lg q-pr-lg"> <div class="col-6 q-pb-lg q-pr-lg">
<q-field borderless> <q-field borderless>
 <template v-slot:prepend>  <template v-slot:prepend>
<q-input filled v-model="msg.StartClassDate" mask="date" label="开始日期"> <q-input filled v-model="msg.StartClassDate" mask="date" label="开始日期">
<template v-slot:append> <template v-slot:append>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
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(); //日
var currentDay= year + '-' + (month<10?('0'+month):month) + '-' + day; var currentDay = year + '-' + (month < 10 ? ('0' + month) : month) + '-' + day;
this.msg.StartClassDate = currentDay; this.msg.StartClassDate = currentDay;
this.getList(); this.getList();
}, },
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
this.StuObj.ClassTime = item.ClassTime; this.StuObj.ClassTime = item.ClassTime;
this.StuObj.EndTime = item.EndTime; this.StuObj.EndTime = item.EndTime;
this.StuObj.ClassContent = item.ClassContent; this.StuObj.ClassContent = item.ClassContent;
this.StuObj.TrialLessonId=item.TrialLessonId; this.StuObj.TrialLessonId = item.TrialLessonId;
} }
this.$emit('getchildInfo', this.StuObj); this.$emit('getchildInfo', this.StuObj);
this.closeSaveForm(); this.closeSaveForm();
...@@ -208,14 +208,12 @@ ...@@ -208,14 +208,12 @@
this.$refs.StartClassDate.hide(); this.$refs.StartClassDate.hide();
this.resetSearch(); this.resetSearch();
}, },
getEndTime() getEndTime() {
{
this.$refs.EndClassDate.hide(); this.$refs.EndClassDate.hide();
this.resetSearch(); this.resetSearch();
} }
}, },
} }
</script> </script>
<style> <style>
......
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