Skip to content

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

页面修改

parent e2e57b9e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 284 deletions
src/components/course/classinfo-form.vue
View file @ 0ceef7e1
......@@ -89,7 +89,7 @@
<div v-if="tabCheck=='first'" style="margin:0 15px;">
 <classstuForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></classstuForm>
</div>
<div v-if="tabCheck=='second'">
<div v-if="tabCheck=='second'">
 <lessForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></lessForm>
</div>
<div v-if="tabCheck=='third'">
......
src/components/course/classlist.vue
View file @ 0ceef7e1
......@@ -127,7 +127,6 @@
</q-td>
</template>
<template v-slot:bottom>
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
......
src/components/course/classmate-form.vue
View file @ 0ceef7e1
......@@ -35,7 +35,6 @@
max-height: calc(100vh - 235px);
height: calc(100vh - 235px);
overflow-y: overlay;
/* margin-right: -3px; */
}
.planTabDiv::-webkit-scrollbar {
......
src/components/course/classstu-form.vue
View file @ 0ceef7e1
......@@ -97,13 +97,13 @@
<span style="color:red;cursor:pointer" v-if="props.row.JoinType==3">
续费报入
<q-tooltip :offset="[10, 10]">
原订单{{props.row.SourceClassName}}班级续费。关联单号{{props.row.SourceOrderId}}
原订单{{props.row.SourceClassName}}班级续费。关联单号{{props.row.SourceOrderId}}
</q-tooltip>
</span>
<span style="color:red;cursor:pointer" v-if="props.row.JoinType==4">
转班报入
<q-tooltip :offset="[10, 10]">
从{{props.row.SourceClassName}}班级转入。关联单号{{props.row.SourceOrderId}}
从{{props.row.SourceClassName}}班级转入。关联单号{{props.row.SourceOrderId}}
</q-tooltip>
</span>
</q-td>
......@@ -348,5 +348,4 @@
}
}
}
</script>
</script>
\ No newline at end of file
src/components/course/courseprice-form.vue
View file @ 0ceef7e1
......@@ -15,8 +15,9 @@
background-color: #3FC4FF;
margin-right: 5px;
}
.courseMainTbale td{
padding:0 3px;
.courseMainTbale td {
padding: 0 3px;
}
</style>
<template>
......@@ -119,7 +120,8 @@
</td>
<td>
<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 style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(3)}}
......@@ -137,7 +139,8 @@
</td>
<td>
<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 style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(4)}}
......@@ -160,7 +163,8 @@
</td>
<td>
<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 style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(5)}}
......@@ -178,7 +182,8 @@
</td>
<td>
<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 style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(6)}}
......@@ -202,7 +207,8 @@
<td>
<q-input filled stack-label dense v-model="priceObj.courseObj.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 style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(7)}}
......@@ -221,7 +227,8 @@
<td>
<q-input filled stack-label dense v-model="priceObj.courseObj.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 style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(8)}}
......@@ -245,7 +252,8 @@
<td>
<q-input filled stack-label dense v-model="priceObj.courseObj.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 style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(9)}}
......@@ -264,7 +272,8 @@
<td>
<q-input filled stack-label dense v-model="priceObj.courseObj.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 style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(10)}}
......@@ -287,7 +296,8 @@
</td>
<td>
<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 style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(11)}}
......@@ -305,7 +315,8 @@
</td>
<td>
<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 style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(12)}}
......@@ -323,7 +334,6 @@
</td>
</tr>
</table>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
......@@ -592,7 +602,8 @@
//首次优惠
var Count = ''
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 (this.priceObj.courseObj.B2BRebateRatio) {
let num = currentPrice * Number(this.priceObj.courseObj.B2BRebateRatio) / 100;
......@@ -666,5 +677,4 @@
}
}
};
</script>
</script>
\ No newline at end of file
src/components/course/lessoncheck-form.vue
View file @ 0ceef7e1
......@@ -65,8 +65,8 @@
//选择保存
saveCourse() {
if (JSON.stringify(this.checkedRow) != "{}") {
this.$emit('success',this.checkedRow);
this.closeCourseForm();
this.$emit('success', this.checkedRow);
this.closeCourseForm();
} else {
this.$q.notify({
type: 'negative',
......@@ -75,7 +75,7 @@
})
}
},
getCreatTime(time){
getCreatTime(time) {
return time.replace("T", " ");
},
//关闭弹窗
......@@ -85,5 +85,4 @@
},
}
}
</script>
</script>
\ No newline at end of file
src/components/course/listen-form.vue
View file @ 0ceef7e1
......@@ -10,9 +10,8 @@
class="col-12 q-pb-lg" label="试听课程名称" :rules="[val => !!val || '请填写试听课程名称']" />
</div>
<div class="row wrap">
<q-select stack-label class="col-12 q-pb-lg" color="primary" filled label="试听课主讲老师"
option-value="TId" option-label="TeacherName" :options="TeacherList" v-model="objOption.TeacherId"
emit-value map-options />
<q-select stack-label class="col-12 q-pb-lg" color="primary" filled label="试听课主讲老师" option-value="TId"
option-label="TeacherName" :options="TeacherList" v-model="objOption.TeacherId" emit-value map-options />
</div>
<div class="row wrap">
<q-input filled stack-label :dense="false" v-model="objOption.ClassHourFee" ref="ClassHourFee"
......@@ -98,7 +97,7 @@
Id: this.saveObj.Id
}).then(res => {
if (res.Code == 1) {
let temData = res.Data;
let temData = res.Data;
this.objOption.Id = temData.Id;
this.objOption.LessonName = temData.LessonName;
this.objOption.TeacherId = temData.TeacherId;
......@@ -143,5 +142,4 @@
}
}
}
</script>
</script>
\ No newline at end of file
src/components/course/mateitem.vue
View file @ 0ceef7e1
......@@ -30,7 +30,8 @@
<div class="plan_Inner" v-if="subItem.GuestList&&subItem.GuestList.length>0">
<div class="plan_LeftTitle">学生名称：</div>
<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 class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
......
src/components/course/shift-form.vue
View file @ 0ceef7e1
......@@ -239,7 +239,8 @@
})
}
},
removeshift(obj) { //删除
//删除
removeshift(obj) {
let that = this;
this.$q.dialog({
title: "提示",
......
src/components/course/studentFee.vue
View file @ 0ceef7e1
......@@ -435,7 +435,6 @@
this.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true))
})
this.isShowBanMenu = false;
},
//删除列
......@@ -627,7 +626,6 @@
}
})
},
//修改表格横向内容
getInnerEdit(item) {
this.isShowInnerEdit = true;
......
src/components/exam/examtemplate-form.vue
View file @ 0ceef7e1
......@@ -18,7 +18,7 @@
class="sticky-column-table sticky-header-column-table" style="max-height: 550px" separator="none"
:data="dataList" :columns="columns" row-key="TemplateId" selection="single"
:selected.sync="selectedTemplate">
<template v-slot:top="props">
<template v-slot:top>
<div class="col-2 q-table__title">模板列表</div>
<q-space />
</template>
......
src/components/exam/paperfolder-form.vue
View file @ 0ceef7e1
......@@ -52,7 +52,6 @@
},
mounted() {
this.initObj()
},
methods: {
......
src/components/exam/question-form.vue
View file @ 0ceef7e1
......@@ -191,9 +191,7 @@
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
</style>
\ No newline at end of file
src/components/sale/orderlist.vue
View file @ 0ceef7e1
This diff is collapsed.
src/components/schedul/appoint-form.vue
View file @ 0ceef7e1
......@@ -15,7 +15,6 @@
.time-select {
z-index: 9999 !important;
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeAppointForm">
......@@ -36,8 +35,8 @@
</template>
</q-input>
<div class="Sysuser_Date">
<q-field filled class="q-pb-lg">
  <template v-slot:control>
<q-field filled class="q-pb-lg">
<template v-slot:control>
<el-time-select v-model="addMsg.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{
start: '09:00',
step: '00:15',
......@@ -55,9 +54,10 @@
</template>
</q-field>
</div>
<q-select filled stack-label option-value="Name" option-label="Name" @input="getTeacherChoose(addMsg.ClassContent)" v-model="addMsg.ClassContent"
ref="ClassContent" :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="Name" option-label="Name"
@input="getTeacherChoose(addMsg.ClassContent)" v-model="addMsg.ClassContent" ref="ClassContent"
: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"
ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false" class="col-6 q-pb-lg" emit-value
map-options />
......@@ -237,15 +237,15 @@
}
},
//选择主讲内容赋值选择教师
getTeacherChoose(content){
getTeacherChoose(content) {
var TList = [];
this.addMsg.TeacherId='';
this.addMsg.TeacherId = '';
this.TeacherList = this.AllTeacherList;
this.TeacherList.forEach(x=>{
this.ContentList.forEach(y=>{
if(y.Name==content){
if(x.TId>0){
if(x.ChooseSpecialty.indexOf(y.Id)>-1){
this.TeacherList.forEach(x => {
this.ContentList.forEach(y => {
if (y.Name == content) {
if (x.TId > 0) {
if (x.ChooseSpecialty.indexOf(y.Id) > -1) {
TList.push(x);
}
}
......@@ -256,5 +256,4 @@
}
}
}
</script>
</script>
\ No newline at end of file
src/components/schedul/audition-form.vue
View file @ 0ceef7e1
......@@ -7,7 +7,7 @@
<q-card-section>
<div class="row wrap">
<div class="col-6 q-pb-lg q-pr-lg">
<q-field borderless>
<q-field borderless>
 <template v-slot:prepend>
<q-input filled v-model="msg.StartClassDate" mask="date" label="开始日期">
<template v-slot:append>
......@@ -154,7 +154,7 @@
var year = nowDay.getFullYear(); //年
var month = nowDay.getMonth() + 1; //月
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.getList();
},
......@@ -199,7 +199,7 @@
this.StuObj.ClassTime = item.ClassTime;
this.StuObj.EndTime = item.EndTime;
this.StuObj.ClassContent = item.ClassContent;
this.StuObj.TrialLessonId=item.TrialLessonId;
this.StuObj.TrialLessonId = item.TrialLessonId;
}
this.$emit('getchildInfo', this.StuObj);
this.closeSaveForm();
......@@ -208,15 +208,13 @@
this.$refs.StartClassDate.hide();
this.resetSearch();
},
getEndTime()
{
getEndTime() {
this.$refs.EndClassDate.hide();
this.resetSearch();
}
},
}
</script>
<style>
</style>
</style>
\ No newline at end of file
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