Skip to content

C
confucius
Commit d783c0b8 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 7a2d699e b71ca52d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 457 deletions
quasar.conf.js
View file @ d783c0b8
...@@ -47,7 +47,7 @@ module.exports = function(ctx) { ...@@ -47,7 +47,7 @@ module.exports = function(ctx) {
vueRouterMode: 'history', // available values: 'hash', 'history' vueRouterMode: 'history', // available values: 'hash', 'history'
env: ctx.dev ? { env: ctx.dev ? {
API: 'http://192.168.5.46:8300/api', API: 'http://192.168.5.57:5001/api',
// API: 'http://192.168.10.128:8300/api', // API: 'http://192.168.10.128:8300/api',
// API: 'https://eduapi.oytour.com/api', // API: 'https://eduapi.oytour.com/api',
API_ZC: 'http://192.168.5.238:8087/api', API_ZC: 'http://192.168.5.238:8087/api',
......
src/components/sale/orderlist.vue
View file @ d783c0b8
...@@ -2,86 +2,16 @@ ...@@ -2,86 +2,16 @@
<template> <template>
<div class="classorder"> <div class="classorder">
<div class="table-head"> <div class="table-head">
<!-- <table class="enrollTotalSearchTable" border="1" cellspacing="0" cellpadding="0">
<colgroup>
<col width="12%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<template v-if="AuthorityObj.isShowStudyRebate">
<col width="6%" />
</template>
<col width="6%" />
<col />
</colgroup>
<thead>
<tr class="fix_th">
<th width="12%">单号</th>
<th width="6%">人数</th>
<th width="6%">单价</th>
<th width="6%">教材费</th>
<th width="6%">课件费</th>
<th width="6%">总课时</th>
<th width="6%">成交</th>
<th width="6%">应收总额</th>
<th width="6%">实收</th>
<th width="6%">优惠</th>
<th width="6%">少价金额</th>
<th width="6%">退款</th>
<th width="6%">平台税金</th>
<th width="6%">待收金额</th>
<template v-if="AuthorityObj.isShowStudyRebate">
<th width="6%">留学订单回佣</th>
</template>
<th width="6%">状态</th>
<th v-if="viewType == 0">操作</th>
</tr>
</thead>
</table> -->
</div> </div>
<div class="table-body" v-loading="loading"> <div class="table-body" v-loading="loading">
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0"> <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
<!-- <colgroup>
<col width="12%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<col width="6%" />
<template v-if="AuthorityObj.isShowStudyRebate">
<col width="6%" />
</template>
<col width="6%" />
<col v-if="viewType == 0" />
</colgroup> -->
<tr class="fix_th"> <tr class="fix_th">
<th width="12%">单号</th> <th width="12%">单号</th>
<th width="6%">人数</th> <th width="6%">人数</th>
<th width="6%">单价</th> <th width="6%">单价</th>
<th width="6%">教材费</th> <th width="6%" v-if="studyOrderType!=1">教材费</th>
<th width="6%">课件费</th> <th width="6%" v-if="studyOrderType!=1">课件费</th>
<th width="6%">总课时</th> <th width="6%" v-if="studyOrderType!=1">总课时</th>
<th width="6%">成交</th> <th width="6%">成交</th>
<th width="6%">应收总额</th> <th width="6%">应收总额</th>
<th width="6%">实收</th> <th width="6%">实收</th>
...@@ -261,20 +191,21 @@ ...@@ -261,20 +191,21 @@
<template v-if="item.Class_Price >= 0"> <template v-if="item.Class_Price >= 0">
{{ item.Class_Price.toFixed(2) }} {{ item.Class_Price.toFixed(2) }}
</br> </br>
({{item.SellPriceType==2?'课时单价':'课时总价'}}) <template v-if="studyOrderType!=1">
({{item.SellPriceType==2?'课时单价':'课时总价'}})</template>
</template> </template>
</td> </td>
<td style="border:none;"> <td style="border:none;" v-if="studyOrderType!=1">
<template v-if="item.TextbookFee >= 0"> <template v-if="item.TextbookFee >= 0">
{{ item.TextbookFee.toFixed(2) }} {{ item.TextbookFee.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none;"> <td style="border:none;" v-if="studyOrderType!=1">
<template v-if="item.CoursewareFee >= 0"> <template v-if="item.CoursewareFee >= 0">
{{ item.CoursewareFee.toFixed(2) }} {{ item.CoursewareFee.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none;"> <td style="border:none;" v-if="studyOrderType!=1">
{{ item.TotalClassHours }} {{ item.TotalClassHours }}
...@@ -519,7 +450,7 @@ ...@@ -519,7 +450,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td :colspan="17" style="text-align: left"> <td :colspan="studyOrderType!=1?17:14" style="text-align: left">
<div class="row" v-if="item.GuestList && item.GuestList.length > 0"> <div class="row" v-if="item.GuestList && item.GuestList.length > 0">
学生名单： 学生名单：
<template v-for="(x, j) in item.GuestList" :index="j"> <template v-for="(x, j) in item.GuestList" :index="j">
...@@ -591,7 +522,7 @@ ...@@ -591,7 +522,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td :colspan="17" style="height: 168px;text-align: left"> <td :colspan="studyOrderType!=1?17:14" style="height: 168px;text-align: left">
<div class="col row remarks q-gutter-x-md"> <div class="col row remarks q-gutter-x-md">
<div class="col"> <div class="col">
<div>销售备注：</div> <div>销售备注：</div>
...@@ -950,7 +881,7 @@ ...@@ -950,7 +881,7 @@
</template> </template>
<tbody v-if="cancelList && cancelList.length > 0"> <tbody v-if="cancelList && cancelList.length > 0">
<tr> <tr>
<td :colspan="17"> <td :colspan="studyOrderType!=1?17:14">
<span style="color:red;cursor:pointer;font-weight:bold;" @click="isShowCancel = !isShowCancel">取消订单</span> <span style="color:red;cursor:pointer;font-weight:bold;" @click="isShowCancel = !isShowCancel">取消订单</span>
</td> </td>
</tr> </tr>
...@@ -976,17 +907,17 @@ ...@@ -976,17 +907,17 @@
{{ item.Class_Price.toFixed(2) }} {{ item.Class_Price.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none;"> <td style="border:none;" v-if="studyOrderType!=1">
<template v-if="item.TextbookFee >= 0"> <template v-if="item.TextbookFee >= 0">
{{ item.TextbookFee.toFixed(2) }} {{ item.TextbookFee.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none;"> <td style="border:none;" v-if="studyOrderType!=1">
<template v-if="item.CoursewareFee >= 0"> <template v-if="item.CoursewareFee >= 0">
{{ item.CoursewareFee.toFixed(2) }} {{ item.CoursewareFee.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none;"> <td style="border:none;" v-if="studyOrderType!=1">
{{ item.TotalClassHours }} {{ item.TotalClassHours }}
</td> </td>
...@@ -1361,6 +1292,10 @@ ...@@ -1361,6 +1292,10 @@
type: Number, type: Number,
default: 0 //1-销售修改，2-OP修改，3-总经理修改 default: 0 //1-销售修改，2-OP修改，3-总经理修改
}, },
studyOrderType: {
type: Number,
default: 0 //1-留学订单
},
isShowEditBtn: { isShowEditBtn: {
type: Number, type: Number,
default: null default: null
......
src/components/school/student/abroad-form.vue
View file @ d783c0b8
...@@ -124,6 +124,10 @@ ...@@ -124,6 +124,10 @@
if(val&&val.length>0){ if(val&&val.length>0){
this.saveObj = val[0]; this.saveObj = val[0];
this.defaultCourse = val; this.defaultCourse = val;
this.saveObj.OrderCourseList =[];
this.saveObj.OrderCourseList.push(JSON.parse(JSON.stringify(this.saveObj)));
this.saveObj.TextbookFee=0;
this.saveObj.CoursewareFee=0;
} }
}, },
next() { next() {
......
src/components/school/student/transfer-order/study-form.vue
View file @ d783c0b8
...@@ -122,7 +122,8 @@ ...@@ -122,7 +122,8 @@
SourceId: 1, //传入Id SourceId: 1, //传入Id
SaleRemark: '', //备注 SaleRemark: '', //备注
EnterId: 0, //市场人员 EnterId: 0, //市场人员
StuIds:'' StuIds:'',
OrderCourseList:[],
}, },
EnterName:'', EnterName:'',
HelpEnterDisable:false, HelpEnterDisable:false,
...@@ -134,6 +135,7 @@ ...@@ -134,6 +135,7 @@
this.OrderMsg.SourceId = this.saveObj.Id; this.OrderMsg.SourceId = this.saveObj.Id;
this.OrderMsg.Unit_Price = this.saveObj.SellPrice; this.OrderMsg.Unit_Price = this.saveObj.SellPrice;
this.OrderMsg.PreferPrice = this.OrderMsg.Unit_Price; this.OrderMsg.PreferPrice = this.OrderMsg.Unit_Price;
this.OrderMsg.OrderCourseList = JSON.parse(JSON.stringify(this.saveObj.OrderCourseList));
} }
if(this.select&&this.select.length>0){ if(this.select&&this.select.length>0){
this.OrderMsg.EnterId = this.select[0].CreateBy; this.OrderMsg.EnterId = this.select[0].CreateBy;
......
src/pages/course/course.vue
View file @ d783c0b8
...@@ -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({
......
src/pages/course/rewardDetailed.vue
View file @ d783c0b8
...@@ -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>
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ d783c0b8
...@@ -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>0) {
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 => {
......
src/pages/financial/market/achievementPeriodsList.vue
View file @ d783c0b8
...@@ -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
src/pages/sale/courseList.vue
View file @ d783c0b8
...@@ -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: "售价",
......
src/pages/sale/studyOrder.vue
View file @ d783c0b8
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="1" @success="refreshClassOrder" ref="orderL" <orderlist :dataList="data.List" :authObj="authObj" :studyOrderType="1" :modityOrderType="1" @success="refreshClassOrder" ref="orderL"
:loading="loading"> :loading="loading">
</orderlist> </orderlist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <div class="row" style="justify-content: flex-end;padding: 5px 20px">
......
src/pages/sale/studyOrderStatistics.vue
View file @ d783c0b8
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="3" @success="refreshClassOrder" ref="orderL" :loading="loading"> <orderlist :dataList="data.List" :authObj="authObj" :studyOrderType="1" :modityOrderType="3" @success="refreshClassOrder" ref="orderL" :loading="loading">
</orderlist> </orderlist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <div class="row" style="justify-content: flex-end;padding: 5px 20px">
<q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
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