Skip to content

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

新增页面验证

parent da423870
Show whitespace changes
Inline Side-by-side
Showing with 2820 additions and 2719 deletions
src/components/course/class-form.vue
View file @ c7884d55
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
emit-value map-options /> emit-value map-options />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.ClassPersion" <q-input filled stack-label maxlength="3" :dense="false" v-model="objOption.ClassPersion"
ref="ClassPersion" class="col-6 q-pr-lg q-pb-lg" label="招生人数" :rules="[val => !!val || '请填写招生人数']" /> ref="ClassPersion" class="col-6 q-pr-lg q-pb-lg" label="招生人数" @keyup.native="checkInteger(objOption,'ClassPersion')" :rules="[val => !!val || '请填写招生人数']" />
</div> </div>
</div> </div>
<div class="row wrap"> <div class="row wrap">
...@@ -127,12 +127,12 @@ ...@@ -127,12 +127,12 @@
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.OriginalPrice" <q-input filled stack-label maxlength="8" :dense="false" v-model="objOption.OriginalPrice"
ref="OriginalPrice" class="col-6 q-pr-lg q-pb-lg" label="原价" :rules="[val => !!val || '请填写原价']" /> ref="OriginalPrice" class="col-6 q-pr-lg q-pb-lg" label="原价" @keyup.native="checkPrice(objOption,'OriginalPrice')" :rules="[val => !!val || '请填写原价']" />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.SellPrice" ref="SellPrice" <q-input filled stack-label maxlength="8" :dense="false" v-model="objOption.SellPrice" ref="SellPrice"
class="col-6 q-pr-lg q-pb-lg" label="卖价" :rules="[val => !!val || '请填写卖价']" /> class="col-6 q-pr-lg q-pb-lg" label="卖价" @keyup.native="checkPrice(objOption,'SellPrice')" :rules="[val => !!val || '请填写卖价']" />
</div> </div>
</div> </div>
<div class="row wrap"> <div class="row wrap">
...@@ -159,11 +159,11 @@ ...@@ -159,11 +159,11 @@
<template v-if="objOption.IsStepPrice==1"> <template v-if="objOption.IsStepPrice==1">
<div class="row wrap" v-for="(item,index) in ladderPriceList" :key="index"> <div class="row wrap" v-for="(item,index) in ladderPriceList" :key="index">
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" v-model="item.PersionNum" :dense="false" <q-input filled stack-label maxlength="3" v-model="item.PersionNum" @keyup.native="checkInteger(item,'PersionNum')" :dense="false"
class="col-6 q-pr-lg q-pb-lg" label="人" /> class="col-6 q-pr-lg q-pb-lg" label="人" />
</div> </div>
<div class="col-6" style="position:relative;"> <div class="col-6" style="position:relative;">
<q-input filled stack-label maxlength="20" v-model="item.PersionPrice" :dense="false" <q-input filled stack-label maxlength="8" v-model="item.PersionPrice" @keyup.native="checkPrice(item,'PersionPrice')" :dense="false"
class="col-6 q-pr-lg q-pb-lg" label="价格" /> class="col-6 q-pr-lg q-pb-lg" label="价格" />
<q-btn style="position:absolute;right:-5px;top:20px;" size="6px" @click="delStepPrice(index)" round <q-btn style="position:absolute;right:-5px;top:20px;" size="6px" @click="delStepPrice(index)" round
color="red" icon="iconfont icon-guanbi1" /> color="red" icon="iconfont icon-guanbi1" />
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<div class="col-12"> <div class="col-12">
<q-field filled class="col-6 q-pr-lg q-pb-lg"> <q-field filled class="col-6 q-pr-lg q-pb-lg">
 <template v-slot:control>  <template v-slot:control>
