Commit 14d15157 authored by Mac's avatar Mac

问题处理

parent 451892f3
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table" <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
separator="none" title="" :data="data" :columns="columns" row-key="name"> separator="none" title="" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props"> <template v-slot:top="props">
<div class="col-2 q-table__title">班级管理</div> <div class="col-2 q-table__title">教师课时奖励</div>
<q-space /> <q-space />
<q-btn color="accent" style="float:right;margin-right:0;" size="sm" class="q-mr-md" icon="add" <q-btn color="accent" style="float:right;margin-right:0;" size="sm" class="q-mr-md" icon="add"
label="新增课时奖励" @click="drawer=true"></q-btn> label="新增课时奖励" @click="drawer=true"></q-btn>
...@@ -81,8 +81,7 @@ ...@@ -81,8 +81,7 @@
</template> </template>
<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-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;" <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"
v-if="props.row.State==1 || ((props.row.State==1 || props.row.State==2) && props.row.FrIdList==0) || (props.row.State==2 && props.row.FrIdList==0 && props.row.Money>0) " v-if="props.row.State==1 || ((props.row.State==1 || props.row.State==2) && props.row.FrIdList==0) || (props.row.State==2 && props.row.FrIdList==0 && props.row.Money>0) "
> >
...@@ -105,6 +104,8 @@ ...@@ -105,6 +104,8 @@
</q-item> </q-item>
</q-list> </q-list>
</q-btn-dropdown> </q-btn-dropdown>
<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-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
</q-card-actions> </q-card-actions>
</q-card> </q-card>
</q-dialog> </q-dialog>
<el-drawer title="" :visible.sync="drawer" :with-header="false"> <el-drawer title="" :visible.sync="drawer" :with-header="false" >
<div style="padding: 15px" class="class-popover"> <div style="padding: 15px" class="class-popover">
<div style="font-size: 18px;font-weight: bold;color:#2D2D2D;font-family: 'perfectFont'">新增课时奖励</div> <div style="font-size: 18px;font-weight: bold;color:#2D2D2D;font-family: 'perfectFont'">新增课时奖励</div>
<q-select class="col-12 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips <q-select class="col-12 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips
...@@ -156,7 +157,7 @@ ...@@ -156,7 +157,7 @@
<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;" <el-date-picker v-model="addMsg.Month"   type="month" style="border:none;" format='yyyy-MM'
:picker-options="pickerOptions"></el-date-picker>        :picker-options="pickerOptions"></el-date-picker>       
</template> </template>
</q-field> </q-field>
...@@ -270,7 +271,9 @@ ...@@ -270,7 +271,9 @@
}, },
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() > Date.now(); let nowdate = new Date();
let upperMonth = nowdate.setMonth(nowdate.getMonth()-1)//小于本月
return time.getTime() > upperMonth;
}, },
}, },
} }
...@@ -280,8 +283,12 @@ ...@@ -280,8 +283,12 @@
this.GetTeacherList() this.GetTeacherList()
this.GetBonusStateList() this.GetBonusStateList()
this.financeinfo_post_GetList() this.financeinfo_post_GetList()
let nowdate = new Date();
let upperMonth = new Date(nowdate.setMonth(nowdate.getMonth()-1))//小于本月
this.addMsg.Month = upperMonth.getFullYear()+'-'+(upperMonth.getMonth()+1)
}, },
methods: { methods: {
financeinfo_post_GetList() { // 获取币种 financeinfo_post_GetList() { // 获取币种
this.apipost('financeinfo_post_GetList', { this.apipost('financeinfo_post_GetList', {
Name: '', Name: '',
...@@ -379,7 +386,7 @@ ...@@ -379,7 +386,7 @@
}) })
return return
} }
if (this.addMsg.Month == '') { if (this.addMsg.Month == '' || this.addMsg.Month == null) {
this.$q.notify({ this.$q.notify({
type: 'warning', type: 'warning',
position: 'top', position: 'top',
...@@ -388,6 +395,8 @@ ...@@ -388,6 +395,8 @@
}) })
return return
} }
let date = new Date(this.addMsg.Month)
this.addMsg.Month = date.getFullYear()+'-'+(date.getMonth()+1)
this.Dloading = true this.Dloading = true
setTeachingBonusAdd(this.addMsg).then(res => { setTeachingBonusAdd(this.addMsg).then(res => {
this.Dloading = false this.Dloading = false
...@@ -558,5 +567,7 @@ ...@@ -558,5 +567,7 @@
background: transparent !important; background: transparent !important;
border: 0 !important; border: 0 !important;
} }
.classHourReward .el-drawer.rtl{
overflow: inherit;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment