Commit 93b62ca3 authored by 吴春's avatar 吴春
parents 460e4add 7797997e
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
} from "../../../api/school/index"; } from "../../../api/school/index";
import reserveclassForm from "./reserveclass-form"; import reserveclassForm from "./reserveclass-form";
import reserveclasskaikeform from "./reserveclasskaikeform"; import reserveclasskaikeform from "./reserveclasskaikeform";
import audition from "../../../pages/h5page/audition"; import audition from "../../../pages/h5page/components/audition";
export default { export default {
meta: { meta: {
......
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
></el-table-column> ></el-table-column>
<el-table-column prop="SchoolName" label="校区"> </el-table-column> <el-table-column prop="SchoolName" label="校区"> </el-table-column>
<el-table-column prop="TeacherName" label="老师"> </el-table-column> <el-table-column prop="TeacherName" label="老师"> </el-table-column>
<el-table-column prop="Money" label="应发提成金额"> <el-table-column prop="Money" label="应发课时费">
</el-table-column> </el-table-column>
<el-table-column prop="IsGiveOut" label="是否已发放"> <el-table-column prop="IsGiveOut" label="是否已发放">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -648,9 +648,9 @@ ...@@ -648,9 +648,9 @@
CourseId: item.CourseId, CourseId: item.CourseId,
Status: status Status: status
}; };
var message = "是否要删除课程?"; var message = "是否要删除【"+item.CourseName+"】课程?";
if (status == 0) { if (status == 0) {
message = "是否要恢复课程?"; message = "是否要恢复【"+item.CourseName+"】课程?";
} }
this.$q this.$q
.dialog({ .dialog({
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</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" <q-table style="max-height: 65vh;overflow: auto;" :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
separator="none" :data="data.List" :columns="columns" row-key="name"> separator="none" :data="data.List" :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>
......
...@@ -555,13 +555,13 @@ ...@@ -555,13 +555,13 @@
</el-select> </el-select>
</td> </td>
<td height="26px"> <td height="26px">
<el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" :disabled="daIn === 0 && XSTC" <el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" :disabled="(daIn === 0 && XSTC)||(orderObj.PeopleCostType&&orderObj.PeopleCostType==486)"
type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" @input="chages($event)" class="w80 _border_b_1"> type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" @input="chages($event)" class="w80 _border_b_1">
</el-input> </el-input>
</td> </td>
<td height="26px"> <td height="26px">
<el-input v-model="da.UnitPrice" type="text" <el-input v-model="da.UnitPrice" type="text"
:disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)" :disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)||(orderObj.PeopleCostType&&orderObj.PeopleCostType==486)"
@keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)"
@change="Calculation(2,daIn+1)" @input="chages($event)" class="w80 h34 _border_b_1"></el-input> @change="Calculation(2,daIn+1)" @input="chages($event)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
...@@ -1413,6 +1413,23 @@ ...@@ -1413,6 +1413,23 @@
this.msg.detailList[i - 1] = list; this.msg.detailList[i - 1] = list;
} else { } else {
this.msg.detailList.push(list); this.msg.detailList.push(list);
// 人头奖励类型
if(this.orderObj.PeopleCostType&&this.orderObj.PeopleCostType==486) {
let num = (1 * this.orderObj.PeopleMoney) * list.Rate;
num = Math.round(num * 100) / 100;
this.msg.detailList.push({
...list,
UnitPrice: this.orderObj.PeopleMoney,
UnitPriceTo: this.$commonUtils.addCommas(Math.round(this.orderObj.PeopleMoney * 100) / 100),
yTotalPrice: this.orderObj.PeopleMoney,
yTotalPriceTo: this.$commonUtils.addCommas(Math.round(this.orderObj.PeopleMoney * 100) /
100),
bTotalPrice: num,
bTotalPriceTo: this.$commonUtils.addCommas(num),
CostTypeId: this.orderObj.PeopleCostType
})
};
} }
let allPrice = 0 let allPrice = 0
this.msg.detailList.forEach(x => { this.msg.detailList.forEach(x => {
......
...@@ -293,7 +293,9 @@ ...@@ -293,7 +293,9 @@
OtherType:50,//业绩提成 OtherType:50,//业绩提成
ReFinanceId:Id, ReFinanceId:Id,
ReFinanceId2:this.msg.SchoolId, ReFinanceId2:this.msg.SchoolId,
EduCommissionEmp:EmpIds EduCommissionEmp:EmpIds,
PeopleCostType: this.totalPeople>0?486:0,
PeopleMoney: this.totalPeople,
} }
let query = { let query = {
blank: "y", blank: "y",
...@@ -403,4 +405,3 @@ ...@@ -403,4 +405,3 @@
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style> </style>
\ No newline at end of file
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
queryClassRoomList, queryClassRoomList,
GetTrialLessonList GetTrialLessonList
} from "../../api/school/index"; } from "../../api/school/index";
import audition from "./audition"; import audition from "./components/audition";
export default { export default {
components: { components: {
audition audition
......
...@@ -79,12 +79,12 @@ ...@@ -79,12 +79,12 @@
SetVisitorReserveFeedback, SetVisitorReserveFeedback,
SetVisitorReserveClass, SetVisitorReserveClass,
GetVisitorReserveById, GetVisitorReserveById,
} from "../../api/scheduling/schedu"; } from "../../../api/scheduling/schedu";
import { import {
getTeacherDropDownList, getTeacherDropDownList,
queryClassRoomList, queryClassRoomList,
GetTrialLessonList GetTrialLessonList
} from "../../api/school/index"; } from "../../../api/school/index";
import statusPrompt from "./statusPrompt"; import statusPrompt from "./statusPrompt";
export default { export default {
props: ['VisitorReserveClassMsg','type'], props: ['VisitorReserveClassMsg','type'],
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="popup-box"> <div class="popup-box">
<div class="popup-title"> <div class="popup-title">
<div style="margin-top: 230px;"> <div style="margin-top: 230px;">
<img style="width:80px;height:80px;" src="../../assets/images/da_gou.png" /> <img style="width:80px;height:80px;" src="../../../assets/images/da_gou.png" />
</div> </div>
<div style="font-size: 18px;margin-top: 15px;">{{isSuccessTitle}}</div> <div style="font-size: 18px;margin-top: 15px;">{{isSuccessTitle}}</div>
</div> </div>
......
...@@ -365,12 +365,12 @@ ...@@ -365,12 +365,12 @@
align: "left", align: "left",
field: row => row.CateName field: row => row.CateName
}, },
{ // {
name: "OriginalPrice", // name: "OriginalPrice",
label: "原价", // label: "原价",
align: "left", // align: "left",
field: row => row.OriginalPrice.toFixed(2) // field: row => row.OriginalPrice.toFixed(2)
}, // },
{ {
name: "SellPrice", name: "SellPrice",
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