<el-input placeholder="数值" v-model="objOption.CommissionValue"> <el-input placeholder="数值" maxlength="8" v-model="objOption.CommissionValue" @keyup.native="checkPrice(objOption,'CommissionValue')">
<template slot="append"> <template slot="append">
<span v-if="objOption.CommissionType==1">人</span> <span v-if="objOption.CommissionType==1">人</span>
<span v-if="objOption.CommissionType==2">%</span> <span v-if="objOption.CommissionType==2">%</span>
...@@ -269,8 +269,8 @@ ...@@ -269,8 +269,8 @@
</template> </template>
<div class="row wrap" style="margin-top:30px;"> <div class="row wrap" style="margin-top:30px;">
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" v-model="objOption.ClassHours" :dense="false" <q-input filled stack-label maxlength="6" v-model="objOption.ClassHours" :dense="false"
class="col-6 q-pr-lg q-pb-lg" label="学习课时" /> class="col-6 q-pr-lg q-pb-lg" label="学习课时" @keyup.native="checkInteger(objOption,'ClassHours')" />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-select filled stack-label option-value="CTypeId" option-label="CTypeName" v-model="objOption.ClassType" <q-select filled stack-label option-value="CTypeId" option-label="CTypeName" v-model="objOption.ClassType"
......
src/components/course/classFee.vue
View file @ c7884d55
<style> <style>
.socialTable { .socialTable {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
} }
.socialTable tr th { .socialTable tr th {
background: #fff; background: #fff;
height: 40px; height: 40px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
border: 1px solid #E6E6E6 border: 1px solid #E6E6E6
} }
.socialTable tr { .socialTable tr {
background: #fff; background: #fff;
text-align: center; text-align: center;
height: 40px; height: 40px;
} }
.socialTable tr td { .socialTable tr td {
font-size: 12px; font-size: 12px;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
.Classdel_Div i, .Classdel_Div i,
.div_RowList i { .div_RowList i {
display: inline-block; display: inline-block;
color: red; color: red;
visibility: hidden; visibility: hidden;
cursor: pointer; cursor: pointer;
margin-left: 3px; margin-left: 3px;
} }
.Classdel_Div:hover i { .Classdel_Div:hover i {
visibility: visible; visibility: visible;
} }
.div_RowList:hover i { .div_RowList:hover i {
visibility: visible; visibility: visible;
} }
</style> </style>
<template> <template>
<div> <div>
<div class="col" style="display:flex;margin-top:20px;"> <div class="col" style="display:flex;margin-top:20px;">
<div> <div>
<q-select class="q-pb-lg q-pr-lg" style="width:450px;" multiple clearable filled stack-label use-input use-chips option-value="CTypeId" option-label="CTypeName" v-model="tempSchool" ref="PostId" :options="DropDownList" label="班级类型" :dense="false" emit-value map-options> <q-select class="q-pb-lg q-pr-lg" style="width:450px;" multiple clearable filled stack-label use-input use-chips
option-value="CTypeId" option-label="CTypeName" v-model="tempSchool" ref="PostId" :options="DropDownList"
label="班级类型" :dense="false" emit-value map-options>
</q-select> </q-select>
</div> </div>
<div style="margin-top:15px;"> <div style="margin-top:15px;">
<q-btn color="accent" size="sm" @click="saveClass()" ref="addBtn" label="保存" /> <q-btn color="accent" size="sm" @click="saveClass()" ref="addBtn" label="保存" />
</div> </div>
</div> </div>
<table class="socialTable"> <table class="socialTable">
<tr> <tr>
<th :colspan="FullClassRateList.length+4"> <th :colspan="FullClassRateList.length+4">
...@@ -59,7 +61,8 @@ ...@@ -59,7 +61,8 @@
</th> </th>
</tr> </tr>
<tr> <tr>
<td style="width:200px;" v-if="dataList.List&&dataList.List.length>0" :rowspan="(dataList.List.length*2)+3">平均上课率</td> <td style="width:200px;" v-if="dataList.List&&dataList.List.length>0" :rowspan="(dataList.List.length*2)+3">
平均上课率</td>
<td :colspan="FullClassRateList.length+3">满班率</td> <td :colspan="FullClassRateList.length+3">满班率</td>
</tr> </tr>
<tr> <tr>
...@@ -74,14 +77,17 @@ ...@@ -74,14 +77,17 @@
<q-banner v-if="isShowColEdit"> <q-banner v-if="isShowColEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.StartValue" @keyup.native="checkPrice(editObj,'StartValue')"
maxlength="6" class="col-5 q-pb-lg">
</q-input> </q-input>
<div style="margin:20px 12px 0">-</div> <div style="margin:20px 12px 0">-</div>
<q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.EndValue" @keyup.native="checkPrice(editObj,'EndValue')"
maxlength="6" class="col-5 q-pb-lg">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false"
style="font-weight:400 !important" />
<q-btn label="确认" @click="editManBan()" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="editManBan()" color="accent q-px-md" style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -94,12 +100,17 @@ ...@@ -94,12 +100,17 @@
<q-banner v-if="isShowBanMenu"> <q-banner v-if="isShowBanMenu">
<div style="width:250px;"> <div style="width:250px;">
<div style="margin:10px 0 15px 0;">新增满班率</div> <div style="margin:10px 0 15px 0;">新增满班率</div>
<q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率"> <q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最小满班率']" @keyup.native="checkPrice(addBanObj,'StartValue')"
maxlength="6" label="最小满班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大满班率']" mask="date" label="最大满班率"> <q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最大满班率']" @keyup.native="checkPrice(addBanObj,'EndValue')" maxlength="6"
label="最大满班率">
</q-input> </q-input>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false"
style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addColList()" /> <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addColList()" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -114,7 +125,8 @@ ...@@ -114,7 +125,8 @@
<div class="div_RowList"> <div class="div_RowList">
{{item.StartValue}}<span v-if="item.StartValue>=0">%</span> {{item.StartValue}}<span v-if="item.StartValue>=0">%</span>
<template v-if="item.StartValue!=item.EndValue"> <template v-if="item.StartValue!=item.EndValue">
<span v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span v-if="item.EndValue>=0">%</span> <span v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span
v-if="item.EndValue>=0">%</span>
</template> </template>
<i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i> <i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i>
</div> </div>
...@@ -122,14 +134,17 @@ ...@@ -122,14 +134,17 @@
<q-banner v-if="isShowrowEdit"> <q-banner v-if="isShowrowEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.StartValue" @keyup.native="checkPrice(editObj,'StartValue')"
maxlength="6" class="col-5 q-pb-lg">
</q-input> </q-input>
<div style="margin:20px 12px 0">-</div> <div style="margin:20px 12px 0">-</div>
<q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.EndValue" @keyup.native="checkPrice(editObj,'EndValue')"
maxlength="6" class="col-5 q-pb-lg">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="editShangke()" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="editShangke()" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -142,11 +157,12 @@ ...@@ -142,11 +157,12 @@
<q-banner v-if="isShowInnerEdit"> <q-banner v-if="isShowInnerEdit">
<div style="width:180px;margin-top:20px;"> <div style="width:180px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="CommonClassMoney" class="q-pb-lg" mask="date"> <q-input filled v-model="ComMsg.CommonClassMoney" @keyup.native="checkPrice(ComMsg,'CommonClassMoney')" maxlength="6" class="q-pb-lg">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="getReset(subItem)" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="getReset(subItem)" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -158,18 +174,16 @@ ...@@ -158,18 +174,16 @@
<td>增加带班人数</td> <td>增加带班人数</td>
<td v-for="(subItem,subIndex) in item.FullClassList" @click="getPeopleEdit(subItem)"> <td v-for="(subItem,subIndex) in item.FullClassList" @click="getPeopleEdit(subItem)">
{{subItem.PeopelNum}} {{subItem.PeopelNum}}
<!--<q-popup-edit v-model.number="subItem.PeopelNum" buttons>
<q-input v-model="subItem.PeopelNum" @change="getReset()" dense autofocus counter />
</q-popup-edit> -->
<q-popup-proxy> <q-popup-proxy>
<q-banner v-if="isShowInnerEdit"> <q-banner v-if="isShowInnerEdit">
<div style="width:180px;margin-top:20px;"> <div style="width:180px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="CommonPeople" class="q-pb-lg" mask="date"> <q-input filled v-model="ComMsg.CommonPeople" @keyup.native="checkPrice(ComMsg,'CommonPeople')" maxlength="6" class="q-pb-lg">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="getPeopleSet(subItem)" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="getPeopleSet(subItem)" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -185,12 +199,17 @@ ...@@ -185,12 +199,17 @@
<q-banner v-if="isShowAddMenu"> <q-banner v-if="isShowAddMenu">
<div style="width:250px;"> <div style="width:250px;">
<div style="margin:10px 0 15px 0;">新增上课率</div> <div style="margin:10px 0 15px 0;">新增上课率</div>
<q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率"> <q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最小上课率']" @keyup.native="checkPrice(addObj,'StartValue')" maxlength="6"
label="最小上课率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大上课率']" mask="date" label="最大上课率"> <q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最大上课率']" @keyup.native="checkPrice(addObj,'EndValue')" maxlength="6"
label="最大上课率">
</q-input> </q-input>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false"
style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addRowList()" /> <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addRowList()" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -206,22 +225,22 @@ ...@@ -206,22 +225,22 @@
<div style="margin-top:20px;text-align:right;"> <div style="margin-top:20px;text-align:right;">
<q-btn color="accent" size="md" icon="add" @click="saveBonus()" ref="addBtn" label="保存" /> <q-btn color="accent" size="md" icon="add" @click="saveBonus()" ref="addBtn" label="保存" />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import {
SetTeachingRewardsInfo, SetTeachingRewardsInfo,
GetTeachingRewardsList, GetTeachingRewardsList,
GetTeachingRewardsBaseInfo, GetTeachingRewardsBaseInfo,
SetTeachingRewardsBase SetTeachingRewardsBase
} from '../../api/reward/index'; } from '../../api/reward/index';
import { import {
GetClassTypePageList GetClassTypePageList
} from '../../api/system/index'; } from '../../api/system/index';
export default { export default {
props: {}, props: {},
components: {}, components: {},
data() { data() {
...@@ -259,9 +278,10 @@ export default { ...@@ -259,9 +278,10 @@ export default {
DropDownList: [], //社会班下拉数据 DropDownList: [], //社会班下拉数据
tempSchool: [], //选中的班级 tempSchool: [], //选中的班级
isShowInnerEdit: false, isShowInnerEdit: false,
ComMsg: {
CommonClassMoney: '', //公用修改值 CommonClassMoney: '', //公用修改值
CommonPeople: '', //公用带班人数 CommonPeople: '', //公用带班人数
},
setTeachMsg: { setTeachMsg: {
Id: 0, Id: 0,
Type: 1, Type: 1,
...@@ -330,8 +350,10 @@ export default { ...@@ -330,8 +350,10 @@ export default {
return; return;
} }
for (var i = 0; i < this.dataList.List.length; i++) { for (var i = 0; i < this.dataList.List.length; i++) {
if (((parseInt(this.addObj.StartValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj.StartValue) <= this.dataList.List[i].EndValue)) || if (((parseInt(this.addObj.StartValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj
((parseInt(this.addObj.EndValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj.EndValue) <= this.dataList.List[i].EndValue))) { .StartValue) <= this.dataList.List[i].EndValue)) ||
((parseInt(this.addObj.EndValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj.EndValue) <=
this.dataList.List[i].EndValue))) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
...@@ -389,10 +411,11 @@ export default { ...@@ -389,10 +411,11 @@ export default {
}) })
return; return;
} }
for (var i = 0; i < this.FullClassRateList.length; i++) { for (var i = 0; i < this.FullClassRateList.length; i++) {
if (((parseInt(this.addBanObj.StartValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj.StartValue) <= this.FullClassRateList[i].EndValue)) || if (((parseInt(this.addBanObj.StartValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj
((parseInt(this.addBanObj.EndValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj.EndValue) <= this.FullClassRateList[i].EndValue))) { .StartValue) <= this.FullClassRateList[i].EndValue)) ||
((parseInt(this.addBanObj.EndValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj
.EndValue) <= this.FullClassRateList[i].EndValue))) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
...@@ -406,12 +429,10 @@ export default { ...@@ -406,12 +429,10 @@ export default {
x.FullClassList.push(JSON.parse(JSON.stringify(this.addBanObj))); x.FullClassList.push(JSON.parse(JSON.stringify(this.addBanObj)));
}) })
this.isShowBanMenu = false; this.isShowBanMenu = false;
this.FullClassRateList.sort(this.compare("StartValue", true)); this.FullClassRateList.sort(this.compare("StartValue", true));
this.dataList.List.forEach(x => { this.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true)) x.FullClassList.sort(this.compare('StartValue', true))
}) })
}, },
//删除列 //删除列
deleCole(index) { deleCole(index) {
...@@ -551,7 +572,6 @@ export default { ...@@ -551,7 +572,6 @@ export default {
} }
}) })
}, },
//获取班级类型列表数据 //获取班级类型列表数据
GetClassTypePageList() { GetClassTypePageList() {
let msg = { let msg = {
...@@ -582,7 +602,6 @@ export default { ...@@ -582,7 +602,6 @@ export default {
} }
}) })
}, },
//保存奖金设置 //保存奖金设置
saveBonus() { saveBonus() {
let msg = { let msg = {
...@@ -604,10 +623,10 @@ export default { ...@@ -604,10 +623,10 @@ export default {
//修改表格横向内容 //修改表格横向内容
getInnerEdit(item) { getInnerEdit(item) {
this.isShowInnerEdit = true; this.isShowInnerEdit = true;
this.CommonClassMoney = item.ClassMoney; this.ComMsg.CommonClassMoney = item.ClassMoney;
}, },
getReset(subItem) { getReset(subItem) {
subItem.ClassMoney = this.CommonClassMoney; subItem.ClassMoney = this.ComMsg.CommonClassMoney;
this.isShowInnerEdit = false; this.isShowInnerEdit = false;
this.$forceUpdate(); this.$forceUpdate();
}, },
...@@ -615,15 +634,16 @@ export default { ...@@ -615,15 +634,16 @@ export default {
//修改带班人数 //修改带班人数
getPeopleEdit(item) { getPeopleEdit(item) {
this.isShowInnerEdit = true; this.isShowInnerEdit = true;
this.CommonPeople = item.PeopelNum; this.ComMsg.CommonPeople = item.PeopelNum;
}, },
getPeopleSet(subItem) { getPeopleSet(subItem) {
subItem.PeopelNum = this.CommonPeople; subItem.PeopelNum = this.ComMsg.CommonPeople;
this.isShowInnerEdit = false; this.isShowInnerEdit = false;
this.$forceUpdate(); this.$forceUpdate();
} }
}, },
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass'); @import url('~assets/css/table.sass');
......
src/components/course/studentFee.vue
View file @ c7884d55
<style> <style>
.socialTable { .socialTable {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
} }
.socialTable tr th { .socialTable tr th {
background: #fff; background: #fff;
height: 40px; height: 40px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
border: 1px solid #E6E6E6 border: 1px solid #E6E6E6
} }
.socialTable tr { .socialTable tr {
background: #fff; background: #fff;
text-align: center; text-align: center;
height: 40px; height: 40px;
} }
.socialTable tr td { .socialTable tr td {
font-size: 12px; font-size: 12px;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
.Classdel_Div i, .Classdel_Div i,
.div_RowList i { .div_RowList i {
display: inline-block; display: inline-block;
color: red; color: red;
visibility: hidden; visibility: hidden;
cursor: pointer; cursor: pointer;
margin-left: 3px; margin-left: 3px;
} }
.Classdel_Div:hover i { .Classdel_Div:hover i {
visibility: visible; visibility: visible;
} }
.div_RowList:hover i { .div_RowList:hover i {
visibility: visible; visibility: visible;
} }
</style> </style>
<template> <template>
<div> <div>
<div class="col" style="display:flex;margin-top:20px;"> <div class="col" style="display:flex;margin-top:20px;">
<div> <div>
<q-select class="q-pb-lg q-pr-lg" style="width:450px;" multiple clearable filled stack-label use-input use-chips option-value="CTypeId" option-label="CTypeName" v-model="tempSchool" ref="PostId" :options="DropDownList" label="班级类型" :dense="false" emit-value map-options> <q-select class="q-pb-lg q-pr-lg" style="width:450px;" multiple clearable filled stack-label use-input use-chips
option-value="CTypeId" option-label="CTypeName" v-model="tempSchool" ref="PostId" :options="DropDownList"
label="班级类型" :dense="false" emit-value map-options>
</q-select> </q-select>
</div> </div>
<div style="margin-top:15px;"> <div style="margin-top:15px;">
<q-btn color="accent" size="sm" @click="saveClass()" ref="addBtn" label="保存" /> <q-btn color="accent" size="sm" @click="saveClass()" ref="addBtn" label="保存" />
</div> </div>
</div> </div>
<table class="socialTable"> <table class="socialTable">
<tr> <tr>
<th :colspan="FullClassRateList.length+4"> <th :colspan="FullClassRateList.length+4">
...@@ -59,7 +61,8 @@ ...@@ -59,7 +61,8 @@
</th> </th>
</tr> </tr>
<tr> <tr>
<td style="width:200px;" v-if="dataList.List&&dataList.List.length>0" :rowspan="(dataList.List.length*2)+3">平均上课率</td> <td style="width:200px;" v-if="dataList.List&&dataList.List.length>0" :rowspan="(dataList.List.length*2)+3">
平均上课率</td>
<td :colspan="FullClassRateList.length+3">满班率</td> <td :colspan="FullClassRateList.length+3">满班率</td>
</tr> </tr>
<tr> <tr>
...@@ -74,14 +77,17 @@ ...@@ -74,14 +77,17 @@
<q-banner v-if="isShowColEdit"> <q-banner v-if="isShowColEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'StartValue')" maxlength="6">
</q-input> </q-input>
<div style="margin:20px 12px 0">-</div> <div style="margin:20px 12px 0">-</div>
<q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'EndValue')" maxlength="6">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false"
style="font-weight:400 !important" />
<q-btn label="确认" @click="editManBan()" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="editManBan()" color="accent q-px-md" style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -94,12 +100,17 @@ ...@@ -94,12 +100,17 @@
<q-banner v-if="isShowBanMenu"> <q-banner v-if="isShowBanMenu">
<div style="width:250px;"> <div style="width:250px;">
<div style="margin:10px 0 15px 0;">新增满班率</div> <div style="margin:10px 0 15px 0;">新增满班率</div>
<q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率"> <q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最小满班率']" @keyup.native="checkPrice(addBanObj,'StartValue')"
maxlength="6" label="最小满班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大满班率']" mask="date" label="最大满班率"> <q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最大满班率']" @keyup.native="checkPrice(addBanObj,'EndValue')" maxlength="6"
label="最大满班率">
</q-input> </q-input>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false"
style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addColList()" /> <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addColList()" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -114,7 +125,8 @@ ...@@ -114,7 +125,8 @@
<div class="div_RowList"> <div class="div_RowList">
{{item.StartValue}}<span v-if="item.StartValue>=0">%</span> {{item.StartValue}}<span v-if="item.StartValue>=0">%</span>
<template v-if="item.StartValue!=item.EndValue"> <template v-if="item.StartValue!=item.EndValue">
<span v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span v-if="item.EndValue>=0">%</span> <span v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span
v-if="item.EndValue>=0">%</span>
</template> </template>
<i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i> <i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i>
</div> </div>
...@@ -122,14 +134,17 @@ ...@@ -122,14 +134,17 @@
<q-banner v-if="isShowrowEdit"> <q-banner v-if="isShowrowEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'StartValue')" maxlength="6">
</q-input> </q-input>
<div style="margin:20px 12px 0">-</div> <div style="margin:20px 12px 0">-</div>
<q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'EndValue')" maxlength="6">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="editShangke()" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="editShangke()" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -142,11 +157,12 @@ ...@@ -142,11 +157,12 @@
<q-banner v-if="isShowInnerEdit"> <q-banner v-if="isShowInnerEdit">
<div style="width:180px;margin-top:20px;"> <div style="width:180px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="CommonClassMoney" class="q-pb-lg" mask="date"> <q-input filled v-model="ComMsg.CommonClassMoney" @keyup.native="checkPrice(ComMsg,'CommonClassMoney')" maxlength="6" class="q-pb-lg">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="getReset(subItem)" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="getReset(subItem)" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -162,11 +178,12 @@ ...@@ -162,11 +178,12 @@
<q-banner v-if="isShowInnerEdit"> <q-banner v-if="isShowInnerEdit">
<div style="width:180px;margin-top:20px;"> <div style="width:180px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="CommonPeople" class="q-pb-lg" mask="date"> <q-input filled v-model="ComMsg.CommonPeople" class="q-pb-lg" @keyup.native="checkPrice(ComMsg,'CommonPeople')" maxlength="6">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="getPeopleSet(subItem)" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="getPeopleSet(subItem)" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -182,12 +199,15 @@ ...@@ -182,12 +199,15 @@
<q-banner v-if="isShowAddMenu"> <q-banner v-if="isShowAddMenu">
<div style="width:250px;"> <div style="width:250px;">
<div style="margin:10px 0 15px 0;">新增上课率</div> <div style="margin:10px 0 15px 0;">新增上课率</div>
<q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率"> <q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最小上课率']" @keyup.native="checkPrice(addObj,'StartValue')" maxlength="6" label="最小上课率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大上课率']" mask="date" label="最大上课率"> <q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最大上课率']" @keyup.native="checkPrice(addObj,'EndValue')" maxlength="6" label="最大上课率">
</q-input> </q-input>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false"
style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addRowList()" /> <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addRowList()" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -203,22 +223,21 @@ ...@@ -203,22 +223,21 @@
<div style="margin-top:20px;text-align:right;"> <div style="margin-top:20px;text-align:right;">
<q-btn color="accent" size="md" icon="add" @click="saveBonus()" ref="addBtn" label="保存" /> <q-btn color="accent" size="md" icon="add" @click="saveBonus()" ref="addBtn" label="保存" />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import {
SetTeachingRewardsInfo, SetTeachingRewardsInfo,
GetTeachingRewardsList, GetTeachingRewardsList,
GetTeachingRewardsBaseInfo, GetTeachingRewardsBaseInfo,
SetTeachingRewardsBase SetTeachingRewardsBase
} from '../../api/reward/index'; } from '../../api/reward/index';
import { import {
GetClassTypePageList GetClassTypePageList
} from '../../api/system/index'; } from '../../api/system/index';
export default { export default {
props: {}, props: {},
components: {}, components: {},
data() { data() {
...@@ -252,14 +271,13 @@ export default { ...@@ -252,14 +271,13 @@ export default {
CommonIndex: -1, CommonIndex: -1,
isShowrowEdit: false, isShowrowEdit: false,
isShowColEdit: false, isShowColEdit: false,
DropDownList: [], //社会班下拉数据 DropDownList: [], //社会班下拉数据
tempSchool: [], //选中的班级 tempSchool: [], //选中的班级
isShowInnerEdit: false, isShowInnerEdit: false,
CommonClassMoney: '', //公用修改值 ComMsg: {
CommonPeople: '', //公用带班人数 CommonPeople: '', //公用带班人数
CommonClassMoney: '', //公用修改值
},
setTeachMsg: { setTeachMsg: {
Id: 0, Id: 0,
Type: 2, Type: 2,
...@@ -328,8 +346,10 @@ export default { ...@@ -328,8 +346,10 @@ export default {
return; return;
} }
for (var i = 0; i < this.dataList.List.length; i++) { for (var i = 0; i < this.dataList.List.length; i++) {
if (((parseInt(this.addObj.StartValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj.StartValue) <= this.dataList.List[i].EndValue)) || if (((parseInt(this.addObj.StartValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj
((parseInt(this.addObj.EndValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj.EndValue) <= this.dataList.List[i].EndValue))) { .StartValue) <= this.dataList.List[i].EndValue)) ||
((parseInt(this.addObj.EndValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj.EndValue) <=
this.dataList.List[i].EndValue))) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
...@@ -389,8 +409,10 @@ export default { ...@@ -389,8 +409,10 @@ export default {
} }
for (var i = 0; i < this.FullClassRateList.length; i++) { for (var i = 0; i < this.FullClassRateList.length; i++) {
if (((parseInt(this.addBanObj.StartValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj.StartValue) <= this.FullClassRateList[i].EndValue)) || if (((parseInt(this.addBanObj.StartValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj
((parseInt(this.addBanObj.EndValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj.EndValue) <= this.FullClassRateList[i].EndValue))) { .StartValue) <= this.FullClassRateList[i].EndValue)) ||
((parseInt(this.addBanObj.EndValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj
.EndValue) <= this.FullClassRateList[i].EndValue))) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
...@@ -551,7 +573,6 @@ export default { ...@@ -551,7 +573,6 @@ export default {
} }
}) })
}, },
//获取班级类型列表数据 //获取班级类型列表数据
GetClassTypePageList() { GetClassTypePageList() {
let msg = { let msg = {
...@@ -582,7 +603,6 @@ export default { ...@@ -582,7 +603,6 @@ export default {
} }
}) })
}, },
//保存奖金设置 //保存奖金设置
saveBonus() { saveBonus() {
let msg = { let msg = {
...@@ -605,10 +625,10 @@ export default { ...@@ -605,10 +625,10 @@ export default {
//修改表格横向内容 //修改表格横向内容
getInnerEdit(item) { getInnerEdit(item) {
this.isShowInnerEdit = true; this.isShowInnerEdit = true;
this.CommonClassMoney = item.ClassMoney; this.ComMsg.CommonClassMoney = item.ClassMoney;
}, },
getReset(subItem) { getReset(subItem) {
subItem.ClassMoney = this.CommonClassMoney; subItem.ClassMoney = this.ComMsg.CommonClassMoney;
this.isShowInnerEdit = false; this.isShowInnerEdit = false;
this.$forceUpdate(); this.$forceUpdate();
}, },
...@@ -616,15 +636,16 @@ export default { ...@@ -616,15 +636,16 @@ export default {
//修改带班人数 //修改带班人数
getPeopleEdit(item) { getPeopleEdit(item) {
this.isShowInnerEdit = true; this.isShowInnerEdit = true;
this.CommonPeople = item.PeopelNum; this.ComMsg.CommonPeople = item.PeopelNum;
}, },
getPeopleSet(subItem) { getPeopleSet(subItem) {
subItem.PeopelNum = this.CommonPeople; subItem.PeopelNum = this.ComMsg.CommonPeople;
this.isShowInnerEdit = false; this.isShowInnerEdit = false;
this.$forceUpdate(); this.$forceUpdate();
} }
}, },
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass'); @import url('~assets/css/table.sass');
......
src/components/school/assistant/assistant-form.vue
View file @ c7884d55
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id" <q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id"
ref="School_Id" :options="schoolList" label="所属校区" :dense="false" class="col-6 q-pb-lg" emit-value ref="School_Id" :options="schoolList" label="所属校区" :dense="false" class="col-6 q-pb-lg" emit-value
map-options :rules="[val => !!val || '请选择所属校区']" @input="schoolChagne" /> map-options :rules="[val => !!val || '请选择所属校区']" @input="schoolChagne" />
<q-input type="tel" filled stack-label maxlength="100" :dense="false" v-model="objOption.AssistTel" <q-input type="tel" filled stack-label maxlength="20" :dense="false" v-model="objOption.AssistTel"
ref="AssistTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写助教联系电话']" /> ref="AssistTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写助教联系电话']" />
<selectTree v-if="DeptList&&DeptList.length>0" :treeData='DeptList' :defaultArray="returnString" <selectTree v-if="DeptList&&DeptList.length>0" :treeData='DeptList' :defaultArray="returnString"
nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门"
......
src/components/school/classroom/classroom-form.vue
View file @ c7884d55
<template> <template>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale"> <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
<q-card style="width: 800px;max-width:900px;"> <q-card style="width: 500px;max-width:600px;">
<q-card-section> <q-card-section>
<div class="text-h6">{{objOption.TId==0?'新增教室信息':'修改教室信息'}}</div> <div class="text-h6">{{objOption.TId==0?'新增教室信息':'修改教室信息'}}</div>
</q-card-section> </q-card-section>
...@@ -8,10 +8,12 @@ ...@@ -8,10 +8,12 @@
<div class="text-caption q-mb-lg q-px-md text-grey-6">教室信息</div> <div class="text-caption q-mb-lg q-px-md text-grey-6">教室信息</div>
<div class="row wrap"> <div class="row wrap">
<q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id" <q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id"
ref="School_Id" :options="schoolList" label="所属校区" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value ref="School_Id" :options="schoolList" label="所属校区" :dense="false" class="col-12 q-pb-lg q-pr-lg" emit-value
map-options :rules="[val => !!val || '请选择所属校区']" /> map-options :rules="[val => !!val || '请选择所属校区']" />
</div>
<div class="row wrap">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.RoomName" ref="RoomName" <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.RoomName" ref="RoomName"
class="col-6 q-pr-lg" label="教室名称" :rules="[val => !!val || '请填写教室名称']" /> class="col-12 q-pr-lg" label="教室名称" :rules="[val => !!val || '请填写教室名称']" />
</div> </div>
</q-card-section> </q-card-section>
<q-separator /> <q-separator />
...@@ -45,7 +47,7 @@ ...@@ -45,7 +47,7 @@
RoomId: 0, RoomId: 0,
RoomName: "", //教室名称 RoomName: "", //教室名称
School_Id: 0, //校区编号 School_Id: 0, //校区编号
Status:-1,//状态 Status: -1, //状态
}, },
optionTitle: "", optionTitle: "",
schoolList: [], schoolList: [],
...@@ -82,9 +84,8 @@ ...@@ -82,9 +84,8 @@
getSchool() { getSchool() {
getSchoolDropdown({}).then(res => { getSchoolDropdown({}).then(res => {
var tempArray = res.Data; var tempArray = res.Data;
if(!tempArray) if (!tempArray) {
{ tempArray = [];
tempArray=[];
} }
var obj = { var obj = {
SName: '不限', SName: '不限',
......
src/components/school/teacher/teacher-form.vue
View file @ c7884d55
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<q-card-section class="q-pt-none scroll" style="max-height: 70vh"> <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div> <div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div>
<div class="row wrap"> <div class="row wrap">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.TeacherName" ref="TeacherName" <q-input filled stack-label maxlength="15" :dense="false" v-model="objOption.TeacherName" ref="TeacherName"
class="col-6 q-pr-lg q-pb-lg" label="教师名称" :rules="[val => !!val || '请填写教师姓名']" /> class="col-6 q-pr-lg q-pb-lg" label="教师名称" :rules="[val => !!val || '请填写教师姓名']" />
<q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id" <q-select filled stack-label option-value="SId" option-label="SName" v-model="objOption.School_Id"
ref="School_Id" :options="schoolList" label="所属校区" :dense="false" class="col-6 q-pb-lg" emit-value ref="School_Id" :options="schoolList" label="所属校区" :dense="false" class="col-6 q-pb-lg" emit-value
map-options :rules="[val => !!val || '请选择所属校区']" @input="schoolChagne" /> map-options :rules="[val => !!val || '请选择所属校区']" @input="schoolChagne" />
<q-input type="tel" filled stack-label maxlength="100" :dense="false" v-model="objOption.TeacherTel" <q-input type="tel" filled stack-label maxlength="20" :dense="false" v-model="objOption.TeacherTel"
ref="TeacherTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写教师联系电话']" /> ref="TeacherTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请填写教师联系电话']" />
<q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.TeacherSay" ref="TeacherSay" <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.TeacherSay" ref="TeacherSay"
class="col-6 q-pb-lg" label="教师营销语" /> class="col-6 q-pb-lg" label="教师营销语" />
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
map-options /> map-options />
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseStuNum" ref="BaseStuNum" <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseStuNum" ref="BaseStuNum"
class="col-6 q-pr-lg q-pb-lg" label="带班基础人数" /> class="col-6 q-pr-lg q-pb-lg" label="带班基础人数" @keyup.native="checkInteger(objOption,'BaseStuNum')" />
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseHourFee" ref="BaseHourFee" <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseHourFee" ref="BaseHourFee"
class="col-6 q-pb-lg" label="基础课时费" /> class="col-6 q-pb-lg" label="基础课时费" @keyup.native="checkPrice(objOption,'BaseHourFee')" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="col-6 q-pr-lg q-pb-lg"> <div class="col-6 q-pr-lg q-pb-lg">
...@@ -44,17 +44,18 @@ ...@@ -44,17 +44,18 @@
</div> </div>
</div> </div>
<ext-editor :defaultMsg="objOption.TeacherIntro" classStr="col-12" @getEditValue="getEditValue"></ext-editor> <ext-editor :defaultMsg="objOption.TeacherIntro" classStr="col-12" @getEditValue="getEditValue"></ext-editor>
<div class="col-6 q-pr-lg q-pb-lg q-pt-lg"> <div class="row wrap">
<div class="col-6 q-pr-lg q-pb-lg">
<q-toggle size="md" label="是否显示" color="primary" :false-value="0" :true-value="1" <q-toggle size="md" label="是否显示" color="primary" :false-value="0" :true-value="1"
v-model="objOption.IsShow" /> v-model="objOption.IsShow" />
<div class="text-grey-6 text-caption">注意：隐藏后，教师将在其他任何地方无法显示</div> <div class="text-grey-6 text-caption">注意：隐藏后，教师将在其他任何地方无法显示</div>
</div> </div>
<div class="col-6 q-pb-lg q-pt-lg"> <div class="col-6 q-pb-lg">
<q-toggle size="md" label="是否推荐" color="primary" :false-value="0" :true-value="1" <q-toggle size="md" label="是否推荐" color="primary" :false-value="0" :true-value="1"
v-model="objOption.IsRecommend" /> v-model="objOption.IsRecommend" />
<div class="text-grey-6 text-caption">注意：推荐后教师将在营销端呈现</div> <div class="text-grey-6 text-caption">注意：推荐后教师将在营销端呈现</div>
</div> </div>
</div>
<div class="col-12 q-pb-lg"> <div class="col-12 q-pb-lg">
<q-field filled label="教师标签" bg-color="white" stack-label> <q-field filled label="教师标签" bg-color="white" stack-label>
<template v-slot:control> <template v-slot:control>
......
src/pages/course/baseSet.vue
View file @ c7884d55
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
基础课时费： 基础课时费：
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input filled stack-label :dense="false" v-model="msg.BasicHourFee" ref="BasicHourFee" class="q-pb-lg" <q-input filled stack-label maxlength="8" :dense="false" v-model="msg.BasicHourFee" ref="BasicHourFee" class="q-pb-lg"
:rules="[val => !!val || '请填写基础课时费']" /> @keyup.native="checkPrice(msg,'BasicHourFee')" :rules="[val => !!val || '请填写基础课时费']" />
</div> </div>
</div> </div>
<div class="col row wrap"> <div class="col row wrap">
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
基础带班人数： 基础带班人数：
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input filled stack-label :dense="false" v-model="msg.BasicClassNum" ref="BasicClassNum" class="q-pb-lg" <q-input filled stack-label maxlength="6" :dense="false" v-model="msg.BasicClassNum" ref="BasicClassNum" class="q-pb-lg"
:rules="[val => !!val || '请填写基础带班人数']" /> @keyup.native="checkInteger(msg,'BasicClassNum')" :rules="[val => !!val || '请填写基础带班人数']" />
</div> </div>
</div> </div>
<div class="col row wrap"> <div class="col row wrap">
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
课时分钟数： 课时分钟数：
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input filled stack-label :dense="false" v-model="msg.BasicMinutes" ref="BasicMinutes" class="q-pb-lg" <q-input filled stack-label maxlength="6" :dense="false" v-model="msg.BasicMinutes" ref="BasicMinutes" class="q-pb-lg"
:rules="[val => !!val || '请填写课时分钟数']" /> @keyup.native="checkInteger(msg,'BasicMinutes')" :rules="[val => !!val || '请填写课时分钟数']" />
</div> </div>
<div class="col-3" style="padding:18px 0 0 10px;color:gray"> <div class="col-3" style="padding:18px 0 0 10px;color:gray">
每节课的分钟数，单位为分钟计算 每节课的分钟数，单位为分钟计算
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
</div> </div>
<div class="col row wrap"> <div class="col row wrap">
<div class="col-2 baseSet_Title"> <div class="col-2 baseSet_Title">
</div> </div>
<div class="col-3"> <div class="col-3">
<q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important;margin-top:20px;width:100%;" <q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important;margin-top:20px;width:100%;"
...@@ -59,7 +58,7 @@ ...@@ -59,7 +58,7 @@
<template v-slot:top="props"> <template v-slot:top="props">
<q-space /> <q-space />
<div class="page-option"> <div class="page-option">
<q-btn color="accent" size="sm" icon="add" @click="clearInfo()" ref="addBtn" label="新增"/> <q-btn color="accent" size="sm" icon="add" @click="clearInfo()" ref="addBtn" label="新增" />
</div> </div>
</template> </template>
<template v-slot:body-cell-AddHourFee="props"> <template v-slot:body-cell-AddHourFee="props">
...@@ -71,12 +70,14 @@ ...@@ -71,12 +70,14 @@
</template> </template>
<template v-slot:body-cell-TotalClassNum="props"> <template v-slot:body-cell-TotalClassNum="props">
<q-td :props="props"> <q-td :props="props">
<span style="color:blue;cursor:pointer" @click="goUrlT('classManage',props.row)">{{props.row.TotalClassNum}}</span> <span style="color:blue;cursor:pointer"
@click="goUrlT('classManage',props.row)">{{props.row.TotalClassNum}}</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-CompleteClassNum="props"> <template v-slot:body-cell-CompleteClassNum="props">
<q-td :props="props"> <q-td :props="props">
<span style="color:blue;cursor:pointer" @click="goUrlT('classManage',props.row)">{{props.row.CompleteClassNum}}</span> <span style="color:blue;cursor:pointer"
@click="goUrlT('classManage',props.row)">{{props.row.CompleteClassNum}}</span>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
...@@ -98,17 +99,15 @@ ...@@ -98,17 +99,15 @@
<q-card-section> <q-card-section>
<div class="text-h6">{{commonTitle}}</div> <div class="text-h6">{{commonTitle}}</div>
</q-card-section> </q-card-section>
<q-input filled stack-label :dense="false" v-model="addMsg.CTypeName" label="类型名称" ref="CTypeName" <q-input filled stack-label maxlength="20" :dense="false" v-model="addMsg.CTypeName" label="类型名称" ref="CTypeName"
class="q-pb-lg" :rules="[val => !!val || '请填写类型名称']" /> class="q-pb-lg" :rules="[val => !!val || '请填写类型名称']" />
<q-input filled stack-label :dense="false" style="margin:20px 0;" v-model="addMsg.AddHourFee" label="基础课时费" ref="AddHourFee" <q-input filled stack-label :dense="false" maxlength="6" style="margin:20px 0;" v-model="addMsg.AddHourFee" label="基础课时费"
class="q-pb-lg" :rules="[val => !!val || '请填写基础课时费']" /> ref="AddHourFee" class="q-pb-lg" @keyup.native="checkPrice(addMsg,'AddHourFee')" :rules="[val => !!val || '请填写基础课时费']" />
<q-input filled stack-label :dense="false" v-model="addMsg.DefaultClassNum" label="默认班级人数" <q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数" ref="DefaultClassNum"
ref="DefaultClassNum" class="q-pb-lg" :rules="[val => !!val || '请填写默认班级人数']" /> class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')" :rules="[val => !!val || '请填写默认班级人数']" />
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="persistent=false" />
@click="persistent=false" /> <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveClassType()" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="saveClassType()" />
</q-card-actions> </q-card-actions>
</q-card> </q-card>
</q-dialog> </q-dialog>
...@@ -187,7 +186,7 @@ ...@@ -187,7 +186,7 @@
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
commonTitle:'' commonTitle: ''
} }
}, },
created() {}, created() {},
...@@ -226,7 +225,7 @@ ...@@ -226,7 +225,7 @@
}, },
//保存班级类型 //保存班级类型
saveClassType() { saveClassType() {
if(this.addMsg.CTypeName==''){ if (this.addMsg.CTypeName == '') {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
...@@ -234,7 +233,7 @@ ...@@ -234,7 +233,7 @@
}) })
return; return;
} }
if(this.addMsg.AddHourFee==''){ if (this.addMsg.AddHourFee == '') {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
...@@ -242,7 +241,7 @@ ...@@ -242,7 +241,7 @@
}) })
return; return;
} }
if(this.addMsg.DefaultClassNum==''){ if (this.addMsg.DefaultClassNum == '') {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
...@@ -282,7 +281,7 @@ ...@@ -282,7 +281,7 @@
}, },
clearInfo() { clearInfo() {
this.commonTitle = '新增班级类型'; this.commonTitle = '新增班级类型';
this.persistent=true; this.persistent = true;
this.addMsg.CTypeId = 0; this.addMsg.CTypeId = 0;
this.addMsg.CTypeName = ''; this.addMsg.CTypeName = '';
this.addMsg.AddHourFee = ''; this.addMsg.AddHourFee = '';
...@@ -291,7 +290,7 @@ ...@@ -291,7 +290,7 @@
//编辑班级类型 //编辑班级类型
EditClassType(obj) { EditClassType(obj) {
this.commonTitle = '修改班级类型'; this.commonTitle = '修改班级类型';
this.persistent=true; this.persistent = true;
this.addMsg.CTypeId = obj.CTypeId; this.addMsg.CTypeId = obj.CTypeId;
this.addMsg.CTypeName = obj.CTypeName; this.addMsg.CTypeName = obj.CTypeName;
this.addMsg.AddHourFee = obj.AddHourFee; this.addMsg.AddHourFee = obj.AddHourFee;
...@@ -323,11 +322,17 @@ ...@@ -323,11 +322,17 @@
}); });
}, },
//跳转 //跳转
goUrlT: function (path, obj){ goUrlT: function (path, obj) {
this.$router.push({ path:path,query:{"CTypeId":obj.CTypeId,blank:'y'}}) this.$router.push({
path: path,
query: {
"CTypeId": obj.CTypeId,
blank: 'y'
}
})
}, },
closeSetForm(){ closeSetForm() {
this.persistent=false; this.persistent = false;
} }
}, },
} }
......
src/pages/course/classHourReward.vue
View file @ c7884d55
<template> <template>
<div class="classHourReward page-body"> <div class="classHourReward page-body">
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" option-value="TId" option-label="TeacherName" v-model="msg.TeacherId" :options="TeacherList" emit-value map-options label="带班老师" /> <q-select @input="resetSearch" standout="bg-primary text-white" option-value="TId" option-label="TeacherName"
v-model="msg.TeacherId" :options="TeacherList" emit-value map-options label="带班老师" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="msg.State" :options="StateList" emit-value map-options label="状态" /> <q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="msg.State" :options="StateList" emit-value map-options label="状态" />
</div> </div>
<div class="col-3 Sysuser_Date"> <div class="col-3 Sysuser_Date">
<q-field filled> <q-field filled>
 <template v-slot:control>  <template v-slot:control>
<el-date-picker v-model="msg.Month" @change="resetSearch()" type="month"> <el-date-picker v-model="msg.Month" @change="resetSearch" type="month" clearable @clear="resetSearch"></el-date-picker>       
  </el-date-picker>       
</template> </template>
</q-field> </q-field>
</div> </div>
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table" separator="none" title="" :data="data" :columns="columns" row-key="name"> <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
separator="none" title="" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props"> <template v-slot:top="props">
<div class="page-option" style="width:100%;"> <div class="page-option" style="width:100%;">
<q-btn color="accent" style="float:right;margin-right:0;" size="sm" class="q-mr-md" icon="add" label="新增课时奖励" @click="drawer=true"></q-btn> <q-btn color="accent" style="float:right;margin-right:0;" size="sm" class="q-mr-md" icon="add"
label="新增课时奖励" @click="drawer=true"></q-btn>
</div> </div>
</template> </template>
<template v-slot:body-cell-State="props"> <template v-slot:body-cell-State="props">
...@@ -43,11 +46,13 @@ ...@@ -43,11 +46,13 @@
</template> </template>
<template v-slot:body-cell-TeacherList="props"> <template v-slot:body-cell-TeacherList="props">
<q-td :props="props"> <q-td :props="props">
<span style="color: #3FC4FF;cursor: pointer" v-if="props.row.TeacherList.length>0&&props.row.TeacherList[0].TeacherName">{{props.row.TeacherList[0].TeacherName}}等{{props.row.TeacherList.length}}位老师 <span style="color: #3FC4FF;cursor: pointer"
v-if="props.row.TeacherList.length>0&&props.row.TeacherList[0].TeacherName">{{props.row.TeacherList[0].TeacherName}}等{{props.row.TeacherList.length}}位老师
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div class="price-popup"> <div class="price-popup">
<div class="row " v-for="(x,index2) in props.row.TeacherList" :key="index2" style="width: 200px;justify-content: space-between;align-items: center;margin: 7px 0;cursor: pointer"> <div class="row " v-for="(x,index2) in props.row.TeacherList" :key="index2"
style="width: 200px;justify-content: space-between;align-items: center;margin: 7px 0;cursor: pointer">
<div class="row" @click="goDetailed(props.row,x.TeacherId)"> <div class="row" @click="goDetailed(props.row,x.TeacherId)">
<span style="color:#2D2D2D;">{{x.TeacherName}}</span> <span style="color:#2D2D2D;">{{x.TeacherName}}</span>
</div> </div>
...@@ -71,15 +76,17 @@ ...@@ -71,15 +76,17 @@
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" icon="iconfont icon-xiangqing-" style="font-weight:400;color: #3FC4FF" class="q-mr-xs" label="明细" @click="goDetailed(props.row,'0')" /> <q-btn flat size="xs" icon="iconfont icon-xiangqing-" style="font-weight:400;color: #3FC4FF" class="q-mr-xs"
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;" > label="明细" @click="goDetailed(props.row,'0')" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list> <q-list>
<q-item clickable v-close-popup v-if="props.row.State==1"> <q-item clickable v-close-popup v-if="props.row.State==1">
<q-item-section @click="gostudent(props.row,1)"> <q-item-section @click="gostudent(props.row,1)">
<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 v-if="(props.row.State==1 || props.row.State==2) && props.row.FrIdList==0"> <q-item clickable v-close-popup
v-if="(props.row.State==1 || props.row.State==2) && props.row.FrIdList==0">
<q-item-section @click="gostudent(props.row,2)"> <q-item-section @click="gostudent(props.row,2)">
<q-item-label>取消</q-item-label> <q-item-label>取消</q-item-label>
</q-item-section> </q-item-section>
...@@ -89,18 +96,19 @@ ...@@ -89,18 +96,19 @@
<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 v-if="props.row.State==1||props.row.State==2">--> <!-- <q-item clickable v-close-popup v-if="props.row.State==1||props.row.State==2">-->
<!-- <q-item-section @click="goexport(props.row)">--> <!-- <q-item-section @click="goexport(props.row)">-->
<!-- <q-item-label>导出</q-item-label>--> <!-- <q-item-label>导出</q-item-label>-->
<!-- </q-item-section>--> <!-- </q-item-section>-->
<!-- </q-item>--> <!-- </q-item>-->
</q-list> </q-list>
</q-btn-dropdown> </q-btn-dropdown>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount" :input="true" @input="changePage" /> <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</template> </template>
</q-table> </q-table>
</div> </div>
...@@ -116,20 +124,25 @@ ...@@ -116,20 +124,25 @@
<q-radio v-model="FinanceMsg.IsPublic" val="1" label="公账" /> <q-radio v-model="FinanceMsg.IsPublic" val="1" label="公账" />
</div> </div>
<div class="col" style="margin-top: 20px"> <div class="col" style="margin-top: 20px">
<q-select standout="bg-primary text-white" option-value="ID" option-label="Name" v-model="FinanceMsg.CurrencyId" :options="coinGetList" emit-value map-options label="币种" /> <q-select standout="bg-primary text-white" option-value="ID" option-label="Name"
v-model="FinanceMsg.CurrencyId" :options="coinGetList" emit-value map-options label="币种" />
</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">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="ISsystem=false,Resetsystem()" v-if="!Floading" /> <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important"
<q-btn label="立即制单" color="accent" class="q-px-md" style="font-weight:400 !important" :loading="Floading" @click="savesystem()" /> @click="ISsystem=false,Resetsystem()" v-if="!Floading" />
<q-btn label="立即制单" color="accent" class="q-px-md" style="font-weight:400 !important" :loading="Floading"
@click="savesystem()" />
</q-card-actions> </q-card-actions>
</q-card> </q-card>
</q-dialog> </q-dialog>
<el-drawer title="" :visible.sync="drawer" :wrapperClosable="false" :with-header="false"> <el-drawer title="" :visible.sync="drawer" :wrapperClosable="false" :with-header="false">
<div style="padding: 15px" class="class-popover"> <div style="padding: 15px" class="class-popover">
<div style="margin: 10px 0;font-size: 14px;font-weight: bold;color:#2D2D2D;">新增课时奖励</div> <div style="margin: 10px 0;font-size: 14px;font-weight: bold;color:#2D2D2D;">新增课时奖励</div>
<q-select class="col-12 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips option-value="TId" option-label="TeacherName" v-model="tempManager" ref="ManagerId" :options="TeacherList" label="所有老师" :dense="false" emit-value map-options @filter="filterFn"> <q-select class="col-12 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips
option-value="TId" option-label="TeacherName" v-model="tempManager" ref="ManagerId" :options="TeacherList"
label="所有老师" :dense="false" emit-value map-options @filter="filterFn">
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey"> <q-item-section class="text-grey">
...@@ -142,7 +155,8 @@ ...@@ -142,7 +155,8 @@
<div class="col-12 Sysuser_Date"> <div class="col-12 Sysuser_Date">
<q-field filled> <q-field filled>
  <template v-slot:control>   <template v-slot:control>
<el-date-picker v-model="addMsg.Month"   type="month" style="border:none;" :picker-options="pickerOptions"></el-date-picker>        <el-date-picker v-model="addMsg.Month"   type="month" style="border:none;"
:picker-options="pickerOptions"></el-date-picker>       
</template> </template>
</q-field> </q-field>
</div> </div>
...@@ -154,21 +168,21 @@ ...@@ -154,21 +168,21 @@
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
</div> </div>
</template> </template>
<script> <script>
import { import {
getTeachingBonusPageList, getTeachingBonusPageList,
getBonusStateEnumList, //教师奖励状态 枚举 getBonusStateEnumList, //教师奖励状态 枚举
setTeachingBonusAdd, //新增课时奖励 setTeachingBonusAdd, //新增课时奖励
setTeachingBonusState, //教师绩效 设置状态 setTeachingBonusState, //教师绩效 设置状态
setTeachingBonusFinance, //教师奖励 生成财务单据 setTeachingBonusFinance, //教师奖励 生成财务单据
} from '../../api/course/class' } from '../../api/course/class'
import { import {
getTeacherDropDownList, getTeacherDropDownList,
} from '../../api/school/index'; } from '../../api/school/index';
export default { export default {
name: "classHourReward", name: "classHourReward",
data() { data() {
return { return {
...@@ -381,7 +395,7 @@ export default { ...@@ -381,7 +395,7 @@ export default {
this.resetSearch() this.resetSearch()
this.drawer = false this.drawer = false
} }
}).catch(err=>{ }).catch(err => {
this.Dloading = false this.Dloading = false
}) })
...@@ -477,23 +491,24 @@ export default { ...@@ -477,23 +491,24 @@ export default {
}); });
} }
} }
} }
</script> </script>
<style> <style>
.classHourReward .Sysuser_Date .el-input--prefix .el-input__inner { .classHourReward .Sysuser_Date .el-input--prefix .el-input__inner {
background-color: red; background-color: red;
border: 0; border: 0;
} }
.classHourReward .state-item { .classHourReward .state-item {
padding: 3px 0px; padding: 3px 0px;
border-radius: 3px; border-radius: 3px;
width: 70px; width: 70px;
text-align: center; text-align: center;
} }
.classHourReward .frIdlist { .classHourReward .frIdlist {
padding: 3px 10px; padding: 3px 10px;
border-radius: 3px; border-radius: 3px;
background: #EEEEEF; background: #EEEEEF;
...@@ -502,27 +517,28 @@ export default { ...@@ -502,27 +517,28 @@ export default {
margin-right: 5px; margin-right: 5px;
margin-bottom: 5px; margin-bottom: 5px;
cursor: pointer; cursor: pointer;
} }
.class-popover .q-pr-lg { .class-popover .q-pr-lg {
padding-right: 0; padding-right: 0;
margin-top: 20px; margin-top: 20px;
} }
.classHourReward .el-date-editor.el-input { .classHourReward .el-date-editor.el-input {
width: 100%; width: 100%;
} }
.classHourReward .el-date-editor.el-input input { .classHourReward .el-date-editor.el-input input {
background-color: transparent !important; background-color: transparent !important;
} }
.classHourReward .el-range-editor .el-range-input { .classHourReward .el-range-editor .el-range-input {
background: none; background: none;
} }
.Sysuser_Date .el-input__inner { .Sysuser_Date .el-input__inner {
background: transparent !important; background: transparent !important;
border: 0 !important; border: 0 !important;
} }
</style> </style>
src/pages/course/classManage.vue
View file @ c7884d55
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.ClassName" <q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.ClassName"
label="班级名称" @clear="getClassList" /> label="班级名称" @clear="getClassList" maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" option-value="Id" option-label="Name" <q-select @input="getClassList" standout="bg-primary text-white" option-value="Id" option-label="Name"
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.TeacherName" <q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.TeacherName"
label="带班老师" @clear="getClassList" /> label="带班老师" @clear="getClassList" maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.CourseName" <q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.CourseName"
label="学习课程" @clear="getClassList" /> label="学习课程" @clear="getClassList" maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="getClassList" standout="bg-primary text-white" option-value="SId" option-label="SName" <q-select @input="getClassList" standout="bg-primary text-white" option-value="SId" option-label="SName"
......
src/pages/course/course.vue
View file @ c7884d55
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.CourseName" <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.CourseName"
label="课程名称" /> label="课程名称" @clear="resetSearch" maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<select-tree :treeData='TreeCategoryList' <select-tree :treeData='TreeCategoryList'
......
src/pages/course/socialclass.vue
View file @ c7884d55
<style> <style>
.socialTable { .socialTable {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
} }
.socialTable tr th { .socialTable tr th {
background: #fff; background: #fff;
height: 40px; height: 40px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
border: 1px solid #E6E6E6 border: 1px solid #E6E6E6
} }
.socialTable tr { .socialTable tr {
background: #fff; background: #fff;
text-align: center; text-align: center;
height: 40px; height: 40px;
} }
.socialTable tr td { .socialTable tr td {
font-size: 12px; font-size: 12px;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
.Classdel_Div i, .Classdel_Div i,
.div_RowList i { .div_RowList i {
display: inline-block; display: inline-block;
color: red; color: red;
visibility: hidden; visibility: hidden;
cursor: pointer; cursor: pointer;
margin-left: 3px; margin-left: 3px;
} }
.Classdel_Div:hover i { .Classdel_Div:hover i {
visibility: visible; visibility: visible;
} }
.div_RowList:hover i { .div_RowList:hover i {
visibility: visible; visibility: visible;
} }
</style> </style>
<template> <template>
<div class="page-body"> <div class="page-body">
<q-tabs v-model="tabCheck" narrow-indicator dense align="left" class="text-primary"> <q-tabs v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
<q-tab :ripple="false" name="first" label="奖金设置" @click="getBaseDropInfo" /> <q-tab :ripple="false" name="first" label="奖金设置" @click="getBaseDropInfo" />
<q-tab :ripple="false" name="second" label="课时费设置" /> <q-tab :ripple="false" name="second" label="课时费设置" />
...@@ -50,7 +51,9 @@ ...@@ -50,7 +51,9 @@
<div style="margin-top:20px;"> <div style="margin-top:20px;">
<div class="col" style="display:flex;"> <div class="col" style="display:flex;">
<div> <div>
<q-select class="q-pb-lg q-pr-lg" style="width:450px;" multiple clearable filled stack-label use-input use-chips option-value="CTypeId" option-label="CTypeName" v-model="tempSchool" ref="PostId" :options="DropDownList" label="班级类型" :dense="false" emit-value map-options> <q-select class="q-pb-lg q-pr-lg" style="width:450px;" multiple clearable filled stack-label use-input
use-chips option-value="CTypeId" option-label="CTypeName" v-model="tempSchool" ref="PostId"
:options="DropDownList" label="班级类型" :dense="false" emit-value map-options>
</q-select> </q-select>
</div> </div>
<div style="margin-top:15px;"> <div style="margin-top:15px;">
...@@ -65,7 +68,8 @@ ...@@ -65,7 +68,8 @@
</th> </th>
</tr> </tr>
<tr> <tr>
<td style="width:200px;" v-if="dataList.List&&dataList.List.length>0" :rowspan="dataList.List.length+3">平均上课率</td> <td style="width:200px;" v-if="dataList.List&&dataList.List.length>0" :rowspan="dataList.List.length+3">
平均上课率</td>
<td :colspan="FullClassRateList.length+2">满班率</td> <td :colspan="FullClassRateList.length+2">满班率</td>
</tr> </tr>
<tr> <tr>
...@@ -80,15 +84,19 @@ ...@@ -80,15 +84,19 @@
<q-banner v-if="isShowColEdit"> <q-banner v-if="isShowColEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.StartValue" @keyup.native="checkPrice(editObj,'StartValue')"
maxlength="6" class="col-5 q-pb-lg">
</q-input> </q-input>
<div style="margin:20px 12px 0">-</div> <div style="margin:20px 12px 0">-</div>
<q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.EndValue" @keyup.native="checkPrice(editObj,'EndValue')"
maxlength="6" class="col-5 q-pb-lg">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false"
<q-btn label="确认" @click="editManBan()" color="accent q-px-md" style="font-weight:400 !important" /> style="font-weight:400 !important" />
<q-btn label="确认" @click="editManBan()" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -100,13 +108,19 @@ ...@@ -100,13 +108,19 @@
<q-banner v-if="isShowBanMenu"> <q-banner v-if="isShowBanMenu">
<div style="width:250px;"> <div style="width:250px;">
<div style="margin:10px 0 15px 0;">新增满班率</div> <div style="margin:10px 0 15px 0;">新增满班率</div>
<q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率"> <q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" maxlength="6"
:rules="[val => !!val || '请填写最小满班率']" label="最小满班率"
@keyup.native="checkPrice(addBanObj,'StartValue')">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大满班率']" mask="date" label="最大满班率"> <q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最大满班率']" label="最大满班率"
@keyup.native="checkPrice(addBanObj,'EndValue')" maxlength="6">
</q-input> </q-input>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false"
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addColList()" /> style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="addColList()" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -119,7 +133,8 @@ ...@@ -119,7 +133,8 @@
<div class="div_RowList"> <div class="div_RowList">
{{item.StartValue}}<span v-if="item.StartValue>=0">%</span> {{item.StartValue}}<span v-if="item.StartValue>=0">%</span>
<template v-if="item.StartValue!=item.EndValue"> <template v-if="item.StartValue!=item.EndValue">
<span v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span v-if="item.EndValue>=0">%</span> <span v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span
v-if="item.EndValue>=0">%</span>
</template> </template>
<i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i> <i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i>
</div> </div>
...@@ -127,14 +142,17 @@ ...@@ -127,14 +142,17 @@
<q-banner v-if="isShowrowEdit"> <q-banner v-if="isShowrowEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'StartValue')" maxlength="6">
</q-input> </q-input>
<div style="margin:20px 12px 0">-</div> <div style="margin:20px 12px 0">-</div>
<q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'EndValue')" maxlength="6">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="editShangke()" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="editShangke()" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -142,18 +160,17 @@ ...@@ -142,18 +160,17 @@
</td> </td>
<td v-for="(subItem,subIndex) in item.FullClassList" @click="getInnerEdit(subItem)"> <td v-for="(subItem,subIndex) in item.FullClassList" @click="getInnerEdit(subItem)">
{{subItem.ClassMoney}} {{subItem.ClassMoney}}
<!-- <q-popup-edit v-model.number="subItem.ClassMoney" buttons>
<q-input v-model="subItem.ClassMoney" @change="getReset()" dense autofocus counter />
</q-popup-edit> -->
<q-popup-proxy> <q-popup-proxy>
<q-banner v-if="isShowInnerEdit"> <q-banner v-if="isShowInnerEdit">
<div style="width:180px;margin-top:20px;"> <div style="width:180px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="CommonClassMoney" class="q-pb-lg" mask="date"> <q-input filled v-model="ComMsg.CommonClassMoney"
@keyup.native="checkPrice(ComMsg,'CommonClassMoney')" maxlength="6" class="q-pb-lg">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="getReset(subItem)" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="getReset(subItem)" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -168,13 +185,19 @@ ...@@ -168,13 +185,19 @@
<q-banner v-if="isShowAddMenu"> <q-banner v-if="isShowAddMenu">
<div style="width:250px;"> <div style="width:250px;">
<div style="margin:10px 0 15px 0;">新增上课率</div> <div style="margin:10px 0 15px 0;">新增上课率</div>
<q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率"> <q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最小上课率']" @keyup.native="checkPrice(addObj,'StartValue')"
maxlength="6" label="最小上课率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大上课率']" mask="date" label="最大上课率"> <q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最大上课率']" @keyup.native="checkPrice(addObj,'EndValue')"
maxlength="6" label="最大上课率">
</q-input> </q-input>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false"
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addRowList()" /> style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="addRowList()" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -195,24 +218,23 @@ ...@@ -195,24 +218,23 @@
<classFee></classFee> <classFee></classFee>
</div> </div>
</template> </template>
</div> </div>
</template> </template>
<script> <script>
import { import {
SetTeachingRewardsInfo, SetTeachingRewardsInfo,
GetTeachingRewardsList, GetTeachingRewardsList,
GetTeachingRewardsBaseInfo, GetTeachingRewardsBaseInfo,
SetTeachingRewardsBase SetTeachingRewardsBase
} from '../../api/reward/index'; } from '../../api/reward/index';
import {
import {
GetClassTypePageList GetClassTypePageList
} from '../../api/system/index'; } from '../../api/system/index';
import classFee from '../../components/course/classFee' import classFee from '../../components/course/classFee'
export default { export default {
props: {}, props: {},
components: { components: {
classFee classFee
...@@ -221,9 +243,7 @@ export default { ...@@ -221,9 +243,7 @@ export default {
return { return {
tabCheck: 'first', //默认选第一个 tabCheck: 'first', //默认选第一个
dense: false, dense: false,
msg: { msg: {},
},
FullClassRateList: [], //头部列数据 FullClassRateList: [], //头部列数据
dataList: [], //列表数据 dataList: [], //列表数据
isShowAddMenu: false, //显示新增上课率弹出 isShowAddMenu: false, //显示新增上课率弹出
...@@ -248,11 +268,12 @@ export default { ...@@ -248,11 +268,12 @@ export default {
CommonIndex: -1, CommonIndex: -1,
isShowrowEdit: false, isShowrowEdit: false,
isShowColEdit: false, isShowColEdit: false,
DropDownList: [], //社会班下拉数据 DropDownList: [], //社会班下拉数据
tempSchool: [], //选中的班级 tempSchool: [], //选中的班级
isShowInnerEdit: false, isShowInnerEdit: false,
ComMsg: {
CommonClassMoney: '', //公用修改值 CommonClassMoney: '', //公用修改值
},
setTeachMsg: { setTeachMsg: {
Id: 0, Id: 0,
Type: 1, Type: 1,
...@@ -320,7 +341,6 @@ export default { ...@@ -320,7 +341,6 @@ export default {
}) })
return; return;
} }
for (var i = 0; i < this.dataList.List.length; i++) { for (var i = 0; i < this.dataList.List.length; i++) {
if (((parseInt(this.addObj.StartValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj if (((parseInt(this.addObj.StartValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj
.StartValue) <= this.dataList.List[i].EndValue)) || .StartValue) <= this.dataList.List[i].EndValue)) ||
...@@ -401,9 +421,7 @@ export default { ...@@ -401,9 +421,7 @@ export default {
x.FullClassList.push(JSON.parse(JSON.stringify(this.addBanObj))); x.FullClassList.push(JSON.parse(JSON.stringify(this.addBanObj)));
}) })
this.isShowBanMenu = false; this.isShowBanMenu = false;
this.FullClassRateList.sort(this.compare("StartValue", true)); this.FullClassRateList.sort(this.compare("StartValue", true));
this.dataList.List.forEach(x => { this.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true)) x.FullClassList.sort(this.compare('StartValue', true))
}) })
...@@ -546,7 +564,6 @@ export default { ...@@ -546,7 +564,6 @@ export default {
} }
}) })
}, },
//获取班级类型列表数据 //获取班级类型列表数据
GetClassTypePageList() { GetClassTypePageList() {
let msg = { let msg = {
...@@ -577,7 +594,6 @@ export default { ...@@ -577,7 +594,6 @@ export default {
} }
}) })
}, },
//保存奖金设置 //保存奖金设置
saveBonus() { saveBonus() {
let msg = { let msg = {
...@@ -599,16 +615,16 @@ export default { ...@@ -599,16 +615,16 @@ export default {
//修改表格横向内容 //修改表格横向内容
getInnerEdit(item) { getInnerEdit(item) {
this.isShowInnerEdit = true; this.isShowInnerEdit = true;
this.CommonClassMoney = item.ClassMoney; this.ComMsg.CommonClassMoney = item.ClassMoney;
}, },
getReset(subItem) { getReset(subItem) {
subItem.ClassMoney = this.CommonClassMoney; subItem.ClassMoney = this.ComMsg.CommonClassMoney;
this.isShowInnerEdit = false; this.isShowInnerEdit = false;
this.$forceUpdate(); this.$forceUpdate();
}, },
} }
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass'); @import url('~assets/css/table.sass');
......
src/pages/course/studentClass.vue
View file @ c7884d55
<style> <style>
.socialTable { .socialTable {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
} }
.socialTable tr th { .socialTable tr th {
background: #fff; background: #fff;
height: 40px; height: 40px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
border: 1px solid #E6E6E6 border: 1px solid #E6E6E6
} }
.socialTable tr { .socialTable tr {
background: #fff; background: #fff;
text-align: center; text-align: center;
height: 40px; height: 40px;
} }
.socialTable tr td { .socialTable tr td {
font-size: 12px; font-size: 12px;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
.Classdel_Div i, .Classdel_Div i,
.div_RowList i { .div_RowList i {
display: inline-block; display: inline-block;
color: red; color: red;
visibility: hidden; visibility: hidden;
cursor: pointer; cursor: pointer;
margin-left: 3px; margin-left: 3px;
} }
.Classdel_Div:hover i { .Classdel_Div:hover i {
visibility: visible; visibility: visible;
} }
.div_RowList:hover i { .div_RowList:hover i {
visibility: visible; visibility: visible;
} }
</style> </style>
<template> <template>
<div class="page-body"> <div class="page-body">
<q-tabs v-model="tabCheck" narrow-indicator dense align="left" class="text-primary"> <q-tabs v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
<q-tab :ripple="false" name="first" label="奖金设置" @click="getBaseDropInfo" /> <q-tab :ripple="false" name="first" label="奖金设置" @click="getBaseDropInfo" />
<q-tab :ripple="false" name="second" label="课时费设置" /> <q-tab :ripple="false" name="second" label="课时费设置" />
...@@ -50,14 +51,15 @@ ...@@ -50,14 +51,15 @@
<div style="margin-top:20px;"> <div style="margin-top:20px;">
<div class="col" style="display:flex;"> <div class="col" style="display:flex;">
<div> <div>
<q-select class="q-pb-lg q-pr-lg" style="width:450px;" multiple clearable filled stack-label use-input use-chips option-value="CTypeId" option-label="CTypeName" v-model="tempSchool" ref="PostId" :options="DropDownList" label="班级类型" :dense="false" emit-value map-options> <q-select class="q-pb-lg q-pr-lg" style="width:450px;" multiple clearable filled stack-label use-input
use-chips option-value="CTypeId" option-label="CTypeName" v-model="tempSchool" ref="PostId"
:options="DropDownList" label="班级类型" :dense="false" emit-value map-options>
</q-select> </q-select>
</div> </div>
<div style="margin-top:15px;"> <div style="margin-top:15px;">
<q-btn color="accent" size="sm" @click="saveClass()" ref="addBtn" label="保存" /> <q-btn color="accent" size="sm" @click="saveClass()" ref="addBtn" label="保存" />
</div> </div>
</div> </div>
<table class="socialTable"> <table class="socialTable">
<tr> <tr>
<th :colspan="FullClassRateList.length+3"> <th :colspan="FullClassRateList.length+3">
...@@ -65,7 +67,8 @@ ...@@ -65,7 +67,8 @@
</th> </th>
</tr> </tr>
<tr> <tr>
<td style="width:200px;" v-if="dataList.List&&dataList.List.length>0" :rowspan="dataList.List.length+3">续班率</td> <td style="width:200px;" v-if="dataList.List&&dataList.List.length>0" :rowspan="dataList.List.length+3">续班率
</td>
<td :colspan="FullClassRateList.length+2">满班率</td> <td :colspan="FullClassRateList.length+2">满班率</td>
</tr> </tr>
<tr> <tr>
...@@ -79,15 +82,19 @@ ...@@ -79,15 +82,19 @@
<q-banner v-if="isShowColEdit"> <q-banner v-if="isShowColEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'StartValue')" maxlength="6">
</q-input> </q-input>
<div style="margin:20px 12px 0">-</div> <div style="margin:20px 12px 0">-</div>
<q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'EndValue')" maxlength="6">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false"
<q-btn label="确认" @click="editManBan()" color="accent q-px-md" style="font-weight:400 !important" /> style="font-weight:400 !important" />
<q-btn label="确认" @click="editManBan()" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -99,13 +106,19 @@ ...@@ -99,13 +106,19 @@
<q-banner v-if="isShowBanMenu"> <q-banner v-if="isShowBanMenu">
<div style="width:250px;"> <div style="width:250px;">
<div style="margin:10px 0 15px 0;">新增满班率</div> <div style="margin:10px 0 15px 0;">新增满班率</div>
<q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率"> <q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最小满班率']" @keyup.native="checkPrice(addBanObj,'StartValue')"
maxlength="6" label="最小满班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大满班率']" mask="date" label="最大满班率"> <q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最大满班率']" @keyup.native="checkPrice(addBanObj,'EndValue')"
maxlength="6" label="最大满班率">
</q-input> </q-input>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false"
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addColList()" /> style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="addColList()" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -118,7 +131,8 @@ ...@@ -118,7 +131,8 @@
<div class="div_RowList"> <div class="div_RowList">
{{item.StartValue}}<span v-if="item.StartValue>=0">%</span> {{item.StartValue}}<span v-if="item.StartValue>=0">%</span>
<template v-if="item.StartValue!=item.EndValue"> <template v-if="item.StartValue!=item.EndValue">
<span v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span v-if="item.EndValue>=0">%</span> <span v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span
v-if="item.EndValue>=0">%</span>
</template> </template>
<i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i> <i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i>
</div> </div>
...@@ -126,14 +140,17 @@ ...@@ -126,14 +140,17 @@
<q-banner v-if="isShowrowEdit"> <q-banner v-if="isShowrowEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.StartValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'StartValue')" maxlength="6">
</q-input> </q-input>
<div style="margin:20px 12px 0">-</div> <div style="margin:20px 12px 0">-</div>
<q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg" mask="date"> <q-input filled v-model="editObj.EndValue" class="col-5 q-pb-lg"
@keyup.native="checkPrice(editObj,'EndValue')" maxlength="6">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="editShangke()" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="editShangke()" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -145,11 +162,13 @@ ...@@ -145,11 +162,13 @@
<q-banner v-if="isShowInnerEdit"> <q-banner v-if="isShowInnerEdit">
<div style="width:180px;margin-top:20px;"> <div style="width:180px;margin-top:20px;">
<div class="row"> <div class="row">
<q-input filled v-model="CommonClassMoney" class="q-pb-lg" mask="date"> <q-input filled v-model="ComMsg.CommonClassMoney"
@keyup.native="checkPrice(ComMsg,'CommonClassMoney')" maxlength="6" class="q-pb-lg">
</q-input> </q-input>
</div> </div>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="确认" @click="getReset(subItem)" color="accent q-px-md" style="font-weight:400 !important" /> <q-btn label="确认" @click="getReset(subItem)" color="accent q-px-md"
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -164,13 +183,19 @@ ...@@ -164,13 +183,19 @@
<q-banner v-if="isShowAddMenu"> <q-banner v-if="isShowAddMenu">
<div style="width:250px;"> <div style="width:250px;">
<div style="margin:10px 0 15px 0;">新增续班率</div> <div style="margin:10px 0 15px 0;">新增续班率</div>
<q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小续班率']" mask="date" label="最小续班率"> <q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最小续班率']" @keyup.native="checkPrice(addObj,'StartValue')"
maxlength="6" label="最小续班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大续班率']" mask="date" label="最大续班率"> <q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg"
:rules="[val => !!val || '请填写最大续班率']" @keyup.native="checkPrice(addObj,'EndValue')"
maxlength="6" label="最大续班率">
</q-input> </q-input>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false" style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false"
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="addRowList()" /> style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="addRowList()" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
...@@ -191,24 +216,24 @@ ...@@ -191,24 +216,24 @@
<studentFee></studentFee> <studentFee></studentFee>
</div> </div>
</template> </template>
</div> </div>
</template> </template>
<script> <script>
import { import {
SetTeachingRewardsInfo, SetTeachingRewardsInfo,
GetTeachingRewardsList, GetTeachingRewardsList,
GetTeachingRewardsBaseInfo, GetTeachingRewardsBaseInfo,
SetTeachingRewardsBase SetTeachingRewardsBase
} from '../../api/reward/index'; } from '../../api/reward/index';
import { import {
GetClassTypePageList GetClassTypePageList
} from '../../api/system/index'; } from '../../api/system/index';
import studentFee from '../../components/course/studentFee' import studentFee from '../../components/course/studentFee'
export default { export default {
props: {}, props: {},
components: { components: {
studentFee studentFee
...@@ -244,12 +269,12 @@ export default { ...@@ -244,12 +269,12 @@ export default {
CommonIndex: -1, CommonIndex: -1,
isShowrowEdit: false, isShowrowEdit: false,
isShowColEdit: false, isShowColEdit: false,
DropDownList: [], //社会班下拉数据 DropDownList: [], //社会班下拉数据
tempSchool: [], //选中的班级 tempSchool: [], //选中的班级
isShowInnerEdit: false, isShowInnerEdit: false,
ComMsg: {
CommonClassMoney: '', CommonClassMoney: '',
},
setTeachMsg: { setTeachMsg: {
Id: 0, Id: 0,
Type: 2, Type: 2,
...@@ -317,7 +342,6 @@ export default { ...@@ -317,7 +342,6 @@ export default {
}) })
return; return;
} }
for (var i = 0; i < this.dataList.List.length; i++) { for (var i = 0; i < this.dataList.List.length; i++) {
if (((parseInt(this.addObj.StartValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj if (((parseInt(this.addObj.StartValue) >= this.dataList.List[i].StartValue) && (parseInt(this.addObj
.StartValue) <= this.dataList.List[i].EndValue)) || .StartValue) <= this.dataList.List[i].EndValue)) ||
...@@ -379,7 +403,6 @@ export default { ...@@ -379,7 +403,6 @@ export default {
}) })
return; return;
} }
for (var i = 0; i < this.FullClassRateList.length; i++) { for (var i = 0; i < this.FullClassRateList.length; i++) {
if (((parseInt(this.addBanObj.StartValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj if (((parseInt(this.addBanObj.StartValue) >= this.FullClassRateList[i].StartValue) && (parseInt(this.addBanObj
.StartValue) <= this.FullClassRateList[i].EndValue)) || .StartValue) <= this.FullClassRateList[i].EndValue)) ||
...@@ -397,7 +420,6 @@ export default { ...@@ -397,7 +420,6 @@ export default {
this.dataList.List.forEach(x => { this.dataList.List.forEach(x => {
x.FullClassList.push(JSON.parse(JSON.stringify(this.addBanObj))); x.FullClassList.push(JSON.parse(JSON.stringify(this.addBanObj)));
}) })
this.FullClassRateList.sort(this.compare("StartValue", true)); this.FullClassRateList.sort(this.compare("StartValue", true));
this.dataList.List.forEach(x => { this.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true)) x.FullClassList.sort(this.compare('StartValue', true))
...@@ -545,7 +567,6 @@ export default { ...@@ -545,7 +567,6 @@ export default {
} }
}) })
}, },
//获取班级类型列表数据 //获取班级类型列表数据
GetClassTypePageList() { GetClassTypePageList() {
let msg = { let msg = {
...@@ -576,7 +597,6 @@ export default { ...@@ -576,7 +597,6 @@ export default {
} }
}) })
}, },
//保存奖金设置 //保存奖金设置
saveBonus() { saveBonus() {
let msg = { let msg = {
...@@ -598,15 +618,16 @@ export default { ...@@ -598,15 +618,16 @@ export default {
//修改表格横向内容 //修改表格横向内容
getInnerEdit(item) { getInnerEdit(item) {
this.isShowInnerEdit = true; this.isShowInnerEdit = true;
this.CommonClassMoney = item.ClassMoney; this.ComMsg.CommonClassMoney = item.ClassMoney;
}, },
getReset(subItem) { getReset(subItem) {
subItem.ClassMoney = this.CommonClassMoney; subItem.ClassMoney = this.ComMsg.CommonClassMoney;
this.isShowInnerEdit = false; this.isShowInnerEdit = false;
this.$forceUpdate(); this.$forceUpdate();
} }
}, },
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass'); @import url('~assets/css/table.sass');
......
src/pages/school/assistant.vue
View file @ c7884d55
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<q-select @input="resetSearch" clearable filled stack-label option-value="SId" option-label="SName" <q-select @input="resetSearch" clearable filled stack-label option-value="SId" option-label="SName"
v-model="schoolTemp" ref="School_Id" :options="schoolList" label="所属校区" :dense="false" /> v-model="schoolTemp" ref="School_Id" :options="schoolList" label="所属校区" :dense="false" />
</div> </div>
<div class="col-3"> <div class="col-3" style="display:none;">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.AuditStatus" :options="AuditOpts" <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.AuditStatus" :options="AuditOpts"
emit-value map-options label="审核状态" /> emit-value map-options label="审核状态" />
</div> </div>
...@@ -163,12 +163,12 @@ ...@@ -163,12 +163,12 @@
field: 'PostName', field: 'PostName',
align: 'left', align: 'left',
}, },
{ // {
name: 'AuditStatus', // name: 'AuditStatus',
label: '审核状态', // label: '审核状态',
align: 'left', // align: 'left',
field: 'AuditStatus' // field: 'AuditStatus'
}, // },
{ {
name: 'ClassCount', name: 'ClassCount',
label: '带班数量', label: '带班数量',
......
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