Skip to content

C
confucius
Commit 5daef726 authored by 罗超's avatar 罗超
Browse files
Options

修改

parent c5060cf7
Show whitespace changes
Inline Side-by-side
Showing with 2181 additions and 2107 deletions
src/components/course/classFee.vue
View file @ 5daef726
<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 <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>
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;">
...@@ -68,8 +65,11 @@ ...@@ -68,8 +65,11 @@
<tr> <tr>
<td colspan="2"></td> <td colspan="2"></td>
<td v-for="(item,index) in FullClassRateList" @click="getColEdit(item,index)"> <td v-for="(item,index) in FullClassRateList" @click="getColEdit(item,index)">
<div class="Classdel_Div">{{item.StartValue}}%-{{item.EndValue}}%<i @click.stop="deleCole(index)" <div class="Classdel_Div">
class="iconfont icon-shanchu"></i></div> {{item.StartValue}}%
<template v-if="item.StartValue!=item.EndValue">-{{item.EndValue}}%</template>
<i @click.stop="deleCole(index)" class="iconfont icon-shanchu"></i>
</div>
<q-popup-proxy> <q-popup-proxy>
<q-banner v-if="isShowColEdit"> <q-banner v-if="isShowColEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
...@@ -81,8 +81,7 @@ ...@@ -81,8 +81,7 @@
</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" <q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false" 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-btn label="确认" @click="editManBan()" color="accent q-px-md" style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -95,15 +94,12 @@ ...@@ -95,15 +94,12 @@
<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" <q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率">
:rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" <q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大满班率']" mask="date" label="最大满班率">
:rules="[val => !!val || '请填写最大满班率']" mask="date" 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" <q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false" style="font-weight:400 !important" />
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>
...@@ -116,9 +112,10 @@ ...@@ -116,9 +112,10 @@
<tr> <tr>
<td @click="getDataItem(item,index)" rowspan="2" style="width:150px;"> <td @click="getDataItem(item,index)" rowspan="2" style="width:150px;">
<div class="div_RowList"> <div class="div_RowList">
{{item.StartValue}}<span v-if="item.StartValue>=0">%</span><span {{item.StartValue}}<span v-if="item.StartValue>=0">%</span>
v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span <template v-if="item.StartValue!=item.EndValue">
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>
<i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i> <i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i>
</div> </div>
<q-popup-proxy> <q-popup-proxy>
...@@ -132,29 +129,51 @@ ...@@ -132,29 +129,51 @@
</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" <q-btn label="确认" @click="editShangke()" color="accent q-px-md" style="font-weight:400 !important" />
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</td> </td>
<td style="width:150px;">奖励课时费</td> <td style="width:150px;">奖励课时费</td>
<td v-for="(subItem,subIndex) in item.FullClassList"> <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-popup-proxy>
<q-input v-model="subItem.ClassMoney" @change="getReset()" dense autofocus counter /> <q-banner v-if="isShowInnerEdit">
</q-popup-edit> <div style="width:180px;margin-top:20px;">
<div class="row">
<q-input filled v-model="CommonClassMoney" class="q-pb-lg" mask="date">
</q-input>
</div>
<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-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</td> </td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>增加带班人数</td> <td>增加带班人数</td>
<td v-for="(subItem,subIndex) in item.FullClassList"> <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-popup-edit v-model.number="subItem.PeopelNum" buttons>
<q-input v-model="subItem.PeopelNum" @change="getReset()" dense autofocus counter /> <q-input v-model="subItem.PeopelNum" @change="getReset()" dense autofocus counter />
</q-popup-edit> </q-popup-edit> -->
<q-popup-proxy>
<q-banner v-if="isShowInnerEdit">
<div style="width:180px;margin-top:20px;">
<div class="row">
<q-input filled v-model="CommonPeople" class="q-pb-lg" mask="date">
</q-input>
</div>
<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-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</td> </td>
<td></td> <td></td>
</tr> </tr>
...@@ -166,15 +185,12 @@ ...@@ -166,15 +185,12 @@
<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" <q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率">
:rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" <q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大上课率']" mask="date" label="最大上课率">
:rules="[val => !!val || '请填写最大上课率']" mask="date" 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" <q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false" style="font-weight:400 !important" />
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>
...@@ -190,21 +206,22 @@ ...@@ -190,21 +206,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() {
...@@ -241,6 +258,9 @@ ...@@ -241,6 +258,9 @@
DropDownList: [], //社会班下拉数据 DropDownList: [], //社会班下拉数据
tempSchool: [], //选中的班级 tempSchool: [], //选中的班级
isShowInnerEdit: false,
CommonClassMoney: '', //公用修改值
CommonPeople: '', //公用带班人数
setTeachMsg: { setTeachMsg: {
Id: 0, Id: 0,
...@@ -301,9 +321,6 @@ ...@@ -301,9 +321,6 @@
}) })
return; return;
} }
if (this.addObj.StartValue == this.addObj.EndValue) {
this.addObj.EndValue = ''
}
if (parseInt(this.addObj.StartValue) > parseInt(this.addObj.EndValue)) { if (parseInt(this.addObj.StartValue) > parseInt(this.addObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -313,8 +330,8 @@ ...@@ -313,8 +330,8 @@
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.StartValue) <= this.dataList.List[i].EndValue)) ||
((parseInt(this.addObj.EndValue)>=this.dataList.List[i].StartValue)&&(parseInt(this.addObj.EndValue)<=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",
...@@ -323,14 +340,14 @@ ...@@ -323,14 +340,14 @@
return; return;
} }
} }
this.addObj.FullClassList=[]; this.addObj.FullClassList = [];
this.FullClassRateList.forEach(x => { this.FullClassRateList.forEach(x => {
x.ClassMoney = '' x.ClassMoney = ''
x.PeopelNum='' x.PeopelNum = ''
this.addObj.FullClassList.push(x); this.addObj.FullClassList.push(x);
}) })
this.dataList.List.push(JSON.parse(JSON.stringify(this.addObj))); this.dataList.List.push(JSON.parse(JSON.stringify(this.addObj)));
this.dataList.List.sort(this.compare("StartValue",true)); this.dataList.List.sort(this.compare("StartValue", true));
this.isShowAddMenu = false; this.isShowAddMenu = false;
}, },
compare(property, desc) { compare(property, desc) {
...@@ -364,9 +381,6 @@ ...@@ -364,9 +381,6 @@
}) })
return; return;
} }
if (this.addBanObj.StartValue == this.addBanObj.EndValue) {
this.addBanObj.EndValue = ''
}
if (parseInt(this.addBanObj.StartValue) > parseInt(this.addBanObj.EndValue)) { if (parseInt(this.addBanObj.StartValue) > parseInt(this.addBanObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -376,9 +390,9 @@ ...@@ -376,9 +390,9 @@
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.StartValue) <= this.FullClassRateList[i].EndValue)) ||
((parseInt(this.addBanObj.EndValue)>=this.FullClassRateList[i].StartValue)&&(parseInt(this.addBanObj.EndValue)<=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",
...@@ -388,10 +402,16 @@ ...@@ -388,10 +402,16 @@
} }
} }
this.FullClassRateList.push(JSON.parse(JSON.stringify(this.addBanObj))); this.FullClassRateList.push(JSON.parse(JSON.stringify(this.addBanObj)));
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.isShowBanMenu = false; this.isShowBanMenu = false;
this.FullClassRateList.sort(this.compare("StartValue", true));
this.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true))
})
}, },
//删除列 //删除列
deleCole(index) { deleCole(index) {
...@@ -404,9 +424,6 @@ ...@@ -404,9 +424,6 @@
deletRow(index) { deletRow(index) {
this.dataList.List.splice(index, 1); this.dataList.List.splice(index, 1);
}, },
getReset() {
this.$forceUpdate();
},
getDataItem(item, index) { getDataItem(item, index) {
this.isShowrowEdit = true; this.isShowrowEdit = true;
this.CommonIndex = index; this.CommonIndex = index;
...@@ -431,9 +448,6 @@ ...@@ -431,9 +448,6 @@
}) })
return; return;
} }
if (this.editObj.StartValue == this.editObj.EndValue) {
this.editObj.EndValue = ''
}
if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) { if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -443,7 +457,7 @@ ...@@ -443,7 +457,7 @@
return; return;
} }
let NewArr = JSON.parse(JSON.stringify(this.dataList.List)); let NewArr = JSON.parse(JSON.stringify(this.dataList.List));
NewArr.splice(this.CommonIndex,1); NewArr.splice(this.CommonIndex, 1);
for (var i = 0; i < NewArr.length; i++) { for (var i = 0; i < NewArr.length; i++) {
if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj
.StartValue) <= NewArr[i].EndValue)) || .StartValue) <= NewArr[i].EndValue)) ||
...@@ -486,9 +500,6 @@ ...@@ -486,9 +500,6 @@
}) })
return; return;
} }
if (this.editObj.StartValue == this.editObj.EndValue) {
this.editObj.EndValue = ''
}
if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) { if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -498,7 +509,7 @@ ...@@ -498,7 +509,7 @@
return; return;
} }
let NewArr = JSON.parse(JSON.stringify(this.FullClassRateList)); let NewArr = JSON.parse(JSON.stringify(this.FullClassRateList));
NewArr.splice(this.CommonIndex,1); NewArr.splice(this.CommonIndex, 1);
for (var i = 0; i < NewArr.length; i++) { for (var i = 0; i < NewArr.length; i++) {
if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj
.StartValue) <= NewArr[i].EndValue)) || .StartValue) <= NewArr[i].EndValue)) ||
...@@ -534,7 +545,7 @@ ...@@ -534,7 +545,7 @@
this.setTeachMsg.Id = res.Data.Id; this.setTeachMsg.Id = res.Data.Id;
this.setTeachMsg.BasicMoney = res.Data.BasicMoney; this.setTeachMsg.BasicMoney = res.Data.BasicMoney;
this.setTeachMsg.BasicHour = res.Data.BasicHour; this.setTeachMsg.BasicHour = res.Data.BasicHour;
if(res.Data.ClassTypeIdList){ if (res.Data.ClassTypeIdList) {
this.tempSchool = res.Data.ClassTypeIdList; this.tempSchool = res.Data.ClassTypeIdList;
} }
} }
...@@ -555,9 +566,9 @@ ...@@ -555,9 +566,9 @@
}, },
//保存上部 //保存上部
saveClass() { saveClass() {
if(this.tempSchool){ if (this.tempSchool) {
this.setTeachMsg.ClassTypeIds = this.tempSchool.toString(); this.setTeachMsg.ClassTypeIds = this.tempSchool.toString();
}else{ } else {
this.setTeachMsg.ClassTypeIds = ''; this.setTeachMsg.ClassTypeIds = '';
} }
SetTeachingRewardsBase(this.setTeachMsg).then(res => { SetTeachingRewardsBase(this.setTeachMsg).then(res => {
...@@ -589,10 +600,30 @@ ...@@ -589,10 +600,30 @@
this.getInfo(); this.getInfo();
} }
}) })
}
}, },
} //修改表格横向内容
getInnerEdit(item) {
this.isShowInnerEdit = true;
this.CommonClassMoney = item.ClassMoney;
},
getReset(subItem) {
subItem.ClassMoney = this.CommonClassMoney;
this.isShowInnerEdit = false;
this.$forceUpdate();
},
//修改带班人数
getPeopleEdit(item) {
this.isShowInnerEdit = true;
this.CommonPeople = item.PeopelNum;
},
getPeopleSet(subItem) {
subItem.PeopelNum = this.CommonPeople;
this.isShowInnerEdit = false;
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 @ 5daef726
<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 <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>
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;">
...@@ -68,8 +65,11 @@ ...@@ -68,8 +65,11 @@
<tr> <tr>
<td colspan="2"></td> <td colspan="2"></td>
<td v-for="(item,index) in FullClassRateList" @click="getColEdit(item,index)"> <td v-for="(item,index) in FullClassRateList" @click="getColEdit(item,index)">
<div class="Classdel_Div">{{item.StartValue}}%-{{item.EndValue}}%<i @click.stop="deleCole(index)" <div class="Classdel_Div">
class="iconfont icon-shanchu"></i></div> {{item.StartValue}}%
<template v-if="item.StartValue!=item.EndValue">-{{item.EndValue}}%</template>
<i @click.stop="deleCole(index)" class="iconfont icon-shanchu"></i>
</div>
<q-popup-proxy> <q-popup-proxy>
<q-banner v-if="isShowColEdit"> <q-banner v-if="isShowColEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
...@@ -81,8 +81,7 @@ ...@@ -81,8 +81,7 @@
</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" <q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false" 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-btn label="确认" @click="editManBan()" color="accent q-px-md" style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -95,15 +94,12 @@ ...@@ -95,15 +94,12 @@
<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" <q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率">
:rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" <q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大满班率']" mask="date" label="最大满班率">
:rules="[val => !!val || '请填写最大满班率']" mask="date" 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" <q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false" style="font-weight:400 !important" />
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>
...@@ -116,9 +112,10 @@ ...@@ -116,9 +112,10 @@
<tr> <tr>
<td @click="getDataItem(item,index)" rowspan="2" style="width:150px;"> <td @click="getDataItem(item,index)" rowspan="2" style="width:150px;">
<div class="div_RowList"> <div class="div_RowList">
{{item.StartValue}}<span v-if="item.StartValue>=0">%</span><span {{item.StartValue}}<span v-if="item.StartValue>=0">%</span>
v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span <template v-if="item.StartValue!=item.EndValue">
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>
<i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i> <i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i>
</div> </div>
<q-popup-proxy> <q-popup-proxy>
...@@ -132,29 +129,48 @@ ...@@ -132,29 +129,48 @@
</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" <q-btn label="确认" @click="editShangke()" color="accent q-px-md" style="font-weight:400 !important" />
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</td> </td>
<td style="width:150px;">奖励课时费</td> <td style="width:150px;">奖励课时费</td>
<td v-for="(subItem,subIndex) in item.FullClassList"> <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-popup-proxy>
<q-input v-model="subItem.ClassMoney" @change="getReset()" dense autofocus counter /> <q-banner v-if="isShowInnerEdit">
</q-popup-edit> <div style="width:180px;margin-top:20px;">
<div class="row">
<q-input filled v-model="CommonClassMoney" class="q-pb-lg" mask="date">
</q-input>
</div>
<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-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</td> </td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>增加带班人数</td> <td>增加带班人数</td>
<td v-for="(subItem,subIndex) in item.FullClassList"> <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-popup-proxy>
<q-input v-model="subItem.PeopelNum" @change="getReset()" dense autofocus counter /> <q-banner v-if="isShowInnerEdit">
</q-popup-edit> <div style="width:180px;margin-top:20px;">
<div class="row">
<q-input filled v-model="CommonPeople" class="q-pb-lg" mask="date">
</q-input>
</div>
<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-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</td> </td>
<td></td> <td></td>
</tr> </tr>
...@@ -166,15 +182,12 @@ ...@@ -166,15 +182,12 @@
<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" <q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率">
:rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" <q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大上课率']" mask="date" label="最大上课率">
:rules="[val => !!val || '请填写最大上课率']" mask="date" 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" <q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false" style="font-weight:400 !important" />
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>
...@@ -190,21 +203,22 @@ ...@@ -190,21 +203,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() {
...@@ -242,6 +256,10 @@ ...@@ -242,6 +256,10 @@
DropDownList: [], //社会班下拉数据 DropDownList: [], //社会班下拉数据
tempSchool: [], //选中的班级 tempSchool: [], //选中的班级
isShowInnerEdit: false,
CommonClassMoney: '', //公用修改值
CommonPeople: '', //公用带班人数
setTeachMsg: { setTeachMsg: {
Id: 0, Id: 0,
Type: 2, Type: 2,
...@@ -301,9 +319,6 @@ ...@@ -301,9 +319,6 @@
}) })
return; return;
} }
if (this.addObj.StartValue == this.addObj.EndValue) {
this.addObj.EndValue = ''
}
if (parseInt(this.addObj.StartValue) > parseInt(this.addObj.EndValue)) { if (parseInt(this.addObj.StartValue) > parseInt(this.addObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -313,8 +328,8 @@ ...@@ -313,8 +328,8 @@
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.StartValue) <= this.dataList.List[i].EndValue)) ||
((parseInt(this.addObj.EndValue)>=this.dataList.List[i].StartValue)&&(parseInt(this.addObj.EndValue)<=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",
...@@ -323,14 +338,14 @@ ...@@ -323,14 +338,14 @@
return; return;
} }
} }
this.addObj.FullClassList=[]; this.addObj.FullClassList = [];
this.FullClassRateList.forEach(x => { this.FullClassRateList.forEach(x => {
x.ClassMoney = '' x.ClassMoney = ''
x.PeopelNum='' x.PeopelNum = ''
this.addObj.FullClassList.push(x); this.addObj.FullClassList.push(x);
}) })
this.dataList.List.push(JSON.parse(JSON.stringify(this.addObj))); this.dataList.List.push(JSON.parse(JSON.stringify(this.addObj)));
this.dataList.List.sort(this.compare("StartValue",true)); this.dataList.List.sort(this.compare("StartValue", true));
this.isShowAddMenu = false; this.isShowAddMenu = false;
}, },
compare(property, desc) { compare(property, desc) {
...@@ -364,9 +379,6 @@ ...@@ -364,9 +379,6 @@
}) })
return; return;
} }
if (this.addBanObj.StartValue == this.addBanObj.EndValue) {
this.addBanObj.EndValue = ''
}
if (parseInt(this.addBanObj.StartValue) > parseInt(this.addBanObj.EndValue)) { if (parseInt(this.addBanObj.StartValue) > parseInt(this.addBanObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -376,9 +388,9 @@ ...@@ -376,9 +388,9 @@
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.StartValue) <= this.FullClassRateList[i].EndValue)) ||
((parseInt(this.addBanObj.EndValue)>=this.FullClassRateList[i].StartValue)&&(parseInt(this.addBanObj.EndValue)<=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",
...@@ -388,9 +400,14 @@ ...@@ -388,9 +400,14 @@
} }
} }
this.FullClassRateList.push(JSON.parse(JSON.stringify(this.addBanObj))); this.FullClassRateList.push(JSON.parse(JSON.stringify(this.addBanObj)));
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.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true))
})
this.isShowBanMenu = false; this.isShowBanMenu = false;
}, },
//删除列 //删除列
...@@ -431,9 +448,6 @@ ...@@ -431,9 +448,6 @@
}) })
return; return;
} }
if (this.editObj.StartValue == this.editObj.EndValue) {
this.editObj.EndValue = ''
}
if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) { if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -443,7 +457,7 @@ ...@@ -443,7 +457,7 @@
return; return;
} }
let NewArr = JSON.parse(JSON.stringify(this.dataList.List)); let NewArr = JSON.parse(JSON.stringify(this.dataList.List));
NewArr.splice(this.CommonIndex,1); NewArr.splice(this.CommonIndex, 1);
for (var i = 0; i < NewArr.length; i++) { for (var i = 0; i < NewArr.length; i++) {
if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj
.StartValue) <= NewArr[i].EndValue)) || .StartValue) <= NewArr[i].EndValue)) ||
...@@ -486,9 +500,6 @@ ...@@ -486,9 +500,6 @@
}) })
return; return;
} }
if (this.editObj.StartValue == this.editObj.EndValue) {
this.editObj.EndValue = ''
}
if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) { if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -498,7 +509,7 @@ ...@@ -498,7 +509,7 @@
return; return;
} }
let NewArr = JSON.parse(JSON.stringify(this.FullClassRateList)); let NewArr = JSON.parse(JSON.stringify(this.FullClassRateList));
NewArr.splice(this.CommonIndex,1); NewArr.splice(this.CommonIndex, 1);
for (var i = 0; i < NewArr.length; i++) { for (var i = 0; i < NewArr.length; i++) {
if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj
.StartValue) <= NewArr[i].EndValue)) || .StartValue) <= NewArr[i].EndValue)) ||
...@@ -534,7 +545,7 @@ ...@@ -534,7 +545,7 @@
this.setTeachMsg.Id = res.Data.Id; this.setTeachMsg.Id = res.Data.Id;
this.setTeachMsg.BasicMoney = res.Data.BasicMoney; this.setTeachMsg.BasicMoney = res.Data.BasicMoney;
this.setTeachMsg.BasicHour = res.Data.BasicHour; this.setTeachMsg.BasicHour = res.Data.BasicHour;
if(res.Data.ClassTypeIdList){ if (res.Data.ClassTypeIdList) {
this.tempSchool = res.Data.ClassTypeIdList; this.tempSchool = res.Data.ClassTypeIdList;
} }
} }
...@@ -555,9 +566,9 @@ ...@@ -555,9 +566,9 @@
}, },
//保存上部 //保存上部
saveClass() { saveClass() {
if(this.tempSchool){ if (this.tempSchool) {
this.setTeachMsg.ClassTypeIds = this.tempSchool.toString(); this.setTeachMsg.ClassTypeIds = this.tempSchool.toString();
}else{ } else {
this.setTeachMsg.ClassTypeIds = ''; this.setTeachMsg.ClassTypeIds = '';
} }
SetTeachingRewardsBase(this.setTeachMsg).then(res => { SetTeachingRewardsBase(this.setTeachMsg).then(res => {
...@@ -589,10 +600,31 @@ ...@@ -589,10 +600,31 @@
this.getInfo(); this.getInfo();
} }
}) })
}
}, },
}
//修改表格横向内容
getInnerEdit(item) {
this.isShowInnerEdit = true;
this.CommonClassMoney = item.ClassMoney;
},
getReset(subItem) {
subItem.ClassMoney = this.CommonClassMoney;
this.isShowInnerEdit = false;
this.$forceUpdate();
},
//修改带班人数
getPeopleEdit(item) {
this.isShowInnerEdit = true;
this.CommonPeople = item.PeopelNum;
},
getPeopleSet(subItem) {
subItem.PeopelNum = this.CommonPeople;
this.isShowInnerEdit = false;
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/socialclass.vue
View file @ 5daef726
<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="课时费设置" />
...@@ -51,9 +50,7 @@ ...@@ -51,9 +50,7 @@
<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 <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>
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;">
...@@ -74,8 +71,11 @@ ...@@ -74,8 +71,11 @@
<tr> <tr>
<td></td> <td></td>
<td v-for="(item,index) in FullClassRateList" @click="getColEdit(item,index)"> <td v-for="(item,index) in FullClassRateList" @click="getColEdit(item,index)">
<div class="Classdel_Div">{{item.StartValue}}%-{{item.EndValue}}%<i @click.stop="deleCole(index)" <div class="Classdel_Div">
class="iconfont icon-shanchu"></i></div> {{item.StartValue}}%
<template v-if="item.StartValue!=item.EndValue">-{{item.EndValue}}%</template>
<i @click.stop="deleCole(index)" class="iconfont icon-shanchu"></i>
</div>
<q-popup-proxy> <q-popup-proxy>
<q-banner v-if="isShowColEdit"> <q-banner v-if="isShowColEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
...@@ -87,10 +87,8 @@ ...@@ -87,10 +87,8 @@
</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" <q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false" 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-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>
...@@ -102,17 +100,13 @@ ...@@ -102,17 +100,13 @@
<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" <q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率">
:rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" <q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大满班率']" mask="date" label="最大满班率">
:rules="[val => !!val || '请填写最大满班率']" mask="date" 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" <q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false" style="font-weight:400 !important" />
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>
</q-banner> </q-banner>
...@@ -123,9 +117,10 @@ ...@@ -123,9 +117,10 @@
<tr v-for="(item,index) in dataList.List"> <tr v-for="(item,index) in dataList.List">
<td @click="getDataItem(item,index)" style="width:200px;"> <td @click="getDataItem(item,index)" style="width:200px;">
<div class="div_RowList"> <div class="div_RowList">
{{item.StartValue}}<span v-if="item.StartValue>=0">%</span><span {{item.StartValue}}<span v-if="item.StartValue>=0">%</span>
v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span <template v-if="item.StartValue!=item.EndValue">
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>
<i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i> <i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i>
</div> </div>
<q-popup-proxy> <q-popup-proxy>
...@@ -139,18 +134,30 @@ ...@@ -139,18 +134,30 @@
</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" <q-btn label="确认" @click="editShangke()" color="accent q-px-md" style="font-weight:400 !important" />
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</td> </td>
<td v-for="(subItem,subIndex) in item.FullClassList"> <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-popup-edit v-model.number="subItem.ClassMoney" buttons>
<q-input v-model="subItem.ClassMoney" @change="getReset()" dense autofocus counter /> <q-input v-model="subItem.ClassMoney" @change="getReset()" dense autofocus counter />
</q-popup-edit> </q-popup-edit> -->
<q-popup-proxy>
<q-banner v-if="isShowInnerEdit">
<div style="width:180px;margin-top:20px;">
<div class="row">
<q-input filled v-model="CommonClassMoney" class="q-pb-lg" mask="date">
</q-input>
</div>
<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-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</td> </td>
<td></td> <td></td>
</tr> </tr>
...@@ -161,17 +168,13 @@ ...@@ -161,17 +168,13 @@
<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" <q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率">
:rules="[val => !!val || '请填写最小上课率']" mask="date" label="最小上课率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" <q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大上课率']" mask="date" label="最大上课率">
:rules="[val => !!val || '请填写最大上课率']" mask="date" 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" <q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false" style="font-weight:400 !important" />
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>
</q-banner> </q-banner>
...@@ -192,23 +195,24 @@ ...@@ -192,23 +195,24 @@
<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
...@@ -247,7 +251,8 @@ ...@@ -247,7 +251,8 @@
DropDownList: [], //社会班下拉数据 DropDownList: [], //社会班下拉数据
tempSchool: [], //选中的班级 tempSchool: [], //选中的班级
isShowInnerEdit: false,
CommonClassMoney: '', //公用修改值
setTeachMsg: { setTeachMsg: {
Id: 0, Id: 0,
Type: 1, Type: 1,
...@@ -274,6 +279,7 @@ ...@@ -274,6 +279,7 @@
if (this.dataList.FullClassRateList.length > 0) { if (this.dataList.FullClassRateList.length > 0) {
this.FullClassRateList = this.dataList.FullClassRateList; this.FullClassRateList = this.dataList.FullClassRateList;
} }
console.log(this.dataList, 'datalist');
} }
}) })
}, },
...@@ -307,9 +313,6 @@ ...@@ -307,9 +313,6 @@
}) })
return; return;
} }
if (this.addObj.StartValue == this.addObj.EndValue) {
this.addObj.EndValue = ''
}
if (parseInt(this.addObj.StartValue) > parseInt(this.addObj.EndValue)) { if (parseInt(this.addObj.StartValue) > parseInt(this.addObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -372,9 +375,6 @@ ...@@ -372,9 +375,6 @@
}) })
return; return;
} }
if (this.addBanObj.StartValue == this.addBanObj.EndValue) {
this.addBanObj.EndValue = ''
}
if (parseInt(this.addBanObj.StartValue) > parseInt(this.addBanObj.EndValue)) { if (parseInt(this.addBanObj.StartValue) > parseInt(this.addBanObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -402,6 +402,12 @@ ...@@ -402,6 +402,12 @@
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.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true))
})
}, },
//删除列 //删除列
deleCole(index) { deleCole(index) {
...@@ -414,9 +420,6 @@ ...@@ -414,9 +420,6 @@
deletRow(index) { deletRow(index) {
this.dataList.List.splice(index, 1); this.dataList.List.splice(index, 1);
}, },
getReset() {
this.$forceUpdate();
},
getDataItem(item, index) { getDataItem(item, index) {
this.isShowrowEdit = true; this.isShowrowEdit = true;
this.CommonIndex = index; this.CommonIndex = index;
...@@ -441,9 +444,6 @@ ...@@ -441,9 +444,6 @@
}) })
return; return;
} }
if (this.editObj.StartValue == this.editObj.EndValue) {
this.editObj.EndValue = ''
}
if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) { if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
return; return;
} }
let NewArr = JSON.parse(JSON.stringify(this.dataList.List)); let NewArr = JSON.parse(JSON.stringify(this.dataList.List));
NewArr.splice(this.CommonIndex,1); NewArr.splice(this.CommonIndex, 1);
for (var i = 0; i < NewArr.length; i++) { for (var i = 0; i < NewArr.length; i++) {
if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj
.StartValue) <= NewArr[i].EndValue)) || .StartValue) <= NewArr[i].EndValue)) ||
...@@ -496,9 +496,6 @@ ...@@ -496,9 +496,6 @@
}) })
return; return;
} }
if (this.editObj.StartValue == this.editObj.EndValue) {
this.editObj.EndValue = ''
}
if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) { if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -508,7 +505,7 @@ ...@@ -508,7 +505,7 @@
return; return;
} }
let NewArr = JSON.parse(JSON.stringify(this.FullClassRateList)); let NewArr = JSON.parse(JSON.stringify(this.FullClassRateList));
NewArr.splice(this.CommonIndex,1); NewArr.splice(this.CommonIndex, 1);
for (var i = 0; i < NewArr.length; i++) { for (var i = 0; i < NewArr.length; i++) {
if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj
.StartValue) <= NewArr[i].EndValue)) || .StartValue) <= NewArr[i].EndValue)) ||
...@@ -544,7 +541,7 @@ ...@@ -544,7 +541,7 @@
this.setTeachMsg.Id = res.Data.Id; this.setTeachMsg.Id = res.Data.Id;
this.setTeachMsg.BasicMoney = res.Data.BasicMoney; this.setTeachMsg.BasicMoney = res.Data.BasicMoney;
this.setTeachMsg.BasicHour = res.Data.BasicHour; this.setTeachMsg.BasicHour = res.Data.BasicHour;
if(res.Data.ClassTypeIdList){ if (res.Data.ClassTypeIdList) {
this.tempSchool = res.Data.ClassTypeIdList; this.tempSchool = res.Data.ClassTypeIdList;
} }
} }
...@@ -565,9 +562,9 @@ ...@@ -565,9 +562,9 @@
}, },
//保存上部 //保存上部
saveClass() { saveClass() {
if(this.tempSchool){ if (this.tempSchool) {
this.setTeachMsg.ClassTypeIds = this.tempSchool.toString(); this.setTeachMsg.ClassTypeIds = this.tempSchool.toString();
}else{ } else {
this.setTeachMsg.ClassTypeIds = ''; this.setTeachMsg.ClassTypeIds = '';
} }
SetTeachingRewardsBase(this.setTeachMsg).then(res => { SetTeachingRewardsBase(this.setTeachMsg).then(res => {
...@@ -599,10 +596,20 @@ ...@@ -599,10 +596,20 @@
this.getInfo(); this.getInfo();
} }
}) })
} },
} //修改表格横向内容
} getInnerEdit(item) {
this.isShowInnerEdit = true;
this.CommonClassMoney = item.ClassMoney;
},
getReset(subItem) {
subItem.ClassMoney = this.CommonClassMoney;
this.isShowInnerEdit = false;
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 @ 5daef726
<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="课时费设置" />
...@@ -51,9 +50,7 @@ ...@@ -51,9 +50,7 @@
<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 <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>
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;">
...@@ -74,8 +71,10 @@ ...@@ -74,8 +71,10 @@
<tr> <tr>
<td></td> <td></td>
<td v-for="(item,index) in FullClassRateList" @click="getColEdit(item,index)"> <td v-for="(item,index) in FullClassRateList" @click="getColEdit(item,index)">
<div class="Classdel_Div">{{item.StartValue}}%-{{item.EndValue}}%<i @click.stop="deleCole(index)" <div class="Classdel_Div">{{item.StartValue}}%
class="iconfont icon-shanchu"></i></div> <template v-if="item.StartValue!=item.EndValue">-{{item.EndValue}}%</template>
<i @click.stop="deleCole(index)" class="iconfont icon-shanchu"></i>
</div>
<q-popup-proxy> <q-popup-proxy>
<q-banner v-if="isShowColEdit"> <q-banner v-if="isShowColEdit">
<div style="width:200px;margin-top:20px;"> <div style="width:200px;margin-top:20px;">
...@@ -87,10 +86,8 @@ ...@@ -87,10 +86,8 @@
</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" <q-btn label="取消" flat color="grey-10" @click="isShowColEdit=false" 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-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>
...@@ -102,17 +99,13 @@ ...@@ -102,17 +99,13 @@
<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" <q-input filled v-model="addBanObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率">
:rules="[val => !!val || '请填写最小满班率']" mask="date" label="最小满班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" <q-input filled style="margin-top:10px;" v-model="addBanObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大满班率']" mask="date" label="最大满班率">
:rules="[val => !!val || '请填写最大满班率']" mask="date" 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" <q-btn label="取消" flat color="grey-10" @click="isShowBanMenu=false" style="font-weight:400 !important" />
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>
</q-banner> </q-banner>
...@@ -123,9 +116,10 @@ ...@@ -123,9 +116,10 @@
<tr v-for="(item,index) in dataList.List"> <tr v-for="(item,index) in dataList.List">
<td @click="getDataItem(item,index)" style="width:200px;"> <td @click="getDataItem(item,index)" style="width:200px;">
<div class="div_RowList"> <div class="div_RowList">
{{item.StartValue}}<span v-if="item.StartValue>=0">%</span><span {{item.StartValue}}<span v-if="item.StartValue>=0">%</span>
v-if="item.StartValue>=0&&item.EndValue>=0">-</span>{{item.EndValue}}<span <template v-if="item.StartValue!=item.EndValue">
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>
<i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i> <i @click.stop="deletRow(index)" class="iconfont icon-shanchu"></i>
</div> </div>
<q-popup-proxy> <q-popup-proxy>
...@@ -139,18 +133,27 @@ ...@@ -139,18 +133,27 @@
</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" <q-btn label="确认" @click="editShangke()" color="accent q-px-md" style="font-weight:400 !important" />
style="font-weight:400 !important" />
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</td> </td>
<td v-for="(subItem,subIndex) in item.FullClassList"> <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-popup-proxy>
<q-input v-model="subItem.ClassMoney" @change="getReset()" dense autofocus counter /> <q-banner v-if="isShowInnerEdit">
</q-popup-edit> <div style="width:180px;margin-top:20px;">
<div class="row">
<q-input filled v-model="CommonClassMoney" class="q-pb-lg" mask="date">
</q-input>
</div>
<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-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</td> </td>
<td></td> <td></td>
</tr> </tr>
...@@ -161,17 +164,13 @@ ...@@ -161,17 +164,13 @@
<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" <q-input filled v-model="addObj.StartValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最小续班率']" mask="date" label="最小续班率">
:rules="[val => !!val || '请填写最小续班率']" mask="date" label="最小续班率">
</q-input> </q-input>
<q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" <q-input filled style="margin-top:10px;" v-model="addObj.EndValue" class="col-6 q-pb-lg" :rules="[val => !!val || '请填写最大续班率']" mask="date" label="最大续班率">
:rules="[val => !!val || '请填写最大续班率']" mask="date" 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" <q-btn label="取消" flat color="grey-10" @click="isShowAddMenu=false" style="font-weight:400 !important" />
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>
</q-banner> </q-banner>
...@@ -192,23 +191,24 @@ ...@@ -192,23 +191,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
...@@ -247,6 +247,8 @@ ...@@ -247,6 +247,8 @@
DropDownList: [], //社会班下拉数据 DropDownList: [], //社会班下拉数据
tempSchool: [], //选中的班级 tempSchool: [], //选中的班级
isShowInnerEdit: false,
CommonClassMoney: '',
setTeachMsg: { setTeachMsg: {
Id: 0, Id: 0,
...@@ -307,9 +309,6 @@ ...@@ -307,9 +309,6 @@
}) })
return; return;
} }
if (this.addObj.StartValue == this.addObj.EndValue) {
this.addObj.EndValue = ''
}
if (parseInt(this.addObj.StartValue) > parseInt(this.addObj.EndValue)) { if (parseInt(this.addObj.StartValue) > parseInt(this.addObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -372,9 +371,6 @@ ...@@ -372,9 +371,6 @@
}) })
return; return;
} }
if (this.addBanObj.StartValue == this.addBanObj.EndValue) {
this.addBanObj.EndValue = ''
}
if (parseInt(this.addBanObj.StartValue) > parseInt(this.addBanObj.EndValue)) { if (parseInt(this.addBanObj.StartValue) > parseInt(this.addBanObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -401,6 +397,11 @@ ...@@ -401,6 +397,11 @@
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.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true))
})
this.isShowBanMenu = false; this.isShowBanMenu = false;
}, },
//删除列 //删除列
...@@ -441,9 +442,6 @@ ...@@ -441,9 +442,6 @@
}) })
return; return;
} }
if (this.editObj.StartValue == this.editObj.EndValue) {
this.editObj.EndValue = ''
}
if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) { if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -453,7 +451,7 @@ ...@@ -453,7 +451,7 @@
return; return;
} }
let NewArr = JSON.parse(JSON.stringify(this.dataList.List)); let NewArr = JSON.parse(JSON.stringify(this.dataList.List));
NewArr.splice(this.CommonIndex,1); NewArr.splice(this.CommonIndex, 1);
for (var i = 0; i < NewArr.length; i++) { for (var i = 0; i < NewArr.length; i++) {
if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj
.StartValue) <= NewArr[i].EndValue)) || .StartValue) <= NewArr[i].EndValue)) ||
...@@ -496,9 +494,6 @@ ...@@ -496,9 +494,6 @@
}) })
return; return;
} }
if (this.editObj.StartValue == this.editObj.EndValue) {
this.editObj.EndValue = ''
}
if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) { if (parseInt(this.editObj.StartValue) > parseInt(this.editObj.EndValue)) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -508,7 +503,7 @@ ...@@ -508,7 +503,7 @@
return; return;
} }
let NewArr = JSON.parse(JSON.stringify(this.FullClassRateList)); let NewArr = JSON.parse(JSON.stringify(this.FullClassRateList));
NewArr.splice(this.CommonIndex,1); NewArr.splice(this.CommonIndex, 1);
for (var i = 0; i < NewArr.length; i++) { for (var i = 0; i < NewArr.length; i++) {
if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj if (((parseInt(this.editObj.StartValue) >= NewArr[i].StartValue) && (parseInt(this.editObj
.StartValue) <= NewArr[i].EndValue)) || .StartValue) <= NewArr[i].EndValue)) ||
...@@ -544,7 +539,7 @@ ...@@ -544,7 +539,7 @@
this.setTeachMsg.Id = res.Data.Id; this.setTeachMsg.Id = res.Data.Id;
this.setTeachMsg.BasicMoney = res.Data.BasicMoney; this.setTeachMsg.BasicMoney = res.Data.BasicMoney;
this.setTeachMsg.BasicHour = res.Data.BasicHour; this.setTeachMsg.BasicHour = res.Data.BasicHour;
if(res.Data.ClassTypeIdList){ if (res.Data.ClassTypeIdList) {
this.tempSchool = res.Data.ClassTypeIdList; this.tempSchool = res.Data.ClassTypeIdList;
} }
} }
...@@ -565,9 +560,9 @@ ...@@ -565,9 +560,9 @@
}, },
//保存上部 //保存上部
saveClass() { saveClass() {
if(this.tempSchool){ if (this.tempSchool) {
this.setTeachMsg.ClassTypeIds = this.tempSchool.toString(); this.setTeachMsg.ClassTypeIds = this.tempSchool.toString();
}else{ } else {
this.setTeachMsg.ClassTypeIds = ''; this.setTeachMsg.ClassTypeIds = '';
} }
SetTeachingRewardsBase(this.setTeachMsg).then(res => { SetTeachingRewardsBase(this.setTeachMsg).then(res => {
...@@ -599,10 +594,19 @@ ...@@ -599,10 +594,19 @@
this.getInfo(); this.getInfo();
} }
}) })
}
}, },
//修改表格横向内容
getInnerEdit(item) {
this.isShowInnerEdit = true;
this.CommonClassMoney = item.ClassMoney;
},
getReset(subItem) {
subItem.ClassMoney = this.CommonClassMoney;
this.isShowInnerEdit = false;
this.$forceUpdate();
} }
},
}
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass'); @import url('~assets/css/table.sass');
......
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